From 310e1e3ed85ec413bac4fb8a115e058207dee68c Mon Sep 17 00:00:00 2001
From: Michael Mueller <mich@elmueller.net>
Date: Thu, 13 Nov 2025 11:29:23 +0100
Subject: [PATCH 1/4] Revert to `cbab8ed4be1941420dd25dc81102fb79d8e2a7f0`

---
 crates/revive-types/src/primitives.rs         | 12 -----------
 crates/sandbox/Cargo.toml                     | 20 +++++++++----------
 crates/sandbox/src/api/revive_api.rs          |  6 ------
 .../public/runtime-call-contract/Cargo.toml   | 12 +++++------
 .../pallet-revive-caller/src/executor.rs      |  2 --
 5 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/crates/revive-types/src/primitives.rs b/crates/revive-types/src/primitives.rs
index 9532e19415..e0b7b6f144 100644
--- a/crates/revive-types/src/primitives.rs
+++ b/crates/revive-types/src/primitives.rs
@@ -259,16 +259,4 @@ pub struct ExecConfig {
     ///
     /// It is determined when transforming `eth_transact` into a proper extrinsic.
     pub effective_gas_price: Option<U256>,
-    /// Whether this configuration was created for a dry-run execution.
-    /// Use to enable logic that should only run in dry-run mode.
-    pub is_dry_run: bool,
-    /// An optional mock handler that can be used to override certain behaviors.
-    /// This is primarily used for testing purposes and should be `None` in production
-    /// environments.
-    ///
-    /// __Note:__ We don't support this in ink! yet!
-    /// The correct `pallet-revive` type is `Option<Box<dyn MockHandler<T>>>`. The unit
-    /// type here is just a placeholder so that we don't have to import everything around
-    /// `MockHandler`.
-    pub mock_handler: Option<()>,
 }
diff --git a/crates/sandbox/Cargo.toml b/crates/sandbox/Cargo.toml
index 9286d2e32e..6aa6e306a0 100644
--- a/crates/sandbox/Cargo.toml
+++ b/crates/sandbox/Cargo.toml
@@ -12,19 +12,19 @@ homepage.workspace = true
 [dependencies]
 sha3 = "0.10.8"
 frame-metadata = { workspace = true }
-frame-system = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false }
-frame-support = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false }
-pallet-assets = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false }
-pallet-assets-precompiles = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false }
-pallet-balances = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false }
-pallet-revive = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false }
-pallet-timestamp = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false  }
+frame-system = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
+frame-support = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
+pallet-assets = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
+pallet-assets-precompiles = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
+pallet-balances = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
+pallet-revive = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
+pallet-timestamp = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false  }
 scale = { workspace = true }
 sp-core = { workspace = true, default-features = false }
-sp-externalities = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false  }
+sp-externalities = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false  }
 sp-runtime = { version = "43.0.0", default-features = false  }
-sp-io = {  git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false  }
+sp-io = {  git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false  }
 
 ink_primitives = { workspace = true }
 ink_revive_types = { workspace = true }
diff --git a/crates/sandbox/src/api/revive_api.rs b/crates/sandbox/src/api/revive_api.rs
index 82ce5a01e8..37b0850096 100644
--- a/crates/sandbox/src/api/revive_api.rs
+++ b/crates/sandbox/src/api/revive_api.rs
@@ -218,8 +218,6 @@ where
                     bump_nonce: true,
                     collect_deposit_from_hold: None,
                     effective_gas_price: None,
-                    is_dry_run: false,
-                    mock_handler: None,
                 },
             )
         })
@@ -248,8 +246,6 @@ where
                     bump_nonce: true,
                     collect_deposit_from_hold: None,
                     effective_gas_price: None,
-                    is_dry_run: false,
-                    mock_handler: None,
                 },
             )
         })
@@ -291,8 +287,6 @@ where
                     bump_nonce: true,
                     collect_deposit_from_hold: None,
                     effective_gas_price: None,
-                    is_dry_run: false,
-                    mock_handler: None,
                 },
             )
         })
diff --git a/integration-tests/public/runtime-call-contract/Cargo.toml b/integration-tests/public/runtime-call-contract/Cargo.toml
index 1e6bef9765..08616179bb 100644
--- a/integration-tests/public/runtime-call-contract/Cargo.toml
+++ b/integration-tests/public/runtime-call-contract/Cargo.toml
@@ -11,11 +11,11 @@ keywords = ["polkavm", "ink", "riscv", "blockchain", "edsl"]
 publish = false
 
 [workspace.dependencies]
-frame-support = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false }
-frame-system = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false }
-pallet-balances = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false }
-pallet-revive = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false }
-sp-runtime = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false  }
+frame-support = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
+frame-system = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
+pallet-balances = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
+pallet-revive = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
+sp-runtime = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false  }
 # todo
 codec = { package = "parity-scale-codec", version =  "3.7.4", default-features = false }
 scale-info = { version = "2.11.1", default-features = false }
@@ -38,7 +38,7 @@ sandbox-runtime = { path = "sandbox-runtime", default-features = false }
 scale-value = "0.18.0"
 # can't use workspace dependency because of `cargo-contract` build not
 # working with workspace dependencies
-frame-support = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "9136565addc23a552f6960a7581f13c8dfc651f1", default-features = false }
+frame-support = { git = "https://github.com/use-ink/polkadot-sdk.git", rev = "cbab8ed4be1941420dd25dc81102fb79d8e2a7f0", default-features = false }
 
 [lib]
 path = "lib.rs"
diff --git a/integration-tests/public/runtime-call-contract/sandbox-runtime/pallet-revive-caller/src/executor.rs b/integration-tests/public/runtime-call-contract/sandbox-runtime/pallet-revive-caller/src/executor.rs
index ca3e380f65..f113f959d8 100644
--- a/integration-tests/public/runtime-call-contract/sandbox-runtime/pallet-revive-caller/src/executor.rs
+++ b/integration-tests/public/runtime-call-contract/sandbox-runtime/pallet-revive-caller/src/executor.rs
@@ -69,8 +69,6 @@ where
                 bump_nonce: true,
                 collect_deposit_from_hold: None,
                 effective_gas_price: None,
-                is_dry_run: false,
-                mock_handler: None,
             },
         );
 

From 60e4be7123b398559fc16cd12516c1bb86d6610f Mon Sep 17 00:00:00 2001
From: Michael Mueller <mich@elmueller.net>
Date: Thu, 13 Nov 2025 12:52:28 +0100
Subject: [PATCH 2/4] Update lockfile

---
 Cargo.lock | 442 +++++++++++++++++++++--------------------------------
 1 file changed, 178 insertions(+), 264 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5373bf939b..7d55921570 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -65,32 +65,6 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
-[[package]]
-name = "alloy-consensus"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90d103d3e440ad6f703dd71a5b58a6abd24834563bde8a5fabe706e00242f810"
-dependencies = [
- "alloy-eips",
- "alloy-primitives",
- "alloy-rlp",
- "alloy-serde",
- "alloy-trie",
- "alloy-tx-macros",
- "auto_impl",
- "c-kzg",
- "derive_more 2.0.1",
- "either",
- "k256",
- "once_cell",
- "rand 0.8.5",
- "secp256k1 0.30.0",
- "serde",
- "serde_json",
- "serde_with",
- "thiserror 2.0.17",
-]
-
 [[package]]
 name = "alloy-core"
 version = "1.4.1"
@@ -239,7 +213,7 @@ checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -264,7 +238,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -280,7 +254,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
  "syn-solidity",
  "tiny-keccak",
 ]
@@ -297,7 +271,7 @@ dependencies = [
  "macro-string",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
  "syn-solidity",
 ]
 
@@ -323,34 +297,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "alloy-trie"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3412d52bb97c6c6cc27ccc28d4e6e8cf605469101193b50b0bd5813b1f990b5"
-dependencies = [
- "alloy-primitives",
- "alloy-rlp",
- "arrayvec 0.7.6",
- "derive_more 2.0.1",
- "nybbles",
- "serde",
- "smallvec",
- "tracing",
-]
-
-[[package]]
-name = "alloy-tx-macros"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7ce8ed34106acd6e21942022b6a15be6454c2c3ead4d76811d3bdcd63cf771"
-dependencies = [
- "darling 0.21.3",
- "proc-macro2",
- "quote",
- "syn 2.0.109",
-]
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -436,7 +382,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -630,7 +576,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60"
 dependencies = [
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -668,7 +614,7 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -782,7 +728,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -880,9 +826,6 @@ name = "arrayvec"
 version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "async-channel"
@@ -1011,7 +954,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -1044,7 +987,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -1101,7 +1044,7 @@ checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
 [[package]]
 name = "binary-merkle-tree"
 version = "13.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "hash-db",
  "log",
@@ -1371,7 +1314,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -1619,7 +1562,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -1718,22 +1661,22 @@ dependencies = [
 
 [[package]]
 name = "const_env"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e9e4f72c6e3398ca6da372abd9affd8f89781fe728869bbf986206e9af9627e"
+checksum = "5abf3680e7fff0295abbd53b271930edecadd1c6bf77cc77bf63dc741663a988"
 dependencies = [
  "const_env_impl",
 ]
 
 [[package]]
 name = "const_env_impl"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a4f51209740b5e1589e702b3044cdd4562cef41b6da404904192ffffb852d62"
+checksum = "71f9a669d589cdabddc551d8646c02ac055498212de30fc8fc42de30a41a963e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -1947,9 +1890,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-common"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array 0.14.7",
  "rand_core 0.6.4",
@@ -2005,7 +1948,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2039,7 +1982,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2052,9 +1995,8 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "serde",
  "strsim",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2065,7 +2007,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core 0.20.11",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2076,7 +2018,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core 0.21.3",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2119,7 +2061,7 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2130,7 +2072,7 @@ checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2141,7 +2083,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2152,7 +2094,7 @@ checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2181,7 +2123,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2193,7 +2135,7 @@ dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
  "unicode-xid",
 ]
 
@@ -2253,7 +2195,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2283,7 +2225,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.109",
+ "syn 2.0.110",
  "termcolor",
  "toml 0.8.23",
  "walkdir",
@@ -2392,7 +2334,7 @@ dependencies = [
  "enum-ordinalize",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2400,9 +2342,6 @@ name = "either"
 version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "elliptic-curve"
@@ -2441,7 +2380,7 @@ checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2511,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "ethereum-standards"
 version = "0.1.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "alloy-core",
 ]
@@ -2565,7 +2504,7 @@ dependencies = [
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2676,7 +2615,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "frame-support 28.0.0",
  "frame-support-procedural 23.0.0",
@@ -2742,7 +2681,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "28.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "aquamarine",
  "array-bytes",
@@ -2764,8 +2703,8 @@ dependencies = [
  "sp-api 26.0.0",
  "sp-arithmetic 23.0.0",
  "sp-core 28.0.0",
- "sp-crypto-hashing-proc-macro 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
- "sp-debug-derive 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
+ "sp-crypto-hashing-proc-macro 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
  "sp-genesis-builder 0.8.0",
  "sp-inherents 26.0.0",
  "sp-io 30.0.0",
@@ -2773,7 +2712,7 @@ dependencies = [
  "sp-runtime 31.0.1",
  "sp-staking 26.0.0",
  "sp-state-machine 0.35.0",
- "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
+ "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
  "sp-tracing 16.0.0",
  "sp-trie 29.0.0",
  "sp-weights 27.0.0",
@@ -2825,7 +2764,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "23.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -2838,8 +2777,8 @@ dependencies = [
  "proc-macro-warning",
  "proc-macro2",
  "quote",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
- "syn 2.0.109",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2860,19 +2799,19 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools"
 version = "10.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "frame-support-procedural-tools-derive 11.0.0",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2885,17 +2824,17 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "11.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2906,13 +2845,13 @@ checksum = "ed971c6435503a099bdac99fe4c5bea08981709e5b5a0a8535a1856f48561191"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
 name = "frame-system"
 version = "28.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "cfg-if",
  "docify",
@@ -3013,7 +2952,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -3369,9 +3308,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+checksum = "1744436df46f0bde35af3eda22aeaba453aada65d8f1c171cd8a5f59030bd69f"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -3628,7 +3567,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -3726,7 +3665,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_json",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -3774,7 +3713,7 @@ dependencies = [
  "ink_sandbox",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
  "temp-env",
  "tracing",
  "tracing-subscriber 0.3.20",
@@ -3838,7 +3777,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha3",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -3857,7 +3796,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scale-info",
- "syn 2.0.109",
+ "syn 2.0.110",
  "synstructure",
 ]
 
@@ -4139,7 +4078,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -4414,7 +4353,7 @@ checksum = "e5cec0ec4228b4853bb129c84dbf093a27e6c7a20526da046defc334a1b017f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -4476,7 +4415,7 @@ checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -4488,7 +4427,7 @@ dependencies = [
  "macro_magic_core",
  "macro_magic_macros",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -4502,7 +4441,7 @@ dependencies = [
  "macro_magic_core_macros",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -4513,7 +4452,7 @@ checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -4524,7 +4463,7 @@ checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869"
 dependencies = [
  "macro_magic_core",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -4766,21 +4705,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
-]
-
-[[package]]
-name = "nybbles"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c4b5ecbd0beec843101bffe848217f770e8b8da81d8355b7d6e226f2199b3dc"
-dependencies = [
- "alloy-rlp",
- "cfg-if",
- "proptest",
- "ruint",
- "serde",
- "smallvec",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -4865,7 +4790,7 @@ dependencies = [
 [[package]]
 name = "pallet-assets"
 version = "29.1.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "frame-benchmarking",
  "frame-support 28.0.0",
@@ -4881,7 +4806,7 @@ dependencies = [
 [[package]]
 name = "pallet-assets-precompiles"
 version = "0.1.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "ethereum-standards",
  "frame-support 28.0.0",
@@ -4892,7 +4817,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "28.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -4908,11 +4833,9 @@ dependencies = [
 [[package]]
 name = "pallet-revive"
 version = "0.1.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
- "alloy-consensus",
  "alloy-core",
- "alloy-trie",
  "derive_more 0.99.20",
  "environmental",
  "ethereum-standards",
@@ -4923,7 +4846,6 @@ dependencies = [
  "hex-literal 0.4.1",
  "humantime-serde",
  "impl-trait-for-tuples",
- "k256",
  "log",
  "num-bigint",
  "num-integer",
@@ -4942,7 +4864,6 @@ dependencies = [
  "rlp 0.6.1",
  "scale-info",
  "serde",
- "serde_json",
  "sp-api 26.0.0",
  "sp-arithmetic 23.0.0",
  "sp-consensus-aura",
@@ -4951,7 +4872,6 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-io 30.0.0",
  "sp-runtime 31.0.1",
- "sp-version 29.0.0",
  "substrate-bn",
  "subxt-signer 0.43.0",
 ]
@@ -4959,7 +4879,7 @@ dependencies = [
 [[package]]
 name = "pallet-revive-fixtures"
 version = "0.1.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "alloy-core",
  "anyhow",
@@ -4976,11 +4896,11 @@ dependencies = [
 [[package]]
 name = "pallet-revive-proc-macro"
 version = "0.1.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -4991,13 +4911,13 @@ checksum = "ad05b2a187e27ba651c31209020f3797054f406d1f9cb3f5e828fd6245f65866"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
 name = "pallet-revive-uapi"
 version = "0.1.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "alloy-core",
  "bitflags 1.3.2",
@@ -5025,7 +4945,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "27.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5043,7 +4963,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "28.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "frame-benchmarking",
  "frame-support 28.0.0",
@@ -5095,7 +5015,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5216,7 +5136,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5245,7 +5165,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5362,7 +5282,7 @@ dependencies = [
  "polkavm-common 0.26.0",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5374,7 +5294,7 @@ dependencies = [
  "polkavm-common 0.27.0",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5386,7 +5306,7 @@ dependencies = [
  "polkavm-common 0.29.0",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5396,7 +5316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "581d34cafec741dc5ffafbb341933c205b6457f3d76257a9d99fb56687219c91"
 dependencies = [
  "polkavm-derive-impl 0.26.0",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5406,7 +5326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a45173d70138aa1879892c50777ed0d8b0c8556f7678372f09fa1d89bbbddb4"
 dependencies = [
  "polkavm-derive-impl 0.27.0",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5416,7 +5336,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10e463de593b485c8685d42737aae81c24005dba967deaaaccbb6f3e936d8596"
 dependencies = [
  "polkavm-derive-impl 0.29.0",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5507,7 +5427,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5597,7 +5517,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5608,7 +5528,7 @@ checksum = "75eea531cfcd120e0851a3f8aed42c4841f78c889eefafd96339c72677ae42c3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5678,7 +5598,7 @@ checksum = "f71ee38b42f8459a88d3362be6f9b841ad2d5421844f61eb1c59c11bff3ac14a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -5711,7 +5631,6 @@ dependencies = [
  "libc",
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
- "serde",
 ]
 
 [[package]]
@@ -5816,7 +5735,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -6371,7 +6290,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -6399,7 +6318,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -6426,7 +6345,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -6448,7 +6367,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scale-info",
- "syn 2.0.109",
+ "syn 2.0.110",
  "thiserror 2.0.17",
 ]
 
@@ -6525,7 +6444,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -6618,7 +6537,6 @@ dependencies = [
  "bitcoin_hashes 0.14.0",
  "rand 0.8.5",
  "secp256k1-sys 0.10.1",
- "serde",
 ]
 
 [[package]]
@@ -6796,7 +6714,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -6807,7 +6725,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -6832,7 +6750,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -6893,7 +6811,7 @@ dependencies = [
  "darling 0.21.3",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -7092,9 +7010,6 @@ name = "smallvec"
 version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "smol"
@@ -7231,7 +7146,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "26.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "docify",
  "hash-db",
@@ -7276,7 +7191,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "15.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "Inflector",
  "blake2",
@@ -7284,7 +7199,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -7299,13 +7214,13 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
 name = "sp-application-crypto"
 version = "30.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -7330,7 +7245,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "23.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "docify",
  "integer-sqrt",
@@ -7359,7 +7274,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.32.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -7375,7 +7290,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.32.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -7393,7 +7308,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.32.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -7404,7 +7319,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "28.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "ark-vrf",
  "array-bytes",
@@ -7435,10 +7350,10 @@ dependencies = [
  "secrecy 0.8.0",
  "serde",
  "sha2 0.10.9",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
- "sp-debug-derive 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
  "sp-externalities 0.25.0",
- "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
+ "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
  "sp-storage 19.0.0",
  "ss58-registry",
  "substrate-bip39 0.4.7",
@@ -7513,7 +7428,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing"
 version = "0.1.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -7531,17 +7446,17 @@ checksum = "b85d0f1f1e44bd8617eb2a48203ee854981229e3e79e6f468c7175d5fd37489b"
 dependencies = [
  "quote",
  "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
 name = "sp-crypto-hashing-proc-macro"
 version = "0.1.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "quote",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
- "syn 2.0.109",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -7552,23 +7467,23 @@ checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
 name = "sp-externalities"
 version = "0.25.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -7589,7 +7504,7 @@ dependencies = [
 [[package]]
 name = "sp-genesis-builder"
 version = "0.8.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -7614,7 +7529,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "26.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -7641,7 +7556,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "30.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "bytes",
  "docify",
@@ -7653,7 +7568,7 @@ dependencies = [
  "rustversion",
  "secp256k1 0.28.2",
  "sp-core 28.0.0",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
  "sp-externalities 0.25.0",
  "sp-keystore 0.34.0",
  "sp-runtime-interface 24.0.0",
@@ -7705,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.34.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "parity-scale-codec",
  "parking_lot",
@@ -7728,7 +7643,7 @@ dependencies = [
 [[package]]
 name = "sp-metadata-ir"
 version = "0.6.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
@@ -7749,7 +7664,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "13.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "backtrace",
  "regex",
@@ -7768,10 +7683,9 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "31.0.1"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "binary-merkle-tree 13.0.0",
- "bytes",
  "docify",
  "either",
  "hash256-std-hasher",
@@ -7788,7 +7702,7 @@ dependencies = [
  "sp-arithmetic 23.0.0",
  "sp-core 28.0.0",
  "sp-io 30.0.0",
- "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
+ "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
  "sp-trie 29.0.0",
  "sp-weights 27.0.0",
  "tracing",
@@ -7828,7 +7742,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -7836,7 +7750,7 @@ dependencies = [
  "polkavm-derive 0.26.0",
  "sp-externalities 0.25.0",
  "sp-runtime-interface-proc-macro 17.0.0",
- "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
+ "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
  "sp-storage 19.0.0",
  "sp-tracing 16.0.0",
  "sp-wasm-interface 20.0.0",
@@ -7866,14 +7780,14 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "17.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "Inflector",
  "expander",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -7887,13 +7801,13 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
 name = "sp-staking"
 version = "26.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7920,7 +7834,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.35.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "hash-db",
  "log",
@@ -7967,18 +7881,18 @@ checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834"
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 
 [[package]]
 name = "sp-storage"
 version = "19.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "ref-cast",
  "serde",
- "sp-debug-derive 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
 ]
 
 [[package]]
@@ -7997,7 +7911,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "26.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -8009,7 +7923,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "16.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "parity-scale-codec",
  "regex",
@@ -8034,7 +7948,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "29.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "ahash",
  "foldhash 0.1.5",
@@ -8085,16 +7999,16 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "29.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "parity-wasm",
  "scale-info",
  "serde",
- "sp-crypto-hashing-proc-macro 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
+ "sp-crypto-hashing-proc-macro 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
  "sp-runtime 31.0.1",
- "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
+ "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
  "sp-version-proc-macro 13.0.0",
  "thiserror 1.0.69",
 ]
@@ -8120,13 +8034,13 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "13.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "parity-scale-codec",
  "proc-macro-warning",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -8139,13 +8053,13 @@ dependencies = [
  "proc-macro-warning",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
@@ -8168,7 +8082,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "27.0.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "bounded-collections",
  "parity-scale-codec",
@@ -8176,7 +8090,7 @@ dependencies = [
  "serde",
  "smallvec",
  "sp-arithmetic 23.0.0",
- "sp-debug-derive 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0)",
 ]
 
 [[package]]
@@ -8284,13 +8198,13 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
 name = "substrate-bip39"
 version = "0.4.7"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
@@ -8328,7 +8242,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.17.0"
-source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=9136565addc23a552f6960a7581f13c8dfc651f1#9136565addc23a552f6960a7581f13c8dfc651f1"
+source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=cbab8ed4be1941420dd25dc81102fb79d8e2a7f0#cbab8ed4be1941420dd25dc81102fb79d8e2a7f0"
 dependencies = [
  "http-body-util",
  "hyper",
@@ -8410,7 +8324,7 @@ dependencies = [
  "scale-info",
  "scale-typegen",
  "subxt-metadata 0.44.0",
- "syn 2.0.109",
+ "syn 2.0.110",
  "thiserror 2.0.17",
 ]
 
@@ -8505,7 +8419,7 @@ dependencies = [
  "subxt-codegen",
  "subxt-metadata 0.44.0",
  "subxt-utils-fetchmetadata",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -8646,9 +8560,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.109"
+version = "2.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f"
+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8664,7 +8578,7 @@ dependencies = [
  "paste",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -8675,7 +8589,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -8757,7 +8671,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -8768,7 +8682,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -8878,7 +8792,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -9034,7 +8948,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -9452,7 +9366,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
  "wasm-bindgen-shared",
 ]
 
@@ -9626,7 +9540,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -9637,7 +9551,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -10018,7 +9932,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -10058,7 +9972,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
  "synstructure",
 ]
 
@@ -10079,7 +9993,7 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -10099,7 +10013,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
  "synstructure",
 ]
 
@@ -10120,7 +10034,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -10153,7 +10067,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.109",
+ "syn 2.0.110",
 ]
 
 [[package]]

From 84d98786ba8d546d32ede761678b82fff533d7c2 Mon Sep 17 00:00:00 2001
From: Michael Mueller <mich@elmueller.net>
Date: Thu, 13 Nov 2025 13:01:12 +0100
Subject: [PATCH 3/4] Revert stabilization of `terminate_contract`

This reverts parts of commit d46acb516f89158eb0f529ee63611d57cbd0f755.
---
 CHANGELOG.md                                  |  1 -
 Cargo.lock                                    |  9 ++--
 crates/engine/src/ext.rs                      |  9 +++-
 crates/env/src/api.rs                         |  3 +-
 crates/env/src/backend.rs                     |  3 +-
 crates/env/src/engine/off_chain/impls.rs      |  5 +-
 crates/env/src/engine/off_chain/test_api.rs   | 48 +++++++++++++++++++
 .../env/src/engine/on_chain/pallet_revive.rs  | 30 ++++--------
 crates/ink/src/env_access.rs                  |  3 +-
 crates/revive-types/src/primitives.rs         |  4 +-
 crates/sandbox/src/macros.rs                  |  2 +-
 .../public/contract-terminate/Cargo.toml      |  2 +-
 .../public/contract-terminate/lib.rs          | 46 ++++++++++++------
 integration-tests/public/contract-xcm/lib.rs  |  5 +-
 .../public/payment-channel/lib.rs             | 20 ++------
 15 files changed, 118 insertions(+), 72 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d33fbe03b5..0e790b8ade 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Refactor contract ref generation and add automatic re-exporting ‒ [#2710](https://github.com/use-ink/ink/pull/2710)
-- Implement and stabilize `terminate_contract` ‒ [2708](https://github.com/use-ink/ink/pull/2708)
 
 ## Version 6.0.0-beta
 
diff --git a/Cargo.lock b/Cargo.lock
index 7d55921570..369b86ee73 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -135,9 +135,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bdbec74583d0067798d77afa43d58f00d93035335d7ceaa5d3f93857d461bb9"
+checksum = "7e867b5fd52ed0372a95016f3a37cbff95a9d5409230fbaef2d8ea00e8618098"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -146,6 +146,7 @@ dependencies = [
  "alloy-rlp",
  "alloy-serde",
  "auto_impl",
+ "borsh",
  "c-kzg",
  "derive_more 2.0.1",
  "either",
@@ -218,9 +219,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "751d1887f7d202514a82c5b3caf28ee8bd4a2ad9549e4f498b6f0bff99b52add"
+checksum = "01e856112bfa0d9adc85bd7c13db03fad0e71d1d6fb4c2010e475b6718108236"
 dependencies = [
  "alloy-primitives",
  "serde",
diff --git a/crates/engine/src/ext.rs b/crates/engine/src/ext.rs
index 6c6261443d..c2d57b4c14 100644
--- a/crates/engine/src/ext.rs
+++ b/crates/engine/src/ext.rs
@@ -32,6 +32,7 @@ use ink_primitives::{
     U256,
 };
 pub use pallet_revive_uapi::ReturnErrorCode as Error;
+use std::panic::panic_any;
 
 /// The off-chain engine.
 pub struct Engine {
@@ -190,7 +191,7 @@ impl Engine {
     /// This function never returns. Either the termination was successful and the
     /// execution of the destroyed contract is halted. Or it failed during the
     /// termination which is considered fatal.
-    pub fn terminate(&mut self, beneficiary: Address) -> Result<(), Error> {
+    pub fn terminate(&mut self, beneficiary: Address) -> ! {
         // Send the remaining balance to the beneficiary
         let contract = self.get_callee();
         let all = self
@@ -200,7 +201,11 @@ impl Engine {
         self.transfer(beneficiary, value)
             .unwrap_or_else(|err| panic!("transfer did not work: {err:?}"));
 
-        Ok(())
+        // Encode the result of the termination and panic with it.
+        // This enables testing for the proper result and makes sure this
+        // method returns `Never`.
+        let res = (all, beneficiary);
+        panic_any(scale::Encode::encode(&res));
     }
 
     /// Returns the address of the caller.
diff --git a/crates/env/src/api.rs b/crates/env/src/api.rs
index 6105dd8d26..a8a29585ee 100644
--- a/crates/env/src/api.rs
+++ b/crates/env/src/api.rs
@@ -465,7 +465,8 @@ where
 /// This function never returns. Either the termination was successful and the
 /// execution of the destroyed contract is halted. Or it failed during the termination
 /// which is considered fatal and results in a trap and rollback.
-pub fn terminate_contract(beneficiary: Address) -> Result<()> {
+#[cfg(feature = "unstable-hostfn")]
+pub fn terminate_contract(beneficiary: Address) -> ! {
     <EnvInstance as OnInstance>::on_instance(|instance| {
         TypedEnvBackend::terminate_contract(instance, beneficiary)
     })
diff --git a/crates/env/src/backend.rs b/crates/env/src/backend.rs
index f71a0ca063..2d1c3f0135 100644
--- a/crates/env/src/backend.rs
+++ b/crates/env/src/backend.rs
@@ -438,7 +438,8 @@ pub trait TypedEnvBackend: EnvBackend {
     /// # Note
     ///
     /// For more details visit: [`terminate_contract`][`crate::terminate_contract`]
-    fn terminate_contract(&mut self, beneficiary: Address) -> Result<()>;
+    #[cfg(feature = "unstable-hostfn")]
+    fn terminate_contract(&mut self, beneficiary: Address) -> !;
 
     /// Transfers value from the contract to the destination account ID.
     ///
diff --git a/crates/env/src/engine/off_chain/impls.rs b/crates/env/src/engine/off_chain/impls.rs
index 6854b77c27..7fcf0dc59e 100644
--- a/crates/env/src/engine/off_chain/impls.rs
+++ b/crates/env/src/engine/off_chain/impls.rs
@@ -781,8 +781,9 @@ impl TypedEnvBackend for EnvInstance {
         ))))
     }
 
-    fn terminate_contract(&mut self, beneficiary: Address) -> Result<()> {
-        self.engine.terminate(beneficiary).map_err(Into::into)
+    #[cfg(feature = "unstable-hostfn")]
+    fn terminate_contract(&mut self, beneficiary: Address) -> ! {
+        self.engine.terminate(beneficiary)
     }
 
     fn transfer<E>(&mut self, destination: Address, value: U256) -> Result<()>
diff --git a/crates/env/src/engine/off_chain/test_api.rs b/crates/env/src/engine/off_chain/test_api.rs
index 18c6caa7eb..a2e838831a 100644
--- a/crates/env/src/engine/off_chain/test_api.rs
+++ b/crates/env/src/engine/off_chain/test_api.rs
@@ -22,6 +22,8 @@ use crate::{
     Result,
     types::Environment,
 };
+use core::fmt::Debug;
+use std::panic::UnwindSafe;
 
 pub use super::call_data::CallData;
 pub use ink_engine::ext::ChainSpec;
@@ -291,6 +293,52 @@ pub fn recorded_events() -> Vec<EmittedEvent> {
     })
 }
 
+/// Tests if a contract terminates successfully after `self.env().terminate()`
+/// has been called.
+///
+/// The arguments denote:
+///
+/// * `should_terminate`: A closure in which the function supposed to terminate is called.
+/// * `expected_beneficiary`: The beneficiary account who should have received the
+///   remaining value in the contract
+/// * `expected_value_transferred_to_beneficiary`: The value which should have been
+///   transferred to the `expected_beneficiary`.
+///
+/// # Usage
+///
+/// ```no_compile
+/// let should_terminate = move || your_contract.fn_which_should_terminate();
+/// ink_env::test::assert_contract_termination::<ink_env::DefaultEnvironment, _>(
+///     should_terminate,
+///     expected_beneficiary,
+///     expected_value_transferred_to_beneficiary
+/// );
+/// ```
+///
+/// See our [`contract-terminate`](https://github.com/use-ink/ink-examples/tree/v5.x.x/contract-terminate)
+/// example for a complete usage exemplification.
+pub fn assert_contract_termination<T, F>(
+    should_terminate: F,
+    expected_beneficiary: Address,
+    expected_value_transferred_to_beneficiary: U256,
+) where
+    T: Environment,
+    F: FnMut() + UnwindSafe,
+    <T as Environment>::AccountId: Debug,
+    <T as Environment>::Balance: Debug,
+{
+    let value_any = ::std::panic::catch_unwind(should_terminate)
+        .expect_err("contract did not terminate");
+    let encoded_input = value_any
+        .downcast_ref::<Vec<u8>>()
+        .expect("panic object can not be cast");
+    let (value_transferred, beneficiary): (U256, Address) =
+        scale::Decode::decode(&mut &encoded_input[..])
+            .unwrap_or_else(|err| panic!("input can not be decoded: {err}"));
+    assert_eq!(value_transferred, expected_value_transferred_to_beneficiary);
+    assert_eq!(beneficiary, expected_beneficiary);
+}
+
 /// Prepend contract message call with value transfer. Used for tests in off-chain
 /// environment.
 #[macro_export]
diff --git a/crates/env/src/engine/on_chain/pallet_revive.rs b/crates/env/src/engine/on_chain/pallet_revive.rs
index 329968be10..17a848723e 100644
--- a/crates/env/src/engine/on_chain/pallet_revive.rs
+++ b/crates/env/src/engine/on_chain/pallet_revive.rs
@@ -1303,28 +1303,14 @@ impl TypedEnvBackend for EnvInstance {
         )
     }
 
-    fn terminate_contract(&mut self, beneficiary: Address) -> Result<()> {
-        let beneficiary = beneficiary.as_fixed_bytes();
-
-        const ADDR: [u8; 20] =
-            hex_literal::hex!("0000000000000000000000000000000000000900");
-
-        let mut input = [0u8; 32 + 4];
-        let sel = const { solidity_selector("terminate(address)") };
-        input[..4].copy_from_slice(&sel[..4]);
-        input[16..36].copy_from_slice(&beneficiary[..]);
-
-        let _ = ext::call(
-            CallFlags::empty(),
-            &ADDR,
-            u64::MAX,       // `ref_time` to devote for execution. `u64::MAX` = all
-            u64::MAX,       // `proof_size` to devote for execution. `u64::MAX` = all
-            &[u8::MAX; 32], // No deposit limit.
-            &U256::zero().to_little_endian(), // Value transferred to the contract.
-            &input[..],
-            None,
-        );
-        Ok(())
+    #[cfg(feature = "unstable-hostfn")]
+    fn terminate_contract(&mut self, beneficiary: Address) -> ! {
+        let buffer: &mut [u8; 20] = self.scoped_buffer().take_encoded(&beneficiary)
+            [0..20]
+            .as_mut()
+            .try_into()
+            .unwrap();
+        ext::terminate(buffer);
     }
 
     fn transfer<E>(&mut self, destination: Address, value: U256) -> Result<()>
diff --git a/crates/ink/src/env_access.rs b/crates/ink/src/env_access.rs
index 2f726baca0..8e0d3b176b 100644
--- a/crates/ink/src/env_access.rs
+++ b/crates/ink/src/env_access.rs
@@ -895,7 +895,8 @@ where
     /// # Note
     ///
     /// For more details visit: [`ink_env::terminate_contract`]
-    pub fn terminate_contract(self, beneficiary: Address) -> Result<()> {
+    #[cfg(feature = "unstable-hostfn")]
+    pub fn terminate_contract(self, beneficiary: Address) -> ! {
         ink_env::terminate_contract(beneficiary)
     }
 
diff --git a/crates/revive-types/src/primitives.rs b/crates/revive-types/src/primitives.rs
index e0b7b6f144..c435a067bf 100644
--- a/crates/revive-types/src/primitives.rs
+++ b/crates/revive-types/src/primitives.rs
@@ -247,8 +247,8 @@ pub struct ExecConfig {
     /// The origin's nonce is already incremented pre-dispatch by the `CheckNonce`
     /// transaction extension.
     ///
-    /// This does not apply to contract initiated instantiations. Those will always
-    /// bump the instantiating contract's nonce.
+    /// This does not apply to contract initiated instantiations. Those will always bump
+    /// the instantiating contract's nonce.
     pub bump_nonce: bool,
     /// Whether deposits will be withdrawn from the `pallet_transaction_payment` credit
     /// (`Some`) free balance (`None`).
diff --git a/crates/sandbox/src/macros.rs b/crates/sandbox/src/macros.rs
index 94528b747d..4e82559eee 100644
--- a/crates/sandbox/src/macros.rs
+++ b/crates/sandbox/src/macros.rs
@@ -359,7 +359,7 @@ mod construct_runtime {
 
     parameter_types! {
         pub CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(0);
-        pub const MaxEthExtrinsicWeight: FixedU128 = FixedU128::from_rational(9, 10);
+        pub const MaxEthExtrinsicWeight: FixedU128 = FixedU128::from_rational(1,2);
         pub const DepositPerChildTrieItem: Balance = deposit(1, 0) / 100;
     }
 
diff --git a/integration-tests/public/contract-terminate/Cargo.toml b/integration-tests/public/contract-terminate/Cargo.toml
index 389d6aa6dd..8e12fde257 100644
--- a/integration-tests/public/contract-terminate/Cargo.toml
+++ b/integration-tests/public/contract-terminate/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2024"
 publish = false
 
 [dependencies]
-ink = { path = "../../../crates/ink", default-features = false }
+ink = { path = "../../../crates/ink", default-features = false, features = ["unstable-hostfn"] }
 
 [dev-dependencies]
 ink_e2e = { path = "../../../crates/e2e" }
diff --git a/integration-tests/public/contract-terminate/lib.rs b/integration-tests/public/contract-terminate/lib.rs
index 944976ce9b..41632a4892 100644
--- a/integration-tests/public/contract-terminate/lib.rs
+++ b/integration-tests/public/contract-terminate/lib.rs
@@ -20,14 +20,32 @@ pub mod just_terminates {
         /// Terminates with the caller as beneficiary.
         #[ink(message)]
         pub fn terminate_me(&mut self) {
-            self.env()
-                .terminate_contract(self.env().caller())
-                .expect("must succeed");
+            self.env().terminate_contract(self.env().caller());
         }
+    }
 
-        #[ink(message)]
-        pub fn get(&self) -> u64 {
-            13
+    #[cfg(test)]
+    mod tests {
+        use super::*;
+
+        #[ink::test]
+        fn terminating_works() {
+            // given
+            let accounts = ink::env::test::default_accounts();
+            let contract_id = ink::env::test::callee();
+            ink::env::test::set_caller(accounts.alice);
+            ink::env::test::set_contract_balance(contract_id, 100.into());
+            let mut contract = JustTerminate::new();
+
+            // when
+            let should_terminate = move || contract.terminate_me();
+
+            // then
+            ink::env::test::assert_contract_termination::<ink::env::DefaultEnvironment, _>(
+                should_terminate,
+                accounts.alice,
+                100.into(),
+            );
         }
     }
 
@@ -59,17 +77,17 @@ pub mod just_terminates {
                 .await
                 .expect("terminate_me messages failed");
 
+            assert!(
+                call_res.return_data().is_empty(),
+                "Terminated contract never returns"
+            );
+
             // then
             assert!(call_res.contains_event("System", "KilledAccount"));
             assert!(call_res.contains_event("Balances", "Withdraw"));
-
-            let get = call_builder.get();
-            let call_res = client
-                .call(&ink_e2e::alice(), &get)
-                .submit()
-                .await
-                .expect("get message failed");
-            assert!(call_res.dry_run.exec_result.result.unwrap().data.is_empty());
+            // todo this event below no longer exists, but we could try getting
+            // info for the contract and asserting that it fails.
+            // assert!(call_res.contains_event("Revive", "Terminated"));
 
             Ok(())
         }
diff --git a/integration-tests/public/contract-xcm/lib.rs b/integration-tests/public/contract-xcm/lib.rs
index d886fc6f1f..bf767dfedc 100644
--- a/integration-tests/public/contract-xcm/lib.rs
+++ b/integration-tests/public/contract-xcm/lib.rs
@@ -265,7 +265,7 @@ mod contract_xcm {
             // we have to use Alice for sending the transactions. If the tests
             // run at the same time, we'll get an error because the nonce
             // of Alice is the same for all transactions.
-            //std::thread::sleep(std::time::Duration::from_secs(30));
+            std::thread::sleep(std::time::Duration::from_secs(30));
 
             // given
             let mut constructor = ContractXcmRef::new();
@@ -297,9 +297,6 @@ mod contract_xcm {
                 .free_balance(contract.account_id)
                 .await
                 .expect("Failed to get account balance");
-            eprintln!("contract_balance_before: {}", contract_balance_before);
-            eprintln!("contract_balance_after:  {}", contract_balance_after);
-            eprintln!("amount: {}", amount);
 
             assert!(
                 contract_balance_after <= contract_balance_before - amount - (amount / 2)
diff --git a/integration-tests/public/payment-channel/lib.rs b/integration-tests/public/payment-channel/lib.rs
index 602ec14e49..5fe1ae3516 100755
--- a/integration-tests/public/payment-channel/lib.rs
+++ b/integration-tests/public/payment-channel/lib.rs
@@ -121,10 +121,7 @@ mod payment_channel {
         #[ink(message)]
         pub fn close(&mut self, amount: U256, signature: [u8; 65]) -> Result<()> {
             self.close_inner(amount, signature)?;
-            self.env()
-                .terminate_contract(self.sender)
-                .expect("failed terminating");
-            Ok(())
+            self.env().terminate_contract(self.sender);
         }
 
         /// We split this out in order to make testing `close` simpler.
@@ -189,10 +186,7 @@ mod payment_channel {
                         return Err(Error::NotYetExpired)
                     }
 
-                    self.env()
-                        .terminate_contract(self.sender)
-                        .expect("failed terminating");
-                    Ok(())
+                    self.env().terminate_contract(self.sender);
                 }
 
                 None => Err(Error::NotYetExpired),
@@ -416,15 +410,12 @@ mod payment_channel {
             let signature = sign(contract_id, amount);
 
             // then
-            payment_channel.close(amount, signature).unwrap();
-            /*
-            // todo
+            let should_close = move || payment_channel.close(amount, signature).unwrap();
             ink::env::test::assert_contract_termination::<ink::env::DefaultEnvironment, _>(
                 should_close,
                 accounts.alice,
                 amount,
             );
-            */
             assert_eq!(get_contract_balance(dan), initial_balance + amount);
         }
 
@@ -559,15 +550,12 @@ mod payment_channel {
             advance_block();
 
             // then
-            payment_channel.claim_timeout().unwrap();
-            /*
-            // todo
+            let should_close = move || payment_channel.claim_timeout().unwrap();
             ink::env::test::assert_contract_termination::<ink::env::DefaultEnvironment, _>(
                 should_close,
                 accounts.alice,
                 mock_deposit_value,
             );
-            */
             assert_eq!(
                 get_contract_balance(accounts.alice),
                 initial_balance + mock_deposit_value

From 9825c1e7dea44b461216c3f2f85f7a1fe32c91e7 Mon Sep 17 00:00:00 2001
From: Michael Mueller <mich@elmueller.net>
Date: Thu, 13 Nov 2025 13:37:26 +0100
Subject: [PATCH 4/4] Fix tests

---
 crates/env/src/lib.rs                               | 2 +-
 integration-tests/public/payment-channel/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/env/src/lib.rs b/crates/env/src/lib.rs
index 9253ebe891..ad7e7a6051 100644
--- a/crates/env/src/lib.rs
+++ b/crates/env/src/lib.rs
@@ -49,7 +49,7 @@
 /// The capacity of the static buffer.
 /// Usually set to 16 kB.
 /// Can be modified by setting `INK_STATIC_BUFFER_SIZE` environmental variable.
-#[const_env::from_env("INK_STATIC_BUFFER_SIZE")]
+#[const_env::env_item("INK_STATIC_BUFFER_SIZE")]
 pub const BUFFER_SIZE: usize = 16384;
 
 #[cfg(target_arch = "riscv64")]
diff --git a/integration-tests/public/payment-channel/Cargo.toml b/integration-tests/public/payment-channel/Cargo.toml
index 3c8963e8b2..6593828bbd 100755
--- a/integration-tests/public/payment-channel/Cargo.toml
+++ b/integration-tests/public/payment-channel/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2024"
 publish = false
 
 [dependencies]
-ink = { path = "../../../crates/ink", default-features = false }
+ink = { path = "../../../crates/ink", default-features = false, features = ["unstable-hostfn"] }
 sp-core = { version = "38.0.0", default-features = false }
 
 [dev-dependencies]