Add support for multiple hashes in chainHead_unstable_unpin

lib/src/json_rpc/methods.rs

@@ -490,7 +490,7 @@ define_methods! {
     ) -> (),
     chainHead_unstable_unpin(
         #[rename = "followSubscription"] follow_subscription: Cow<'a, str>,
-        hash: HashHexString
+        hash: HashHexStringSingleOrArray
     ) -> (),
 
     chainSpec_unstable_chainName() -> Cow<'a, str>,
@@ -600,6 +600,13 @@ impl<'a> serde::Deserialize<'a> for HashHexString {
     }
 }
 
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(untagged)]
+pub enum HashHexStringSingleOrArray {
+    Single(HashHexString),
+    Array(Vec<HashHexString>),
+}
+
 /// Removes the length prefix at the beginning of `metadata`. Used for the `Metadata_metadata`
 /// JSON-RPC request. Returns an error if there is no valid length prefix.
 pub fn remove_metadata_length_prefix(

light-base/src/json_rpc_service/background/chain_head.rs

@@ -704,23 +704,32 @@ impl<TPlat: PlatformRef> ChainHeadFollowTask<TPlat> {
                     follow_subscription: _,
                     hash,
                 } => {
-                    let valid = {
-                        if self.pinned_blocks_headers.remove(&hash.0).is_some() {
+                    let all_hashes = match &hash {
+                        methods::HashHexStringSingleOrArray::Single(hash) => {
+                            either::Left(iter::once(&hash.0))
+                        }
+                        methods::HashHexStringSingleOrArray::Array(hashes) => {
+                            either::Right(hashes.iter().map(|h| &h.0))
+                        }
+                    };
+
+                    let is_valid = all_hashes
+                        .clone()
+                        .all(|hash| self.pinned_blocks_headers.contains_key(hash));
+
+                    if is_valid {
+                        for hash in all_hashes {
+                            self.pinned_blocks_headers.remove(hash);
                             if let Subscription::WithRuntime {
                                 subscription_id, ..
                             } = self.subscription
                             {
                                 self.runtime_service
-                                    .unpin_block(subscription_id, &hash.0)
+                                    .unpin_block(subscription_id, hash)
                                     .await;
                             }
-                            true
-                        } else {
-                            false
                         }
-                    };
 
-                    if valid {
                         request.respond(methods::Response::chainHead_unstable_unpin(()));
                     } else {
                         request.fail(json_rpc::parse::ErrorResponse::InvalidParams);

wasm-node/CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Changed
 
+- The `chainHead_unstable_unpin` JSON-RPC function now accepts either a single hash or an array of hashes, in accordance with the latest changes in the JSON-RPC API specification. ([#814](https://github.com/smol-dot/smoldot/pull/814))
 - Add support for the `descendants-values`, `descendants-hashes`, and `closest-ancestor-merkle-value` types for the `chainHead_unstable_storage` JSON-RPC function. ([#813](https://github.com/smol-dot/smoldot/pull/813))
 - The `chainHead_unstable_storage` JSON-RPC function now accepts an array of `items` as parameter instead of a `key` and `type`, in accordance with the latest changes in the JSON-RPC API specification. ([#813](https://github.com/smol-dot/smoldot/pull/813))
 - The `chainHead_unstable_storage` JSON-RPC function now generates `items` notifications containin an array of multiple `items`, in accordance with the latest changes in the JSON-RPC API specification. ([#813](https://github.com/smol-dot/smoldot/pull/813))