Revert to single validator info fetch. Some clippy fixes.

helikon-labs · Mar 6, 2025 · e1bc637 · e1bc637
1 parent 3c9efde
commit e1bc637
Show file tree

Hide file tree

Showing 39 changed files with 100 additions and 73 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/_docker/compose/.env.sample b/_docker/compose/.env.sample
@@ -1,4 +1,4 @@
-VERSION=0.22.4
+VERSION=0.22.5
 ENV=production
 LOG_LEVEL=debug
 

diff --git a/_migrations/network/migrations/20240506051612_extrinsic_payout_stakers_page_index.up.sql b/_migrations/network/migrations/20240506051612_extrinsic_payout_stakers_page_index.up.sql
@@ -1 +1 @@
-ALTER TABLE sub_extrinsic_payout_stakers ADD COLUMN IF NOT EXISTS page_index INTEGER;
+    ALTER TABLE sub_extrinsic_payout_stakers ADD COLUMN IF NOT EXISTS page_index INTEGER;
diff --git a/_template/push_notification/chain_validator_lost_nomination.txt b/_template/push_notification/chain_validator_lost_nomination.txt
@@ -1,4 +1,4 @@
 {{ validator_display }}
 ⬇️ lost a nomination{% if notification_period_type %} in the last {% if notification_period > 1 %}{{ notification_period }} {% endif %}{{ notification_period_type }}{% if notification_period > 1 %}s{% endif %}{% endif %}.
-Nominator: {{ nominator_display }}{% if is_onekv %} (1KV){% endif %}
+Nominator: {{ nominator_display }}{% if is_onekv %} (DN){% endif %}
 Amount: {{ nomination_amount }} {{ token_ticker }}
diff --git a/_template/push_notification/chain_validator_new_nomination.txt b/_template/push_notification/chain_validator_new_nomination.txt
@@ -1,5 +1,5 @@
 {{ validator_display }}
 ⭐️ received a new nomination{% if notification_period_type %} in the last {% if notification_period > 1 %}{{ notification_period }} {% endif %}{{ notification_period_type }}{% if notification_period > 1 %}s{% endif %}{% endif %}!
-Nominator: {{ nominator_display }}{% if is_onekv %} (1KV){% endif %}
+Nominator: {{ nominator_display }}{% if is_onekv %} (DN){% endif %}
 Amount: {{ nomination_amount }} {{ token_ticker }}
 Nominee Count: {{ nominee_count }}
diff --git a/_template/telegram/chain_validator_lost_nomination.html b/_template/telegram/chain_validator_lost_nomination.html
@@ -1,4 +1,4 @@
 <strong>{{ validator_display }}</strong>
 ⬇️ lost a nomination{% if notification_period_type %} in the last {% if notification_period > 1 %}{{ notification_period }} {% endif %}{{ notification_period_type }}{% if notification_period > 1 %}s{% endif %}{% endif %}.
-Nominator: <a href="https://{{ chain }}.subscan.io/account/{{ nominator_address }}">{{ nominator_display }}</a>{% if is_onekv %} (1KV){% endif %}
+Nominator: <a href="https://{{ chain }}.subscan.io/account/{{ nominator_address }}">{{ nominator_display }}</a>{% if is_onekv %} (DN){% endif %}
 Amount: <strong>{{ nomination_amount }} {{ token_ticker }}</strong>
diff --git a/_template/telegram/chain_validator_new_nomination.html b/_template/telegram/chain_validator_new_nomination.html
@@ -1,5 +1,5 @@
 <strong>{{ validator_display }}</strong>
 ⭐️ received a new nomination{% if notification_period_type %} in the last {% if notification_period > 1 %}{{ notification_period }} {% endif %}{{ notification_period_type }}{% if notification_period > 1 %}s{% endif %}{% endif %}!
-Nominator: <a href="https://{{ chain }}.subscan.io/account/{{ nominator_address }}">{{ nominator_display }}</a>{% if is_onekv %} (1KV){% endif %}
+Nominator: <a href="https://{{ chain }}.subscan.io/account/{{ nominator_address }}">{{ nominator_display }}</a>{% if is_onekv %} (DN){% endif %}
 Amount: <strong>{{ nomination_amount }} {{ token_ticker }}</strong>
 Nominee Count: <strong>{{ nominee_count }}</strong>
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.22.4"
+version = "0.22.5"
 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.22.4"
+version = "0.22.5"
 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.22.4"
+version = "0.22.5"
 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.22.4"
+version = "0.22.5"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-kline-updater/Cargo.toml b/subvt-kline-updater/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "subvt-kline-updater"
-version = "0.22.4"
+version = "0.22.5"
 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.22.4"
+version = "0.22.5"
 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.22.4"
+version = "0.22.5"
 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.22.4"
+version = "0.22.5"
 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.22.4"
+version = "0.22.5"
 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.22.4"
+version = "0.22.5"
 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.22.4"
+version = "0.22.5"
 edition = "2021"
 rust-version = "1.67.0"
 

diff --git a/subvt-notification-generator/src/lib.rs b/subvt-notification-generator/src/lib.rs
@@ -96,11 +96,7 @@ impl NotificationGenerator {
                     sent_at: None,
                     delivered_at: None,
                     read_at: None,
-                    data_json: if let Ok(data_json) = serde_json::to_string(&notification_data) {
-                        Some(data_json)
-                    } else {
-                        None
-                    },
+                    data_json: serde_json::to_string(&notification_data).ok(),
                 };
                 let _ = app_postgres.save_notification(&notification).await?;
                 metrics::notification_counter(
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ALTER TABLE sub_extrinsic_payout_stakers ADD COLUMN IF NOT EXISTS page_index INTEGER;
		ALTER TABLE sub_extrinsic_payout_stakers ADD COLUMN IF NOT EXISTS page_index INTEGER;