diff --git a/Cargo.lock b/Cargo.lock
index f08ab0c1664aab70cff91baffa066a7e3d629289..3ea07aaa24adc00f79428dc1d768a7fe266df596 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3334,6 +3334,7 @@ dependencies = [
"distance-oracle",
"frame-benchmarking",
"frame-benchmarking-cli",
+ "frame-metadata-hash-extension",
"frame-system",
"futures 0.3.31",
"g1-runtime",
@@ -7433,6 +7434,20 @@ dependencies = [
"hash-db",
]
+[[package]]
+name = "merkleized-metadata"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c592efaf1b3250df14c8f3c2d952233f0302bb81d3586db2f303666c1cd607"
+dependencies = [
+ "array-bytes",
+ "blake3",
+ "frame-metadata 18.0.0",
+ "parity-scale-codec",
+ "scale-decode 0.13.1",
+ "scale-info",
+]
+
[[package]]
name = "merlin"
version = "3.0.0"
@@ -16563,15 +16578,24 @@ name = "substrate-wasm-builder"
version = "17.0.0"
source = "git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.17.0#3f9bddbe619cf4068769b4d3fc58c8d50e358df8"
dependencies = [
+ "array-bytes",
"build-helper",
"cargo_metadata",
"console",
"filetime",
+ "frame-metadata 18.0.0",
"jobserver",
+ "merkleized-metadata",
+ "parity-scale-codec",
"parity-wasm",
"polkavm-linker 0.9.2",
+ "sc-executor",
"shlex",
+ "sp-core",
+ "sp-io",
"sp-maybe-compressed-blob",
+ "sp-tracing 16.0.0 (git+https://github.com/duniter/duniter-polkadot-sdk?branch=duniter-substrate-v1.17.0)",
+ "sp-version",
"strum 0.26.3",
"tempfile",
"toml 0.8.19",
diff --git a/Cargo.toml b/Cargo.toml
index d9c62e2a26b42bfef1e48d1f642a38013718a1d2..08f8d82fabcd0d24adcf3aa533f0719d78c789c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -141,6 +141,7 @@ sp-membership = { path = 'primitives/membership', default-features = false }
# substrate dependencies
pallet-transaction-payment-rpc = { git = 'https://github.com/duniter/duniter-polkadot-sdk', branch = 'duniter-substrate-v1.17.0', default-features = false }
frame-benchmarking = { git = 'https://github.com/duniter/duniter-polkadot-sdk', branch = 'duniter-substrate-v1.17.0', default-features = false }
+frame-metadata-hash-extension = { git = 'https://github.com/duniter/duniter-polkadot-sdk', branch = 'duniter-substrate-v1.17.0', default-features = false }
frame-executive = { git = 'https://github.com/duniter/duniter-polkadot-sdk', branch = 'duniter-substrate-v1.17.0', default-features = false }
frame-support = { git = 'https://github.com/duniter/duniter-polkadot-sdk', branch = 'duniter-substrate-v1.17.0', default-features = false }
frame-system = { git = 'https://github.com/duniter/duniter-polkadot-sdk', branch = 'duniter-substrate-v1.17.0', default-features = false }
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 567354e1d91f4fe444ddd829f5b97a0afdc5ab73..85cfca8bc37c715e6ae4e5405760eca5675204cc 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -120,6 +120,7 @@ clap_complete = { workspace = true }
frame-benchmarking = { workspace = true }
frame-benchmarking-cli = { workspace = true }
frame-system = { workspace = true }
+frame-metadata-hash-extension = { workspace = true, default-features = true }
futures = { workspace = true, features = ["compat"] }
hex = { workspace = true }
jsonrpsee = { workspace = true, features = ["server"] }
diff --git a/node/src/service/client.rs b/node/src/service/client.rs
index 99b01cf1fe60098622eb469810cb27a5608defce..8118c457bb0e3d7695db602f7c1791da8e1b95d4 100644
--- a/node/src/service/client.rs
+++ b/node/src/service/client.rs
@@ -337,7 +337,10 @@ impl BenchmarkCallSigner<super::runtime_executor::runtime::RuntimeCall, sp_core:
pallet_transaction_payment::ChargeTransactionPayment::<
super::runtime_executor::runtime::Runtime,
>::from(0),
- //frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false), TODO
+ frame_system::WeightReclaim::<super::runtime_executor::runtime::Runtime>,
+ frame_metadata_hash_extension::CheckMetadataHash::<
+ super::runtime_executor::runtime::Runtime,
+ >::new(false),
);
let payload = sp_runtime::generic::SignedPayload::from_raw(
@@ -352,6 +355,8 @@ impl BenchmarkCallSigner<super::runtime_executor::runtime::RuntimeCall, sp_core:
(),
(),
(),
+ (),
+ None,
),
);
diff --git a/runtime/g1/Cargo.toml b/runtime/g1/Cargo.toml
index 43b763ee10d9192116a51d8d2d42811f18925dce..c3c1387f96d92d6660af299841adf53a484bfcfe 100644
--- a/runtime/g1/Cargo.toml
+++ b/runtime/g1/Cargo.toml
@@ -11,9 +11,18 @@ version.workspace = true
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
+
[features]
default = ["std"]
constant-fees = ["common-runtime/constant-fees"]
+# Enable the metadata hash generation.
+#
+# This is hidden behind a feature because it increases the compile time.
+# The wasm binary needs to be compiled twice, once to fetch the metadata,
+# generate the metadata hash and then a second time with the
+# `RUNTIME_METADATA_HASH` environment variable set for the `CheckMetadataHash`
+# extension.
+metadata-hash = ["substrate-wasm-builder/metadata-hash"]
runtime-benchmarks = [
"common-runtime/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
diff --git a/runtime/g1/build.rs b/runtime/g1/build.rs
index b31efa2f039949719cab9bfdcb170c98d4cb542f..e3d20b117f08a80cf32543cc2c9e3d9feed79246 100644
--- a/runtime/g1/build.rs
+++ b/runtime/g1/build.rs
@@ -17,10 +17,12 @@
fn main() {
#[cfg(feature = "std")]
{
- substrate_wasm_builder::WasmBuilder::new()
- .with_current_project()
- .export_heap_base()
- .import_memory()
+ #[cfg(not(feature = "metadata-hash"))]
+ substrate_wasm_builder::WasmBuilder::init_with_defaults().build();
+
+ #[cfg(feature = "metadata-hash")]
+ substrate_wasm_builder::WasmBuilder::init_with_defaults()
+ .enable_metadata_hash("Äž", 2)
.build();
}
}
diff --git a/runtime/gdev/Cargo.toml b/runtime/gdev/Cargo.toml
index 4c01f0caf051f35d54f4837fc411bc2b12fa81c2..b386f72d3ac97e6043290f6fbf6340cbde39c0c6 100644
--- a/runtime/gdev/Cargo.toml
+++ b/runtime/gdev/Cargo.toml
@@ -12,6 +12,14 @@ targets = ["x86_64-unknown-linux-gnu"]
[features]
default = ["std"]
+# Enable the metadata hash generation.
+#
+# This is hidden behind a feature because it increases the compile time.
+# The wasm binary needs to be compiled twice, once to fetch the metadata,
+# generate the metadata hash and then a second time with the
+# `RUNTIME_METADATA_HASH` environment variable set for the `CheckMetadataHash`
+# extension.
+metadata-hash = ["substrate-wasm-builder/metadata-hash"]
constant-fees = ["common-runtime/constant-fees"]
runtime-benchmarks = [
"common-runtime/runtime-benchmarks",
diff --git a/runtime/gdev/build.rs b/runtime/gdev/build.rs
index b31efa2f039949719cab9bfdcb170c98d4cb542f..450a6eba8252f849fa8cc94bec8026736e5953c5 100644
--- a/runtime/gdev/build.rs
+++ b/runtime/gdev/build.rs
@@ -17,10 +17,12 @@
fn main() {
#[cfg(feature = "std")]
{
- substrate_wasm_builder::WasmBuilder::new()
- .with_current_project()
- .export_heap_base()
- .import_memory()
+ #[cfg(not(feature = "metadata-hash"))]
+ substrate_wasm_builder::WasmBuilder::init_with_defaults().build();
+
+ #[cfg(feature = "metadata-hash")]
+ substrate_wasm_builder::WasmBuilder::init_with_defaults()
+ .enable_metadata_hash("ÄžD", 2)
.build();
}
}
diff --git a/runtime/gdev/tests/common/mod.rs b/runtime/gdev/tests/common/mod.rs
index 1345f8ffb482f2afefdc2e3a39a0353eeea66b0b..8e457720873ef7d1b45c4626e319fca10317fd9a 100644
--- a/runtime/gdev/tests/common/mod.rs
+++ b/runtime/gdev/tests/common/mod.rs
@@ -505,7 +505,8 @@ pub fn get_unchecked_extrinsic(
),
frame_system::CheckWeight::<gdev_runtime::Runtime>::new(),
pallet_transaction_payment::ChargeTransactionPayment::<gdev_runtime::Runtime>::from(tip),
- //frame_metadata_hash_extension::CheckMetadataHash::<gdev_runtime::Runtime>::new(false), TODO
+ frame_system::WeightReclaim::<gdev_runtime::Runtime>,
+ frame_metadata_hash_extension::CheckMetadataHash::<gdev_runtime::Runtime>::new(false),
);
let payload = SignedPayload::new(call.clone(), tx_ext.clone()).unwrap();
let origin = signer;
diff --git a/runtime/gtest/Cargo.toml b/runtime/gtest/Cargo.toml
index be2df65092ce5cfd99870f8b4d55b8502d40d0bb..5a80ce58946cc01cdb109cba923af1180c68b008 100644
--- a/runtime/gtest/Cargo.toml
+++ b/runtime/gtest/Cargo.toml
@@ -12,6 +12,14 @@ targets = ["x86_64-unknown-linux-gnu"]
[features]
default = ["std"]
+# Enable the metadata hash generation.
+#
+# This is hidden behind a feature because it increases the compile time.
+# The wasm binary needs to be compiled twice, once to fetch the metadata,
+# generate the metadata hash and then a second time with the
+# `RUNTIME_METADATA_HASH` environment variable set for the `CheckMetadataHash`
+# extension.
+metadata-hash = ["substrate-wasm-builder/metadata-hash"]
constant-fees = ["common-runtime/constant-fees"]
runtime-benchmarks = [
"common-runtime/runtime-benchmarks",
diff --git a/runtime/gtest/build.rs b/runtime/gtest/build.rs
index b31efa2f039949719cab9bfdcb170c98d4cb542f..450a6eba8252f849fa8cc94bec8026736e5953c5 100644
--- a/runtime/gtest/build.rs
+++ b/runtime/gtest/build.rs
@@ -17,10 +17,12 @@
fn main() {
#[cfg(feature = "std")]
{
- substrate_wasm_builder::WasmBuilder::new()
- .with_current_project()
- .export_heap_base()
- .import_memory()
+ #[cfg(not(feature = "metadata-hash"))]
+ substrate_wasm_builder::WasmBuilder::init_with_defaults().build();
+
+ #[cfg(feature = "metadata-hash")]
+ substrate_wasm_builder::WasmBuilder::init_with_defaults()
+ .enable_metadata_hash("ÄžD", 2)
.build();
}
}