Add metadata hash

Cargo.toml

@@ -134,6 +134,7 @@ cumulus-primitives-utility                 = { version = "0.8.0", default-featur
 cumulus-test-relay-sproof-builder          = { version = "0.8.0", default-features = false }
 frame-benchmarking                         = { version = "29.0.0", default-features = false }
 frame-executive                            = { version = "29.0.0", default-features = false }
+frame-metadata-hash-extension              = { version = "0.1.0", default-features = false }
 frame-support                              = { version = "29.0.0", default-features = false }
 frame-system                               = { version = "29.0.0", default-features = false }
 frame-system-benchmarking                  = { version = "29.0.0", default-features = false }
@@ -181,7 +182,7 @@ polkadot-parachain-primitives              = { version = "7.0.0", default-featur
 polkadot-primitives                        = { version = "8.0.0", default-features = false }
 polkadot-runtime-common                    = { version = "8.0.0", default-features = false }
 polkadot-runtime-parachains                = { version = "8.0.0", default-features = false }
-sp-api                                     = { version = "27.0.0", default-features = false }
+sp-api                                     = { version = "27.0.1", default-features = false }
 sp-application-crypto                      = { version = "31.0.0", default-features = false }
 sp-arithmetic                              = { version = "24.0.0", default-features = false }
 sp-authority-discovery                     = { version = "27.0.0", default-features = false }
@@ -266,7 +267,7 @@ sp-rpc                                        = { version = "27.0.0" }
 substrate-build-script-utils                  = { version = "11.0.0" }
 substrate-frame-rpc-system                    = { version = "29.0.0" }
 substrate-prometheus-endpoint                 = { version = "0.17.0" }
-substrate-wasm-builder                        = { version = "18.0.0" }
+substrate-wasm-builder                        = { version = "18.0.1" }
 try-runtime-cli                               = { version = "0.39.0" }
 xcm-emulator                                  = { version = "0.6.0" }
 xcm-simulator                                 = { version = "8.0.0" }

node/cli/Cargo.toml

@@ -77,4 +77,4 @@ with-bifrost-kusama-runtime = ["bifrost-service/with-bifrost-kusama-runtime"]
 with-bifrost-polkadot-runtime = ["bifrost-service/with-bifrost-polkadot-runtime"]
 with-all-runtime = ["with-bifrost-runtime"]
 try-runtime = ["bifrost-service/try-runtime", "try-runtime-cli/try-runtime"]
-fast-runtime = ["bifrost-service/fast-runtime"]
+fast-runtime = ["bifrost-service/fast-runtime"]

node/service/Cargo.toml

@@ -138,4 +138,3 @@ fast-runtime = [
 	"bifrost-kusama-runtime/fast-runtime",
 	"bifrost-polkadot-runtime/fast-runtime",
 ]
-

runtime/bifrost-kusama/Cargo.toml

@@ -21,6 +21,7 @@ serde_json = { workspace = true }
 # frame dependencies
 frame-benchmarking = { workspace = true, optional = true }
 frame-executive = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
 frame-support = { workspace = true, features = ["tuples-96"] }
 frame-system = { workspace = true }
 frame-system-benchmarking = { workspace = true, optional = true }
@@ -158,6 +159,7 @@ std = [
 
 	"frame-benchmarking?/std",
 	"frame-executive/std",
+	"frame-metadata-hash-extension/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
@@ -394,6 +396,8 @@ try-runtime = [
 	"bifrost-channel-commission/try-runtime",
 ]
 
+# Enable the metadata hash generation in the wasm builder.
+metadata-hash = ["substrate-wasm-builder?/metadata-hash"]
 # When enabled, the runtime API will not be build.
 #
 # This is required by Cumulus to access certain types of the
@@ -404,7 +408,7 @@ disable-runtime-api = []
 # 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 = ["sp-api/disable-logging", "metadata-hash"]
 
 # Set timing constants (e.g. session period) to faster versions to speed up testing.
 fast-runtime = []

runtime/bifrost-kusama/build.rs

@@ -16,14 +16,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#[cfg(feature = "std")]
+#[cfg(all(feature = "std", feature = "metadata-hash"))]
 fn main() {
-	substrate_wasm_builder::WasmBuilder::new()
-		.with_current_project()
-		.export_heap_base()
-		.import_memory()
+	substrate_wasm_builder::WasmBuilder::init_with_defaults()
+		.enable_metadata_hash("BNC", 12)
 		.build()
 }
 
+#[cfg(all(feature = "std", not(feature = "metadata-hash")))]
+fn main() {
+	substrate_wasm_builder::WasmBuilder::build_using_defaults()
+}
+
 #[cfg(not(feature = "std"))]
 fn main() {}

runtime/bifrost-kusama/src/lib.rs

@@ -923,6 +923,7 @@ where
 			frame_system::CheckNonce::<Runtime>::from(nonce),
 			frame_system::CheckWeight::<Runtime>::new(),
 			pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
+			frame_metadata_hash_extension::CheckMetadataHash::<Runtime>::new(false),
 		);
 		let raw_payload = SignedPayload::new(call, extra)
 			.map_err(|e| {
@@ -2020,6 +2021,7 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
+	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =

runtime/bifrost-polkadot/Cargo.toml

@@ -21,6 +21,7 @@ serde_json = { workspace = true }
 # frame dependencies
 frame-benchmarking = { workspace = true, optional = true }
 frame-executive = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
 frame-support = { workspace = true, features = ["tuples-96"] }
 frame-system = { workspace = true }
 frame-system-benchmarking = { workspace = true, optional = true }
@@ -155,6 +156,7 @@ std = [
 	"strum/std",
 
 	"frame-executive/std",
+	"frame-metadata-hash-extension/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
@@ -369,6 +371,8 @@ try-runtime = [
 	"zenlink-protocol/try-runtime",
 ]
 
+# Enable the metadata hash generation in the wasm builder.
+metadata-hash = ["substrate-wasm-builder?/metadata-hash"]
 # When enabled, the runtime API will not be build.
 #
 # This is required by Cumulus to access certain types of the
@@ -379,7 +383,7 @@ disable-runtime-api = []
 # 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 = ["sp-api/disable-logging", "metadata-hash"]
 
 # Set timing constants (e.g. session period) to faster versions to speed up testing.
 fast-runtime = []

runtime/bifrost-polkadot/build.rs

@@ -15,14 +15,17 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
-#[cfg(feature = "std")]
+#[cfg(all(feature = "std", feature = "metadata-hash"))]
 fn main() {
-	substrate_wasm_builder::WasmBuilder::new()
-		.with_current_project()
-		.export_heap_base()
-		.import_memory()
+	substrate_wasm_builder::WasmBuilder::init_with_defaults()
+		.enable_metadata_hash("BNC", 12)
 		.build()
 }
 
+#[cfg(all(feature = "std", not(feature = "metadata-hash")))]
+fn main() {
+	substrate_wasm_builder::WasmBuilder::build_using_defaults()
+}
+
 #[cfg(not(feature = "std"))]
 fn main() {}

runtime/bifrost-polkadot/src/lib.rs

@@ -1854,6 +1854,7 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
+	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =