Merge branch 'master' into update-artifacts-1760920582

Cargo.lock

@@ -1118,9 +1118,9 @@ checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
 [[package]]
 name = "convert_case"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
 dependencies = [
  "unicode-segmentation",
 ]
@@ -1459,6 +1459,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
 dependencies = [
  "const-oid",
+ "pem-rfc7468",
  "zeroize",
 ]
 
@@ -1510,7 +1511,16 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
 dependencies = [
- "derive_more-impl",
+ "derive_more-impl 1.0.0",
+]
+
+[[package]]
+name = "derive_more"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl 2.0.1",
 ]
 
 [[package]]
@@ -1518,6 +1528,17 @@ name = "derive_more-impl"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "convert_case",
  "proc-macro2",
@@ -1686,16 +1707,17 @@ dependencies = [
 
 [[package]]
 name = "ed25519-zebra"
-version = "4.0.3"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9"
+checksum = "0017d969298eec91e3db7a2985a8cab4df6341d86e6f3a6f5878b13fb7846bc9"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
- "hashbrown 0.14.5",
- "hex",
+ "hashbrown 0.15.3",
+ "pkcs8",
  "rand_core",
  "sha2 0.10.9",
+ "subtle",
  "zeroize",
 ]
 
@@ -2815,6 +2837,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.15"
@@ -3246,12 +3277,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.8"
@@ -3292,12 +3317,11 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
 [[package]]
 name = "nom"
-version = "7.1.3"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
 dependencies = [
  "memchr",
- "minimal-lexical",
 ]
 
 [[package]]
@@ -3536,6 +3560,15 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9163e1259760e83d528d1b3171e5100c1767f10c52e1c4d6afad26e63d47d758"
 
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -4229,9 +4262,9 @@ dependencies = [
 
 [[package]]
 name = "ruzstd"
-version = "0.7.3"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f"
+checksum = "3640bec8aad418d7d03c72ea2de10d5c646a598f9883c7babc160d91e3c1b26c"
 
 [[package]]
 name = "ryu"
@@ -4411,7 +4444,7 @@ checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b"
 dependencies = [
  "bitvec",
  "cfg-if",
- "derive_more",
+ "derive_more 1.0.0",
  "parity-scale-codec",
  "scale-info-derive",
  "serde",
@@ -4904,9 +4937,9 @@ dependencies = [
 
 [[package]]
 name = "smoldot"
-version = "0.19.3"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6664ea2d3d3c1d77b8f24032aca6462dc0da8378d25c5bdde6130699b6740fe"
+checksum = "724ab10d6485cccb4bab080ce436c0b361295274aec7847d7ba84ab1a79a5132"
 dependencies = [
  "arrayvec 0.7.6",
  "async-lock",
@@ -4917,7 +4950,7 @@ dependencies = [
  "bs58",
  "chacha20",
  "crossbeam-queue",
- "derive_more",
+ "derive_more 2.0.1",
  "ed25519-zebra",
  "either",
  "event-listener",
@@ -4927,7 +4960,7 @@ dependencies = [
  "hashbrown 0.15.3",
  "hex",
  "hmac 0.12.1",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "libm",
  "libsecp256k1",
  "merlin",
@@ -4958,16 +4991,16 @@ dependencies = [
 
 [[package]]
 name = "smoldot-light"
-version = "0.17.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad7762a41b43cc95e5253214ca8f85a2308a048f4fe8217927888065bafd30c"
+checksum = "e8b4d4971f06f2471f4e57a662dbe8047fa0cc020957764a6211f3fad371f7bd"
 dependencies = [
  "async-channel",
  "async-lock",
  "base64 0.22.1",
  "blake2-rfc",
  "bs58",
- "derive_more",
+ "derive_more 2.0.1",
  "either",
  "event-listener",
  "fnv",
@@ -4976,7 +5009,7 @@ dependencies = [
  "futures-util",
  "hashbrown 0.15.3",
  "hex",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "log",
  "lru",
  "parking_lot",

Cargo.toml

@@ -127,8 +127,8 @@ hyper = "1"
 http-body = "1"
 
 # Light client support:
-smoldot = { version = "0.19.3", default-features = false }
-smoldot-light = { version = "0.17.1", default-features = false }
+smoldot = { version = "0.20.0", default-features = false }
+smoldot-light = { version = "0.18.0", default-features = false }
 tokio-stream = "0.1.16"
 futures-util = "0.3.31"
 rand = "0.8.5"

historic/src/storage/storage_info.rs

@@ -60,7 +60,7 @@ impl<'atblock> AnyStorageInfo<'atblock> {
         Ok(info)
     }
 
-    /// Is the storage entry a map (ie something we'd provide extra keys to to access a value, or otherwise iterate over)?
+    /// Is the storage entry a map (ie something we'd provide extra keys to access a value, or otherwise iterate over)?
     pub fn is_map(&self) -> bool {
         match self {
             AnyStorageInfo::Legacy(info) => !info.info.keys.is_empty(),

rpcs/src/client/mock_rpc_client.rs

@@ -255,7 +255,7 @@ pub struct Json<T>(pub T);
 
 impl Json<serde_json::Value> {
     /// Create a [`Json<serde_json::Value>`] from some serializable value.
-    /// Useful when value types are heterogenous.
+    /// Useful when value types are heterogeneous.
     pub fn value_of<T: serde::Serialize>(item: T) -> Self {
         Json(serde_json::to_value(item).expect("item cannot be converted to a serde_json::Value"))
     }

testing/integration-tests/src/full_client/blocks.rs

@@ -351,6 +351,7 @@ async fn decode_transaction_extensions_from_blocks() {
         "CheckWeight",
         "ChargeAssetTxPayment",
         "CheckMetadataHash",
+        "EthSetOrigin",
         "WeightReclaim",
     ];
 

testing/integration-tests/src/full_client/client/archive_rpcs.rs

@@ -32,7 +32,7 @@ async fn fetch_finalized_blocks<T: Config>(
         .subscribe_finalized()
         .await
         .expect("issue subscribing to finalized in fetch_finalized_blocks")
-        .skip(1) // <- skip first block incase next is close to being ready already.
+        .skip(1) // <- skip first block in case next is close to being ready already.
         .take(n)
         .map(|r| r.expect("issue fetching block in fetch_finalized_blocks"))
 }