feat: CheckMetadataHash extension

Cargo.toml

@@ -173,6 +173,7 @@ sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", default-featu
 sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" }
 frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" }
 frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" }
+frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" }
 frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, features = [
   "tuples-96",
 ], branch = "release-polkadot-v1.7.2" } # Check when tuples-96 can be removed

pallets/liquidity-pools-gateway/routers/src/lib.rs

@@ -234,7 +234,6 @@ where
 	T: frame_system::Config + pallet_xcm_transactor::Config,
 {
 	pub xcm_domain: XcmDomain<T::CurrencyId>,
-	pub _marker: PhantomData<T>,
 }
 
 impl<T> XCMRouter<T>

pallets/liquidity-pools-gateway/routers/src/routers/axelar_evm.rs

@@ -22,7 +22,7 @@ use scale_info::{
 	TypeInfo,
 };
 use sp_core::{bounded::BoundedVec, ConstU32, H160};
-use sp_std::{collections::btree_map::BTreeMap, marker::PhantomData, vec, vec::Vec};
+use sp_std::{collections::btree_map::BTreeMap, vec, vec::Vec};
 
 use crate::{
 	AccountIdOf, EVMRouter, MessageOf, AXELAR_DESTINATION_CHAIN_PARAM,
@@ -44,7 +44,6 @@ where
 	pub router: EVMRouter<T>,
 	pub evm_chain: BoundedVec<u8, ConstU32<MAX_AXELAR_EVM_CHAIN_SIZE>>,
 	pub liquidity_pools_contract_address: H160,
-	pub _marker: PhantomData<T>,
 }
 
 impl<T> AxelarEVMRouter<T>
@@ -66,7 +65,6 @@ where
 			router,
 			evm_chain,
 			liquidity_pools_contract_address,
-			_marker: Default::default(),
 		}
 	}
 

pallets/liquidity-pools-gateway/routers/src/routers/axelar_xcm.rs

@@ -16,7 +16,6 @@ use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_core::{bounded::BoundedVec, ConstU32, H160};
 use sp_runtime::DispatchError;
-use sp_std::marker::PhantomData;
 
 use crate::{
 	axelar_evm::get_axelar_encoded_msg, AccountIdOf, CurrencyIdOf, MessageOf, XCMRouter, XcmDomain,
@@ -37,7 +36,6 @@ where
 	pub router: XCMRouter<T>,
 	pub axelar_target_chain: BoundedVec<u8, ConstU32<MAX_AXELAR_EVM_CHAIN_SIZE>>,
 	pub axelar_target_contract: H160,
-	pub _marker: PhantomData<T>,
 }
 
 impl<T> AxelarXCMRouter<T>

pallets/liquidity-pools-gateway/routers/src/routers/ethereum_xcm.rs

@@ -17,7 +17,7 @@ use frame_support::{
 };
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
-use sp_std::{collections::btree_map::BTreeMap, marker::PhantomData, vec, vec::Vec};
+use sp_std::{collections::btree_map::BTreeMap, vec, vec::Vec};
 
 use crate::{AccountIdOf, MessageOf, XCMRouter, FUNCTION_NAME, MESSAGE_PARAM};
 
@@ -30,7 +30,6 @@ where
 		+ pallet_liquidity_pools_gateway::Config,
 {
 	pub router: XCMRouter<T>,
-	pub _marker: PhantomData<T>,
 }
 
 impl<T> EthereumXCMRouter<T>

pallets/liquidity-pools-gateway/routers/src/tests.rs

@@ -229,7 +229,6 @@ mod xcm_router {
 
 				let router = XCMRouter::<Runtime> {
 					xcm_domain: test_data.xcm_domain.clone(),
-					_marker: Default::default(),
 				};
 
 				assert_ok!(router.do_init());
@@ -247,7 +246,6 @@ mod xcm_router {
 
 				let router = XCMRouter::<Runtime> {
 					xcm_domain: test_data.xcm_domain.clone(),
-					_marker: Default::default(),
 				};
 
 				assert_ok!(router.do_send(test_data.sender, test_data.msg.clone()));
@@ -293,7 +291,6 @@ mod xcm_router {
 
 				let router = XCMRouter::<Runtime> {
 					xcm_domain: test_data.xcm_domain.clone(),
-					_marker: Default::default(),
 				};
 
 				assert_ok!(router.do_init());
@@ -383,7 +380,6 @@ mod axelar_evm {
 						evm_chain: TEST_EVM_CHAIN.clone(),
 						liquidity_pools_contract_address: test_data
 							.liquidity_pools_contract_address,
-						_marker: Default::default(),
 					});
 
 				assert_ok!(domain_router.init());
@@ -404,7 +400,6 @@ mod axelar_evm {
 						evm_chain: TEST_EVM_CHAIN.clone(),
 						liquidity_pools_contract_address: test_data
 							.liquidity_pools_contract_address,
-						_marker: Default::default(),
 					});
 
 				assert_noop!(
@@ -453,7 +448,6 @@ mod axelar_evm {
 						evm_chain: TEST_EVM_CHAIN.clone(),
 						liquidity_pools_contract_address: test_data
 							.liquidity_pools_contract_address,
-						_marker: Default::default(),
 					});
 
 				assert_ok!(domain_router.send(test_data.sender, test_data.msg));
@@ -474,7 +468,6 @@ mod axelar_evm {
 						evm_chain: TEST_EVM_CHAIN.clone(),
 						liquidity_pools_contract_address: test_data
 							.liquidity_pools_contract_address,
-						_marker: Default::default(),
 					});
 
 				let res = domain_router.send(test_data.sender, test_data.msg);
@@ -551,11 +544,9 @@ mod axelar_xcm {
 					DomainRouter::<Runtime>::AxelarXCM(AxelarXCMRouter::<Runtime> {
 						router: XCMRouter {
 							xcm_domain: test_data.xcm_domain.clone(),
-							_marker: Default::default(),
 						},
 						axelar_target_chain: test_data.axelar_target_chain,
 						axelar_target_contract: test_data.axelar_target_contract,
-						_marker: Default::default(),
 					});
 
 				assert_ok!(domain_router.init());
@@ -575,11 +566,9 @@ mod axelar_xcm {
 					DomainRouter::<Runtime>::AxelarXCM(AxelarXCMRouter::<Runtime> {
 						router: XCMRouter {
 							xcm_domain: test_data.xcm_domain.clone(),
-							_marker: Default::default(),
 						},
 						axelar_target_chain: test_data.axelar_target_chain.clone(),
 						axelar_target_contract: test_data.axelar_target_contract,
-						_marker: Default::default(),
 					});
 
 				assert_ok!(domain_router.init());
@@ -694,9 +683,7 @@ mod ethereum_xcm {
 					DomainRouter::<Runtime>::EthereumXCM(EthereumXCMRouter::<Runtime> {
 						router: XCMRouter {
 							xcm_domain: test_data.xcm_domain.clone(),
-							_marker: Default::default(),
 						},
-						_marker: Default::default(),
 					});
 
 				assert_ok!(domain_router.init());
@@ -716,9 +703,7 @@ mod ethereum_xcm {
 					DomainRouter::<Runtime>::EthereumXCM(EthereumXCMRouter::<Runtime> {
 						router: XCMRouter {
 							xcm_domain: test_data.xcm_domain.clone(),
-							_marker: Default::default(),
 						},
-						_marker: Default::default(),
 					});
 
 				assert_ok!(domain_router.init());

pallets/pool-system/src/mock.rs

@@ -393,6 +393,7 @@ impl EnsureOriginWithArg<RuntimeOrigin, PoolId> for All {
 
 	#[cfg(feature = "runtime-benchmarks")]
 	fn try_successful_origin(_: &PoolId) -> Result<RuntimeOrigin, ()> {
+		use frame_support::dispatch::RawOrigin;
 		Ok(RawOrigin::Root.into())
 	}
 }

runtime/altair/Cargo.toml

@@ -35,6 +35,7 @@ sp-version = { workspace = true }
 
 frame-benchmarking = { workspace = true, optional = true }        # For benchmarking
 frame-executive = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-system-benchmarking = { workspace = true, optional = true } # For benchmarking
@@ -169,6 +170,7 @@ std = [
   "frame-system/std",
   "frame-system-rpc-runtime-api/std",
   "frame-executive/std",
+  "frame-metadata-hash-extension/std",
   "frame-try-runtime?/std",
   "frame-system-benchmarking?/std",
   "frame-benchmarking?/std",
@@ -433,12 +435,22 @@ try-runtime = [
   "staging-parachain-info/try-runtime",
 ]
 
+# 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"]
+
 # 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",
   "runtime-common/on-chain-release-build",
+  "metadata-hash",
 ]
 
 # Set timing constants (e.g. session period) to faster versions to speed up testing.

runtime/altair/build.rs

@@ -1,9 +1,16 @@
-use substrate_wasm_builder::WasmBuilder;
+#[cfg(all(feature = "std", feature = "metadata-hash"))]
+fn main() {
+	substrate_wasm_builder::WasmBuilder::init_with_defaults()
+		.enable_metadata_hash("AIR", 18)
+		.build();
+}
 
+#[cfg(all(feature = "std", not(feature = "metadata-hash")))]
 fn main() {
-	WasmBuilder::new()
-		.with_current_project()
-		.export_heap_base()
-		.import_memory()
-		.build()
+	substrate_wasm_builder::WasmBuilder::build_using_defaults();
 }
+
+/// The wasm builder is deactivated when compiling
+/// this crate for wasm to speed up the compilation.
+#[cfg(not(feature = "std"))]
+fn main() {}