Report service substrate client structure change pt1.

helikon-labs · Dec 5, 2023 · c742645 · c742645
1 parent d0ccf2c
commit c742645
Show file tree

Hide file tree

Showing 28 changed files with 33 additions and 33 deletions.
diff --git a/_docker/compose/.env.sample b/_docker/compose/.env.sample
@@ -1,4 +1,4 @@
-VERSION=0.17.10
+VERSION=0.17.11
 ENV=production
 LOG_LEVEL=debug
 

diff --git a/subvt-app-service/Cargo.toml b/subvt-app-service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-app-service"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-block-processor/Cargo.toml b/subvt-block-processor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-block-processor"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-config/Cargo.toml b/subvt-config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-config"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-governance/Cargo.toml b/subvt-governance/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-governance"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-logging/Cargo.toml b/subvt-logging/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-logging"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-metrics/Cargo.toml b/subvt-metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-metrics"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-network-status-server/Cargo.toml b/subvt-network-status-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-network-status-server"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-network-status-updater/Cargo.toml b/subvt-network-status-updater/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-network-status-updater"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-nft/Cargo.toml b/subvt-nft/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-nft"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-notification-generator/Cargo.toml b/subvt-notification-generator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-notification-generator"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-notification-processor/Cargo.toml b/subvt-notification-processor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-notification-processor"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-onekv-updater/Cargo.toml b/subvt-onekv-updater/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-onekv-updater"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-persistence/Cargo.toml b/subvt-persistence/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-persistence"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-plotter/Cargo.toml b/subvt-plotter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-plotter"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-proc-macro/Cargo.toml b/subvt-proc-macro/Cargo.toml
@@ -3,7 +3,7 @@ proc-macro = true
 
 [package]
 name = "subvt-proc-macro"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-referendum-updater/Cargo.toml b/subvt-referendum-updater/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-referendum-updater"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-report-service/Cargo.toml b/subvt-report-service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-report-service"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-report-service/src/validator/mod.rs b/subvt-report-service/src/validator/mod.rs
@@ -1,7 +1,8 @@
-use crate::{ResultResponse, ServiceState};
+use crate::{ResultResponse, ServiceState, CONFIG};
 use actix_web::{get, web, HttpResponse};
 use serde::Deserialize;
 use std::str::FromStr;
+use subvt_substrate_client::SubstrateClient;
 use subvt_types::crypto::AccountId;
 use subvt_types::err::ServiceError;
 use subvt_types::report::{
@@ -253,11 +254,12 @@ pub(crate) async fn validator_reward_chart_service(
     query: web::Query<ValidatorRewardChartQueryParameters>,
     data: web::Data<ServiceState>,
 ) -> ResultResponse {
+    let substrate_client = SubstrateClient::new(&CONFIG).await?;
     let rewards = data
         .postgres
         .get_validator_total_rewards(query.start_timestamp, query.end_timestamp)
         .await?;
-    let block_hash = data.substrate_client.get_current_block_hash().await?;
+    let block_hash = substrate_client.get_current_block_hash().await?;
     let account_ids: Vec<AccountId> = rewards
         .iter()
         .map(|reward| reward.validator_account_id)
@@ -271,8 +273,7 @@ pub(crate) async fn validator_reward_chart_service(
             }
         }
     }
-    let new_accounts = data
-        .substrate_client
+    let new_accounts = substrate_client
         .get_accounts(&new_account_ids, false, &block_hash)
         .await?;
     let parent_account_ids: Vec<AccountId> = new_accounts
@@ -288,8 +289,7 @@ pub(crate) async fn validator_reward_chart_service(
             }
         }
     }
-    let new_parent_accounts = data
-        .substrate_client
+    let new_parent_accounts = substrate_client
         .get_accounts(&new_parent_account_ids, false, &block_hash)
         .await?;
     // write new accounts to cache

diff --git a/subvt-service-common/Cargo.toml b/subvt-service-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-service-common"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-substrate-client/Cargo.toml b/subvt-substrate-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-substrate-client"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-telegram-bot/Cargo.toml b/subvt-telegram-bot/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-telegram-bot"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-telemetry-processor/Cargo.toml b/subvt-telemetry-processor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-telemetry-processor"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-types/Cargo.toml b/subvt-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-types"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-utility/Cargo.toml b/subvt-utility/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-utility"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-validator-details-server/Cargo.toml b/subvt-validator-details-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-validator-details-server"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-validator-list-server/Cargo.toml b/subvt-validator-list-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-validator-list-server"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-validator-list-updater/Cargo.toml b/subvt-validator-list-updater/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-validator-list-updater"
-version = "0.17.10"
+version = "0.17.11"
 edition = "2021"
 rust-version = "1.67.0"