Add support for metadata hash extension

.github/workflows/build.yml

@@ -304,6 +304,8 @@ jobs:
           ref: ${{ needs.set-tags.outputs.git_ref }}
       - name: Cargo build
         uses: ./.github/workflow-templates/cargo-build
+        with:
+          features: metadata-hash
       - name: Upload runtimes
         uses: actions/upload-artifact@v4
         with:

.github/workflows/coverage.yml

@@ -117,6 +117,8 @@ jobs:
         run: rustup component add llvm-tools-preview
       - name: Cargo build
         uses: ./.github/workflow-templates/cargo-build
+        with:
+          features: metadata-hash
       - name: Enable coverage gathering
         run: |
           # Enable coverage when running tests

Cargo.toml

@@ -360,6 +360,7 @@ environmental = { version = "1.1.2", default-features = false }
 frame-metadata = { version = "16.0.0", default-features = false, features = [
 	"current",
 ] }
+frame-metadata-hash-extension = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
 hex = { version = "0.4.3", default-features = false }
 hex-literal = { version = "0.3.4" }
 impl-serde = { version = "0.3.1", default-features = false }

node/Cargo.toml

@@ -40,6 +40,8 @@ moonbase-native = [ "moonbeam-cli/moonbase-native", "moonbeam-service/moonbase-n
 moonbeam-native = [ "moonbeam-cli/moonbeam-native", "moonbeam-service/moonbeam-native" ]
 moonriver-native = [ "moonbeam-cli/moonriver-native", "moonbeam-service/moonriver-native" ]
 
+metadata-hash = ["moonbeam-service/metadata-hash"]
+
 test-spec = []
 
 runtime-benchmarks = [

node/service/Cargo.toml

@@ -188,6 +188,12 @@ moonbase-native = ["moonbase-runtime", "westend-native"]
 moonbeam-native = ["moonbeam-runtime"]
 moonriver-native = ["moonriver-runtime"]
 
+metadata-hash = [
+	"moonbase-runtime/metadata-hash",
+	"moonriver-runtime/metadata-hash",
+	"moonbeam-runtime/metadata-hash",
+]
+
 test-spec = []
 
 runtime-benchmarks = [

runtime/moonbase/Cargo.toml

@@ -79,6 +79,7 @@ moonbeam-rpc-primitives-txpool = { workspace = true }
 
 # Substrate
 frame-executive = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
@@ -220,6 +221,7 @@ std = [
 	"fp-self-contained/std",
 	"frame-benchmarking/std",
 	"frame-executive/std",
+	"frame-metadata-hash-extension/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
@@ -331,10 +333,13 @@ force-debug = ["sp-debug-derive/force-debug"]
 # Will be enabled by the `wasm-builder` when building the runtime for WASM.
 runtime-wasm = []
 
+# Enable the metadata hash generation in the wasm builder.
+metadata-hash = ["substrate-wasm-builder/metadata-hash"]
+
 # A feature that should be enabled when the runtime should be build for on-chain
 # deployment. This will disable stuff that shouldn't be part of the on-chain wasm
 # to make it smaller like logging for example.
-on-chain-release-build = ["sp-api/disable-logging"]
+on-chain-release-build = ["metadata-hash", "sp-api/disable-logging"]
 
 runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",

runtime/moonbase/build.rs

@@ -16,10 +16,21 @@
 
 use substrate_wasm_builder::WasmBuilder;
 
+#[cfg(not(feature = "metadata-hash"))]
 fn main() {
 	WasmBuilder::new()
 		.with_current_project()
 		.export_heap_base()
 		.import_memory()
 		.build()
 }
+
+#[cfg(feature = "metadata-hash")]
+fn main() {
+	WasmBuilder::new()
+		.with_current_project()
+		.export_heap_base()
+		.import_memory()
+		.enable_metadata_hash("UNIT", 18)
+		.build()
+}

runtime/moonbase/src/lib.rs

@@ -201,7 +201,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_version: 3200,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 2,
+	transaction_version: 3,
 	state_version: 0,
 };
 
@@ -1475,6 +1475,7 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
+	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 	cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.

runtime/moonbeam/Cargo.toml

@@ -79,6 +79,7 @@ moonbeam-rpc-primitives-txpool = { workspace = true }
 
 # Substrate
 frame-executive = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
@@ -213,6 +214,7 @@ std = [
 	"fp-self-contained/std",
 	"frame-benchmarking/std",
 	"frame-executive/std",
+	"frame-metadata-hash-extension/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
@@ -316,10 +318,13 @@ evm-tracing = ["evm-tracing-events", "moonbeam-evm-tracer", "rlp", "sha3"]
 # Will be enabled by the `wasm-builder` when building the runtime for WASM.
 runtime-wasm = []
 
+# Enable the metadata hash generation in the wasm builder.
+metadata-hash = ["substrate-wasm-builder/metadata-hash"]
+
 # A feature that should be enabled when the runtime should be build for on-chain
 # deployment. This will disable stuff that shouldn't be part of the on-chain wasm
 # to make it smaller like logging for example.
-on-chain-release-build = ["sp-api/disable-logging"]
+on-chain-release-build = ["metadata-hash", "sp-api/disable-logging"]
 
 runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",

runtime/moonbeam/build.rs

@@ -16,10 +16,21 @@
 
 use substrate_wasm_builder::WasmBuilder;
 
+#[cfg(not(feature = "metadata-hash"))]
 fn main() {
 	WasmBuilder::new()
 		.with_current_project()
 		.export_heap_base()
 		.import_memory()
 		.build()
 }
+
+#[cfg(feature = "metadata-hash")]
+fn main() {
+	WasmBuilder::new()
+		.with_current_project()
+		.export_heap_base()
+		.import_memory()
+		.enable_metadata_hash("GLMR", 18)
+		.build()
+}

runtime/moonbeam/src/lib.rs

@@ -194,7 +194,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_version: 3200,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 2,
+	transaction_version: 3,
 	state_version: 0,
 };
 
@@ -1524,6 +1524,7 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
+	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 	cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.

runtime/moonriver/Cargo.toml

@@ -79,6 +79,7 @@ moonbeam-rpc-primitives-txpool = { workspace = true }
 
 # Substrate
 frame-executive = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
@@ -214,6 +215,7 @@ std = [
 	"fp-self-contained/std",
 	"frame-benchmarking/std",
 	"frame-executive/std",
+	"frame-metadata-hash-extension/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
@@ -321,10 +323,13 @@ force-debug = ["sp-debug-derive/force-debug"]
 # Will be enabled by the `wasm-builder` when building the runtime for WASM.
 runtime-wasm = []
 
+# Enable the metadata hash generation in the wasm builder.
+metadata-hash = ["substrate-wasm-builder/metadata-hash"]
+
 # A feature that should be enabled when the runtime should be build for on-chain
 # deployment. This will disable stuff that shouldn't be part of the on-chain wasm
 # to make it smaller like logging for example.
-on-chain-release-build = ["sp-api/disable-logging"]
+on-chain-release-build = ["metadata-hash", "sp-api/disable-logging"]
 
 runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",

runtime/moonriver/build.rs

@@ -16,10 +16,21 @@
 
 use substrate_wasm_builder::WasmBuilder;
 
+#[cfg(not(feature = "metadata-hash"))]
 fn main() {
 	WasmBuilder::new()
 		.with_current_project()
 		.export_heap_base()
 		.import_memory()
 		.build()
 }
+
+#[cfg(feature = "metadata-hash")]
+fn main() {
+	WasmBuilder::new()
+		.with_current_project()
+		.export_heap_base()
+		.import_memory()
+		.enable_metadata_hash("MOVR", 18)
+		.build()
+}

runtime/moonriver/src/lib.rs

@@ -196,7 +196,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_version: 3200,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 2,
+	transaction_version: 3,
 	state_version: 0,
 };
 
@@ -1525,6 +1525,7 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
+	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 	cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.

scripts/build-runtime-srtool.sh

@@ -13,6 +13,7 @@ CMD="docker run \
   -e CARGO_NET_GIT_FETCH_WITH_CLI=true \
   -e PACKAGE=${GH_WORKFLOW_MATRIX_CHAIN}-runtime \
   -e RUNTIME_DIR=runtime/${GH_WORKFLOW_MATRIX_CHAIN} \
+  -e BUILD_OPTS=\"--features on-chain-release-build\" \
   -e PROFILE=production \
   -e WASM_BUILD_STD=0 \
   -v ${PWD}:/build \

test/package.json

@@ -31,6 +31,7 @@
     "@polkadot/types-codec": "12.1.1",
     "@polkadot/util": "12.6.2",
     "@polkadot/util-crypto": "12.6.2",
+    "@polkadot-api/merkleize-metadata": "1.1.2",
     "@substrate/txwrapper-core": "7.5.1",
     "@substrate/txwrapper-substrate": "7.5.1",
     "@vitest/ui": "2.0.1",