diff --git a/Cargo.lock b/Cargo.lock index 384cc657..9bffa779 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7492,7 +7492,7 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "subvt-app-service" -version = "0.17.44" +version = "0.17.45" dependencies = [ "actix-http", "actix-rt", @@ -7521,7 +7521,7 @@ dependencies = [ [[package]] name = "subvt-block-processor" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "async-lock", @@ -7547,7 +7547,7 @@ dependencies = [ [[package]] name = "subvt-config" -version = "0.17.44" +version = "0.17.45" dependencies = [ "config", "serde", @@ -7555,7 +7555,7 @@ dependencies = [ [[package]] name = "subvt-governance" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "lazy_static", @@ -7569,7 +7569,7 @@ dependencies = [ [[package]] name = "subvt-logging" -version = "0.17.44" +version = "0.17.45" dependencies = [ "env_logger", "log", @@ -7578,7 +7578,7 @@ dependencies = [ [[package]] name = "subvt-metrics" -version = "0.17.44" +version = "0.17.45" dependencies = [ "env_logger", "log", @@ -7592,7 +7592,7 @@ dependencies = [ [[package]] name = "subvt-network-status-server" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "async-trait", @@ -7617,7 +7617,7 @@ dependencies = [ [[package]] name = "subvt-network-status-updater" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "async-trait", @@ -7639,7 +7639,7 @@ dependencies = [ [[package]] name = "subvt-nft" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "lazy_static", @@ -7651,7 +7651,7 @@ dependencies = [ [[package]] name = "subvt-notification-generator" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "async-lock", @@ -7678,7 +7678,7 @@ dependencies = [ [[package]] name = "subvt-notification-processor" -version = "0.17.44" +version = "0.17.45" dependencies = [ "a2", "anyhow", @@ -7713,7 +7713,7 @@ dependencies = [ [[package]] name = "subvt-onekv-updater" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "async-trait", @@ -7735,7 +7735,7 @@ dependencies = [ [[package]] name = "subvt-persistence" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "chrono", @@ -7754,7 +7754,7 @@ dependencies = [ [[package]] name = "subvt-plotter" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "chrono", @@ -7777,7 +7777,7 @@ dependencies = [ [[package]] name = "subvt-proc-macro" -version = "0.17.44" +version = "0.17.45" dependencies = [ "proc-macro2", "quote", @@ -7786,7 +7786,7 @@ dependencies = [ [[package]] name = "subvt-referendum-updater" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "async-trait", @@ -7810,7 +7810,7 @@ dependencies = [ [[package]] name = "subvt-report-service" -version = "0.17.44" +version = "0.17.45" dependencies = [ "actix-web", "anyhow", @@ -7836,7 +7836,7 @@ dependencies = [ [[package]] name = "subvt-service-common" -version = "0.17.44" +version = "0.17.45" dependencies = [ "actix-web", "anyhow", @@ -7853,7 +7853,7 @@ dependencies = [ [[package]] name = "subvt-substrate-client" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "async-lock", @@ -7882,7 +7882,7 @@ dependencies = [ [[package]] name = "subvt-telegram-bot" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "async-recursion", @@ -7920,7 +7920,7 @@ dependencies = [ [[package]] name = "subvt-telemetry-processor" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "async-lock", @@ -7944,7 +7944,7 @@ dependencies = [ [[package]] name = "subvt-types" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "chrono", @@ -7985,7 +7985,7 @@ dependencies = [ [[package]] name = "subvt-utility" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "hex", @@ -7995,7 +7995,7 @@ dependencies = [ [[package]] name = "subvt-validator-details-server" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "async-trait", @@ -8019,7 +8019,7 @@ dependencies = [ [[package]] name = "subvt-validator-list-server" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "async-trait", @@ -8046,7 +8046,7 @@ dependencies = [ [[package]] name = "subvt-validator-list-updater" -version = "0.17.44" +version = "0.17.45" dependencies = [ "anyhow", "async-lock", diff --git a/_config/base.toml b/_config/base.toml index 21b8a974..e73eb2d2 100644 --- a/_config/base.toml +++ b/_config/base.toml @@ -9,8 +9,8 @@ chain_display = "Kusama" chain_genesis_hash = "0xB0A8D493285C2DF73290DFB7E61F870F17B41801197A149CA93654499EA3DAFE" # number of epochs per era epochs_per_era = 6 -rpc_url = "wss://rpc.helikon.io:443" -people_rpc_url = "wss://rpc.helikon.io:443" +rpc_url = "wss://rpc.helikon.io/kusama" +people_rpc_url = "wss://rpc.helikon.io/people-kusama" connection_timeout_seconds = 30 request_timeout_seconds = 30 # for internal use, 1 for Kusama, 2 for Polkadot diff --git a/_config/network/kusama.toml b/_config/network/kusama.toml index f40450fd..2c7a789e 100644 --- a/_config/network/kusama.toml +++ b/_config/network/kusama.toml @@ -3,8 +3,8 @@ chain = "kusama" chain_display = "Kusama" chain_genesis_hash = "0xB0A8D493285C2DF73290DFB7E61F870F17B41801197A149CA93654499EA3DAFE" epochs_per_era = 6 -rpc_url = "wss://rpc.helikon.io:443/kusama" -people_rpc_url = "wss://rpc.helikon.io:443/people-kusama" +rpc_url = "wss://rpc.helikon.io/kusama" +people_rpc_url = "wss://rpc.helikon.io/people-kusama" network_id = 1 token_ticker = "KSM" token_decimals = 12 diff --git a/_config/network/polkadot.toml b/_config/network/polkadot.toml index c6b7e318..500257cf 100644 --- a/_config/network/polkadot.toml +++ b/_config/network/polkadot.toml @@ -3,8 +3,8 @@ chain = "polkadot" chain_display = "Polkadot" chain_genesis_hash = "0x91B171BB158E2D3848FA23A9F1C25182FB8E20313B2C1EB49219DA7A70CE90C3" epochs_per_era = 6 -rpc_url = "wss://rpc.helikon.io:443/polkadot" -people_rpc_url = "wss://rpc.helikon.io:443/people-polkadot" +rpc_url = "wss://rpc.helikon.io/polkadot" +people_rpc_url = "wss://rpc.helikon.io/people-kusama" network_id = 2 token_ticker = "DOT" token_decimals = 10 diff --git a/_config/network/westend.toml b/_config/network/westend.toml index 9a61ea8b..b3746e49 100644 --- a/_config/network/westend.toml +++ b/_config/network/westend.toml @@ -3,7 +3,7 @@ chain = "westend" chain_display = "Westend" chain_genesis_hash = "0xE143F23803AC50E8F6F8E62695D1CE9E4E1D68AA36C1CD2CFD15340213F3423E" epochs_per_era = 6 -rpc_url = "wss://rpc.helikon.io:443/westend" +rpc_url = "wss://rpc.helikon.io/westend" # for internal use, 1 for Kusama, 2 for Polkadot, 3 for Westend network_id = 3 token_ticker = "WND" diff --git a/_docker/compose/.env.sample b/_docker/compose/.env.sample index be67beb4..1692d433 100644 --- a/_docker/compose/.env.sample +++ b/_docker/compose/.env.sample @@ -1,4 +1,4 @@ -VERSION=0.17.44 +VERSION=0.17.45 ENV=production LOG_LEVEL=debug diff --git a/subvt-app-service/Cargo.toml b/subvt-app-service/Cargo.toml index f139ab74..f79dbc78 100644 --- a/subvt-app-service/Cargo.toml +++ b/subvt-app-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-app-service" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-block-processor/Cargo.toml b/subvt-block-processor/Cargo.toml index 8396f31a..9ad629a4 100644 --- a/subvt-block-processor/Cargo.toml +++ b/subvt-block-processor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-block-processor" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-config/Cargo.toml b/subvt-config/Cargo.toml index 94d8aaac..1b88d32e 100644 --- a/subvt-config/Cargo.toml +++ b/subvt-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-config" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-governance/Cargo.toml b/subvt-governance/Cargo.toml index 2b392840..8c7983b0 100644 --- a/subvt-governance/Cargo.toml +++ b/subvt-governance/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-governance" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-logging/Cargo.toml b/subvt-logging/Cargo.toml index 2aeddfa4..4b825d1a 100644 --- a/subvt-logging/Cargo.toml +++ b/subvt-logging/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-logging" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-metrics/Cargo.toml b/subvt-metrics/Cargo.toml index 0dae1890..03d76d72 100644 --- a/subvt-metrics/Cargo.toml +++ b/subvt-metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-metrics" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-network-status-server/Cargo.toml b/subvt-network-status-server/Cargo.toml index 19d8ae67..77cc2448 100644 --- 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.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-network-status-updater/Cargo.toml b/subvt-network-status-updater/Cargo.toml index 76160a95..bd69d78d 100644 --- 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.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-nft/Cargo.toml b/subvt-nft/Cargo.toml index 48df8be8..4ec7b89a 100644 --- a/subvt-nft/Cargo.toml +++ b/subvt-nft/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-nft" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-notification-generator/Cargo.toml b/subvt-notification-generator/Cargo.toml index 5385c644..33a2623d 100644 --- a/subvt-notification-generator/Cargo.toml +++ b/subvt-notification-generator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-notification-generator" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-notification-generator/src/inspect/block/authorship.rs b/subvt-notification-generator/src/inspect/block/authorship.rs index 4c78694d..027a662e 100644 --- a/subvt-notification-generator/src/inspect/block/authorship.rs +++ b/subvt-notification-generator/src/inspect/block/authorship.rs @@ -30,7 +30,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres, &rules, - block.number, &Some(*validator_account_id), Some(&block.clone()), ) diff --git a/subvt-notification-generator/src/inspect/block/chilling.rs b/subvt-notification-generator/src/inspect/block/chilling.rs index be1af9fd..cd7a86eb 100644 --- a/subvt-notification-generator/src/inspect/block/chilling.rs +++ b/subvt-notification-generator/src/inspect/block/chilling.rs @@ -27,7 +27,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres.clone(), &rules, - block.number, &Some(event.stash_account_id), Some(&event.clone()), ) diff --git a/subvt-notification-generator/src/inspect/block/offence.rs b/subvt-notification-generator/src/inspect/block/offence.rs index 7862462d..673c746e 100644 --- a/subvt-notification-generator/src/inspect/block/offence.rs +++ b/subvt-notification-generator/src/inspect/block/offence.rs @@ -27,7 +27,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres.clone(), &rules, - block.number, &Some(event.validator_account_id), Some(&event.clone()), ) diff --git a/subvt-notification-generator/src/inspect/block/payout.rs b/subvt-notification-generator/src/inspect/block/payout.rs index 1dc0d7f2..b7c048ce 100644 --- a/subvt-notification-generator/src/inspect/block/payout.rs +++ b/subvt-notification-generator/src/inspect/block/payout.rs @@ -29,7 +29,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres.clone(), &rules, - block.number, &Some(extrinsic.validator_account_id), Some(&extrinsic.clone()), ) diff --git a/subvt-notification-generator/src/inspect/block/referenda.rs b/subvt-notification-generator/src/inspect/block/referenda.rs index 00fb57e5..6ebe1c3b 100644 --- a/subvt-notification-generator/src/inspect/block/referenda.rs +++ b/subvt-notification-generator/src/inspect/block/referenda.rs @@ -47,14 +47,8 @@ impl NotificationGenerator { CONFIG.substrate.network_id, ) .await?; - self.generate_notifications( - app_postgres.clone(), - &rules, - block.number, - &None, - Some(&event.clone()), - ) - .await?; + self.generate_notifications(app_postgres.clone(), &rules, &None, Some(&event.clone())) + .await?; } Ok(()) } @@ -76,14 +70,8 @@ impl NotificationGenerator { CONFIG.substrate.network_id, ) .await?; - self.generate_notifications( - app_postgres.clone(), - &rules, - block.number, - &None, - Some(&event.clone()), - ) - .await?; + self.generate_notifications(app_postgres.clone(), &rules, &None, Some(&event.clone())) + .await?; } Ok(()) } @@ -105,14 +93,8 @@ impl NotificationGenerator { CONFIG.substrate.network_id, ) .await?; - self.generate_notifications( - app_postgres.clone(), - &rules, - block.number, - &None, - Some(&event.clone()), - ) - .await?; + self.generate_notifications(app_postgres.clone(), &rules, &None, Some(&event.clone())) + .await?; } Ok(()) } @@ -137,14 +119,8 @@ impl NotificationGenerator { CONFIG.substrate.network_id, ) .await?; - self.generate_notifications( - app_postgres.clone(), - &rules, - block.number, - &None, - Some(&event.clone()), - ) - .await?; + self.generate_notifications(app_postgres.clone(), &rules, &None, Some(&event.clone())) + .await?; } Ok(()) } @@ -166,14 +142,8 @@ impl NotificationGenerator { CONFIG.substrate.network_id, ) .await?; - self.generate_notifications( - app_postgres.clone(), - &rules, - block.number, - &None, - Some(&event.clone()), - ) - .await?; + self.generate_notifications(app_postgres.clone(), &rules, &None, Some(&event.clone())) + .await?; } Ok(()) } @@ -195,14 +165,8 @@ impl NotificationGenerator { CONFIG.substrate.network_id, ) .await?; - self.generate_notifications( - app_postgres.clone(), - &rules, - block.number, - &None, - Some(&event.clone()), - ) - .await?; + self.generate_notifications(app_postgres.clone(), &rules, &None, Some(&event.clone())) + .await?; } Ok(()) } @@ -224,14 +188,8 @@ impl NotificationGenerator { CONFIG.substrate.network_id, ) .await?; - self.generate_notifications( - app_postgres.clone(), - &rules, - block.number, - &None, - Some(&event.clone()), - ) - .await?; + self.generate_notifications(app_postgres.clone(), &rules, &None, Some(&event.clone())) + .await?; } Ok(()) } @@ -253,14 +211,8 @@ impl NotificationGenerator { CONFIG.substrate.network_id, ) .await?; - self.generate_notifications( - app_postgres.clone(), - &rules, - block.number, - &None, - Some(&event.clone()), - ) - .await?; + self.generate_notifications(app_postgres.clone(), &rules, &None, Some(&event.clone())) + .await?; } Ok(()) } diff --git a/subvt-notification-generator/src/inspect/block/validate.rs b/subvt-notification-generator/src/inspect/block/validate.rs index 45bcbc5e..0f97b3ae 100644 --- a/subvt-notification-generator/src/inspect/block/validate.rs +++ b/subvt-notification-generator/src/inspect/block/validate.rs @@ -27,7 +27,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres.clone(), &rules, - block.number, &Some(extrinsic.stash_account_id), Some(&extrinsic.clone()), ) diff --git a/subvt-notification-generator/src/inspect/validator_list/mod.rs b/subvt-notification-generator/src/inspect/validator_list/mod.rs index 7b6eab12..c186c1cb 100644 --- a/subvt-notification-generator/src/inspect/validator_list/mod.rs +++ b/subvt-notification-generator/src/inspect/validator_list/mod.rs @@ -120,7 +120,6 @@ impl NotificationGenerator { redis_connection, &redis_storage_prefix, last_active_era_index, - finalized_block_number, validator_map, ) .await?; diff --git a/subvt-notification-generator/src/inspect/validator_list/onekv/location.rs b/subvt-notification-generator/src/inspect/validator_list/onekv/location.rs index 82c7bdaf..fff4aa32 100644 --- a/subvt-notification-generator/src/inspect/validator_list/onekv/location.rs +++ b/subvt-notification-generator/src/inspect/validator_list/onekv/location.rs @@ -11,7 +11,6 @@ impl NotificationGenerator { &self, network_postgres: Arc, app_postgres: Arc, - finalized_block_number: u64, last: &ValidatorDetails, current: &ValidatorDetails, ) -> anyhow::Result<()> { @@ -32,7 +31,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres, &rules, - finalized_block_number, &Some(current.account.id), Some(&app_event::OneKVLocationChange { validator_account_id: current.account.id, diff --git a/subvt-notification-generator/src/inspect/validator_list/onekv/mod.rs b/subvt-notification-generator/src/inspect/validator_list/onekv/mod.rs index 6ade6efa..4f431106 100644 --- a/subvt-notification-generator/src/inspect/validator_list/onekv/mod.rs +++ b/subvt-notification-generator/src/inspect/validator_list/onekv/mod.rs @@ -14,7 +14,6 @@ impl NotificationGenerator { &self, network_postgres: Arc, app_postgres: Arc, - finalized_block_number: u64, last: &ValidatorDetails, current: &ValidatorDetails, ) -> anyhow::Result<()> { @@ -24,7 +23,6 @@ impl NotificationGenerator { self.inspect_onekv_rank_change( network_postgres.clone(), app_postgres.clone(), - finalized_block_number, last, current, ) @@ -32,7 +30,6 @@ impl NotificationGenerator { self.inspect_onekv_location_change( network_postgres.clone(), app_postgres.clone(), - finalized_block_number, last, current, ) @@ -40,19 +37,12 @@ impl NotificationGenerator { self.inspect_onekv_validity_change( network_postgres.clone(), app_postgres.clone(), - finalized_block_number, - last, - current, - ) - .await?; - self.inspect_onekv_online_status_change( - network_postgres, - app_postgres, - finalized_block_number, last, current, ) .await?; + self.inspect_onekv_online_status_change(network_postgres, app_postgres, last, current) + .await?; Ok(()) } } diff --git a/subvt-notification-generator/src/inspect/validator_list/onekv/online.rs b/subvt-notification-generator/src/inspect/validator_list/onekv/online.rs index a2f02d3e..0b5c99f4 100644 --- a/subvt-notification-generator/src/inspect/validator_list/onekv/online.rs +++ b/subvt-notification-generator/src/inspect/validator_list/onekv/online.rs @@ -11,7 +11,6 @@ impl NotificationGenerator { &self, network_postgres: Arc, app_postgres: Arc, - finalized_block_number: u64, last: &ValidatorDetails, current: &ValidatorDetails, ) -> anyhow::Result<()> { @@ -41,7 +40,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres, &rules, - finalized_block_number, &Some(current.account.id), Some(&app_event::OneKVOnlineStatusChange { validator_account_id: current.account.id, diff --git a/subvt-notification-generator/src/inspect/validator_list/onekv/rank.rs b/subvt-notification-generator/src/inspect/validator_list/onekv/rank.rs index 80aab288..d8200a32 100644 --- a/subvt-notification-generator/src/inspect/validator_list/onekv/rank.rs +++ b/subvt-notification-generator/src/inspect/validator_list/onekv/rank.rs @@ -11,7 +11,6 @@ impl NotificationGenerator { &self, network_postgres: Arc, app_postgres: Arc, - finalized_block_number: u64, last: &ValidatorDetails, current: &ValidatorDetails, ) -> anyhow::Result<()> { @@ -32,7 +31,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres, &rules, - finalized_block_number, &Some(current.account.id), Some(&app_event::OneKVRankChange { validator_account_id: current.account.id, diff --git a/subvt-notification-generator/src/inspect/validator_list/onekv/validity.rs b/subvt-notification-generator/src/inspect/validator_list/onekv/validity.rs index bd0eaef5..ea9868b7 100644 --- a/subvt-notification-generator/src/inspect/validator_list/onekv/validity.rs +++ b/subvt-notification-generator/src/inspect/validator_list/onekv/validity.rs @@ -11,7 +11,6 @@ impl NotificationGenerator { &self, network_postgres: Arc, app_postgres: Arc, - finalized_block_number: u64, last: &ValidatorDetails, current: &ValidatorDetails, ) -> anyhow::Result<()> { @@ -38,7 +37,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres, &rules, - finalized_block_number, &Some(current.account.id), Some(&app_event::OneKVValidityChange { validator_account_id: current.account.id, diff --git a/subvt-notification-generator/src/inspect/validator_list/unclaimed_payout.rs b/subvt-notification-generator/src/inspect/validator_list/unclaimed_payout.rs index a03eddd2..29a5c7ab 100644 --- a/subvt-notification-generator/src/inspect/validator_list/unclaimed_payout.rs +++ b/subvt-notification-generator/src/inspect/validator_list/unclaimed_payout.rs @@ -20,7 +20,6 @@ impl NotificationGenerator { redis_connection: &mut RedisConnection, redis_storage_prefix: &str, last_active_era_index: &AtomicU32, - finalized_block_number: u64, validator_map: &HashMap, ) -> anyhow::Result<()> { // check era change & unclaimed payouts @@ -56,7 +55,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres.clone(), &rules, - finalized_block_number, &Some(validator.account.id), Some(&validator.unclaimed_era_indices), ) diff --git a/subvt-notification-generator/src/inspect/validator_list/update/active.rs b/subvt-notification-generator/src/inspect/validator_list/update/active.rs index 155dd022..f69a6a3a 100644 --- a/subvt-notification-generator/src/inspect/validator_list/update/active.rs +++ b/subvt-notification-generator/src/inspect/validator_list/update/active.rs @@ -26,7 +26,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres, &rules, - finalized_block_number, &Some(current.account.id), if let Some(validator_stake) = ¤t.validator_stake { Some(validator_stake) diff --git a/subvt-notification-generator/src/inspect/validator_list/update/active_next_session.rs b/subvt-notification-generator/src/inspect/validator_list/update/active_next_session.rs index 31b2f371..859326f2 100644 --- a/subvt-notification-generator/src/inspect/validator_list/update/active_next_session.rs +++ b/subvt-notification-generator/src/inspect/validator_list/update/active_next_session.rs @@ -26,7 +26,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres.clone(), &rules, - finalized_block_number, &Some(current.account.id), None::<&()>, ) diff --git a/subvt-notification-generator/src/inspect/validator_list/update/identity.rs b/subvt-notification-generator/src/inspect/validator_list/update/identity.rs index 82769a4e..ec9f7dc1 100644 --- a/subvt-notification-generator/src/inspect/validator_list/update/identity.rs +++ b/subvt-notification-generator/src/inspect/validator_list/update/identity.rs @@ -37,7 +37,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres, &rules, - finalized_block_number, &Some(current.account.id), Some(¤t.account), ) diff --git a/subvt-notification-generator/src/inspect/validator_list/update/inactive.rs b/subvt-notification-generator/src/inspect/validator_list/update/inactive.rs index bacb678c..b6d9339f 100644 --- a/subvt-notification-generator/src/inspect/validator_list/update/inactive.rs +++ b/subvt-notification-generator/src/inspect/validator_list/update/inactive.rs @@ -26,7 +26,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres, &rules, - finalized_block_number, &Some(current.account.id), None::<&()>, ) diff --git a/subvt-notification-generator/src/inspect/validator_list/update/inactive_next_session.rs b/subvt-notification-generator/src/inspect/validator_list/update/inactive_next_session.rs index 13a8f5a0..dd2b0d66 100644 --- a/subvt-notification-generator/src/inspect/validator_list/update/inactive_next_session.rs +++ b/subvt-notification-generator/src/inspect/validator_list/update/inactive_next_session.rs @@ -26,7 +26,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres, &rules, - finalized_block_number, &Some(current.account.id), None::<&()>, ) diff --git a/subvt-notification-generator/src/inspect/validator_list/update/mod.rs b/subvt-notification-generator/src/inspect/validator_list/update/mod.rs index e984b72d..55e942be 100644 --- a/subvt-notification-generator/src/inspect/validator_list/update/mod.rs +++ b/subvt-notification-generator/src/inspect/validator_list/update/mod.rs @@ -113,15 +113,9 @@ impl NotificationGenerator { ¤t, ) .await?; - self.inspect_onekv_changes( - network_postgres, - app_postgres.clone(), - finalized_block_number, - last, - ¤t, - ) - .await?; - self.inspect_para_validating(app_postgres.clone(), finalized_block_number, last, ¤t) + self.inspect_onekv_changes(network_postgres, app_postgres.clone(), last, ¤t) + .await?; + self.inspect_para_validating(app_postgres.clone(), last, ¤t) .await?; Ok(Some(current)) } diff --git a/subvt-notification-generator/src/inspect/validator_list/update/nomination/lost_nomination.rs b/subvt-notification-generator/src/inspect/validator_list/update/nomination/lost_nomination.rs index 1cf259c5..b274f338 100644 --- a/subvt-notification-generator/src/inspect/validator_list/update/nomination/lost_nomination.rs +++ b/subvt-notification-generator/src/inspect/validator_list/update/nomination/lost_nomination.rs @@ -60,7 +60,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres.clone(), &[rule], - finalized_block_number, &Some(current.account.id), Some(&event), ) diff --git a/subvt-notification-generator/src/inspect/validator_list/update/nomination/new_nomination.rs b/subvt-notification-generator/src/inspect/validator_list/update/nomination/new_nomination.rs index 141576b8..5f8dba71 100644 --- a/subvt-notification-generator/src/inspect/validator_list/update/nomination/new_nomination.rs +++ b/subvt-notification-generator/src/inspect/validator_list/update/nomination/new_nomination.rs @@ -59,7 +59,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres.clone(), &[rule], - finalized_block_number, &Some(current.account.id), Some(&event), ) diff --git a/subvt-notification-generator/src/inspect/validator_list/update/nomination/renomination.rs b/subvt-notification-generator/src/inspect/validator_list/update/nomination/renomination.rs index f57bd893..562631d3 100644 --- a/subvt-notification-generator/src/inspect/validator_list/update/nomination/renomination.rs +++ b/subvt-notification-generator/src/inspect/validator_list/update/nomination/renomination.rs @@ -59,7 +59,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres.clone(), &rules, - finalized_block_number, &Some(current.account.id), Some(&event), ) diff --git a/subvt-notification-generator/src/inspect/validator_list/update/para_validation.rs b/subvt-notification-generator/src/inspect/validator_list/update/para_validation.rs index 49622851..bf42c16a 100644 --- a/subvt-notification-generator/src/inspect/validator_list/update/para_validation.rs +++ b/subvt-notification-generator/src/inspect/validator_list/update/para_validation.rs @@ -8,7 +8,6 @@ impl NotificationGenerator { pub(crate) async fn inspect_para_validating( &self, app_postgres: Arc, - finalized_block_number: u64, last: &ValidatorDetails, current: &ValidatorDetails, ) -> anyhow::Result<()> { @@ -24,7 +23,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres, &rules, - finalized_block_number, &Some(current.account.id), None::<&()>, ) @@ -41,7 +39,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres, &rules, - finalized_block_number, &Some(current.account.id), None::<&()>, ) diff --git a/subvt-notification-generator/src/inspect/validator_list/update/session_keys.rs b/subvt-notification-generator/src/inspect/validator_list/update/session_keys.rs index f15a49da..c73a685b 100644 --- a/subvt-notification-generator/src/inspect/validator_list/update/session_keys.rs +++ b/subvt-notification-generator/src/inspect/validator_list/update/session_keys.rs @@ -26,7 +26,6 @@ impl NotificationGenerator { self.generate_notifications( app_postgres, &rules, - finalized_block_number, &Some(current.account.id), Some(¤t.next_session_keys), ) diff --git a/subvt-notification-generator/src/lib.rs b/subvt-notification-generator/src/lib.rs index 07738b7e..24b129e5 100644 --- a/subvt-notification-generator/src/lib.rs +++ b/subvt-notification-generator/src/lib.rs @@ -35,7 +35,6 @@ impl NotificationGenerator { &self, app_postgres: Arc, rules: &[UserNotificationRule], - block_number: u64, maybe_validator_account_id: &Option, notification_data: Option<&T>, ) -> anyhow::Result<()> { @@ -51,7 +50,7 @@ impl NotificationGenerator { ) .await?, ); - let block_hash = people_client.get_block_hash(block_number).await?; + let block_hash = people_client.get_finalized_block_hash().await?; // get account information for the validator stash address, which is used to display // identity information if exists let account_json = if let Some(validator_account_id) = maybe_validator_account_id.as_ref() { diff --git a/subvt-notification-processor/Cargo.toml b/subvt-notification-processor/Cargo.toml index 52b913b4..e12645fd 100644 --- a/subvt-notification-processor/Cargo.toml +++ b/subvt-notification-processor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-notification-processor" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-onekv-updater/Cargo.toml b/subvt-onekv-updater/Cargo.toml index f0fc259f..fdf48483 100644 --- a/subvt-onekv-updater/Cargo.toml +++ b/subvt-onekv-updater/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-onekv-updater" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-persistence/Cargo.toml b/subvt-persistence/Cargo.toml index ef24ffab..defa06fa 100644 --- a/subvt-persistence/Cargo.toml +++ b/subvt-persistence/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-persistence" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-plotter/Cargo.toml b/subvt-plotter/Cargo.toml index 9752e290..742c0c7f 100644 --- a/subvt-plotter/Cargo.toml +++ b/subvt-plotter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-plotter" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-proc-macro/Cargo.toml b/subvt-proc-macro/Cargo.toml index c6206567..60287c95 100644 --- 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.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-referendum-updater/Cargo.toml b/subvt-referendum-updater/Cargo.toml index 779aa47e..c127d816 100644 --- a/subvt-referendum-updater/Cargo.toml +++ b/subvt-referendum-updater/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-referendum-updater" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-report-service/Cargo.toml b/subvt-report-service/Cargo.toml index 0fe74bfc..ad8bcad9 100644 --- a/subvt-report-service/Cargo.toml +++ b/subvt-report-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-report-service" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-service-common/Cargo.toml b/subvt-service-common/Cargo.toml index fa60bcff..cdeed2a6 100644 --- a/subvt-service-common/Cargo.toml +++ b/subvt-service-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-service-common" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-substrate-client/Cargo.toml b/subvt-substrate-client/Cargo.toml index 795619d8..9f06e31a 100644 --- a/subvt-substrate-client/Cargo.toml +++ b/subvt-substrate-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-substrate-client" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-telegram-bot/Cargo.toml b/subvt-telegram-bot/Cargo.toml index 26de271d..f1708910 100644 --- a/subvt-telegram-bot/Cargo.toml +++ b/subvt-telegram-bot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-telegram-bot" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-telemetry-processor/Cargo.toml b/subvt-telemetry-processor/Cargo.toml index 8e463d10..89c57fae 100644 --- a/subvt-telemetry-processor/Cargo.toml +++ b/subvt-telemetry-processor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-telemetry-processor" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-types/Cargo.toml b/subvt-types/Cargo.toml index 330862ec..94f1bc72 100644 --- a/subvt-types/Cargo.toml +++ b/subvt-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-types" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-utility/Cargo.toml b/subvt-utility/Cargo.toml index 0a0d5eda..ae6339fb 100644 --- a/subvt-utility/Cargo.toml +++ b/subvt-utility/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subvt-utility" -version = "0.17.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-validator-details-server/Cargo.toml b/subvt-validator-details-server/Cargo.toml index d1a3736d..d85a260f 100644 --- 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.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-validator-list-server/Cargo.toml b/subvt-validator-list-server/Cargo.toml index 318793cf..a65860b0 100644 --- 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.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0" diff --git a/subvt-validator-list-updater/Cargo.toml b/subvt-validator-list-updater/Cargo.toml index 94b60cc2..cb223604 100644 --- 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.44" +version = "0.17.45" edition = "2021" rust-version = "1.67.0"