Backport JSON-RPC change to index field in bestChainBlockIncluded (…

…#1097) * Backport JSON-RPC change to `index` field in `bestChainBlockIncluded` * PR number
smol-dot · Sep 13, 2023 · 1501ea5 · 1501ea5
1 parent 40188db
commit 1501ea5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 31 deletions.
diff --git a/lib/src/json_rpc/methods.rs b/lib/src/json_rpc/methods.rs
@@ -842,7 +842,7 @@ pub enum TransactionWatchEvent<'a> {
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct TransactionWatchEventBlock {
     pub hash: HashHexString,
-    pub index: NumberAsString,
+    pub index: u32,
 }
 
 /// Unstable event.
@@ -933,34 +933,6 @@ pub enum NetworkEvent<'a> {
     },
 }
 
-#[derive(Debug, Clone)]
-pub struct NumberAsString(pub u32);
-
-impl serde::Serialize for NumberAsString {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        self.0.to_string().serialize(serializer)
-    }
-}
-
-impl<'a> serde::Deserialize<'a> for NumberAsString {
-    fn deserialize<D>(deserializer: D) -> Result<NumberAsString, D::Error>
-    where
-        D: serde::Deserializer<'a>,
-    {
-        let string = String::deserialize(deserializer)?;
-        match string.parse() {
-            Ok(num) => Ok(NumberAsString(num)),
-            Err(_) => Err(<D::Error as serde::de::Error>::invalid_value(
-                serde::de::Unexpected::Other("invalid number string"),
-                &"a valid number",
-            )),
-        }
-    }
-}
-
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct Header {
     #[serde(rename = "parentHash")]

diff --git a/light-base/src/json_rpc_service/background/transactions.rs b/light-base/src/json_rpc_service/background/transactions.rs
@@ -221,7 +221,7 @@ impl<TPlat: PlatformRef> Background<TPlat> {
                                         methods::TransactionWatchEvent::BestChainBlockIncluded {
                                             block: Some(methods::TransactionWatchEventBlock {
                                                 hash: methods::HashHexString(block_hash),
-                                                index: methods::NumberAsString(index),
+                                                index,
                                             }),
                                         },
                                 }).await;
@@ -342,7 +342,7 @@ impl<TPlat: PlatformRef> Background<TPlat> {
                                 result: methods::TransactionWatchEvent::Finalized {
                                     block: methods::TransactionWatchEventBlock {
                                         hash: methods::HashHexString(block_hash),
-                                        index: methods::NumberAsString(index),
+                                        index,
                                     },
                                 },
                             }).await,

diff --git a/wasm-node/CHANGELOG.md b/wasm-node/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Changed
+
+- The `index` field of `bestChainBlockIncluded` events of `chainHead_unstable_follow` subscriptions is now a number rather than a string, in accordance with the latest changes in the JSON-RPC API specification. ([#1097](https://github.com/smol-dot/smoldot/pull/1097))
+
 ### Fixed
 
 - Justifications are no longer downloaded for blocks that can't be finalized because an earlier block needs to be finalized first. ([#1127](https://github.com/smol-dot/smoldot/pull/1127))