tests: merge v1.14.0

runtime/devnet/Cargo.toml

@@ -108,6 +108,7 @@ std = [
     "cumulus-primitives-utility/std",
     "frame-benchmarking/std",
     "frame-executive/std",
+    "frame-metadata-hash-extension/std",
     "frame-support/std",
     "frame-system-benchmarking/std",
     "frame-system-rpc-runtime-api/std",
@@ -225,8 +226,6 @@ try-runtime = [
     "sp-runtime/try-runtime",
 ]
 
-experimental = []
-
 # Enable the metadata hash generation.
 #
 # This is hidden behind a feature because it increases the compile time.
@@ -238,4 +237,4 @@ metadata-hash = ["substrate-wasm-builder/metadata-hash"]
 
 # A convenience feature for enabling things when doing a build
 # for an on-chain release.
-on-chain-release-build = ["metadata-hash"]
+on-chain-release-build = ["metadata-hash"]

runtime/devnet/build.rs

@@ -1,20 +1,13 @@
 #[cfg(all(feature = "std", feature = "metadata-hash"))]
 fn main() {
-	substrate_wasm_builder::WasmBuilder::new()
-		.with_current_project()
-		.export_heap_base()
-		.import_memory()
-		.enable_metadata_hash("UNIT", 12)
+	substrate_wasm_builder::WasmBuilder::init_with_defaults()
+		.enable_metadata_hash("PAS", 10)
 		.build()
 }
 
 #[cfg(all(feature = "std", not(feature = "metadata-hash")))]
 fn main() {
-	substrate_wasm_builder::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

runtime/testnet/Cargo.toml

@@ -165,6 +165,7 @@ runtime-benchmarks = [
     "cumulus-primitives-core/runtime-benchmarks",
     "cumulus-primitives-utility/runtime-benchmarks",
     "frame-benchmarking/runtime-benchmarks",
+    "frame-metadata-hash-extension/std",
     "frame-support/runtime-benchmarks",
     "frame-system-benchmarking/runtime-benchmarks",
     "frame-system/runtime-benchmarks",
@@ -235,4 +236,4 @@ metadata-hash = ["substrate-wasm-builder/metadata-hash"]
 
 # A convenience feature for enabling things when doing a build
 # for an on-chain release.
-on-chain-release-build = ["metadata-hash"]
+on-chain-release-build = ["metadata-hash"]

runtime/testnet/build.rs

@@ -1,20 +1,13 @@
 #[cfg(all(feature = "std", feature = "metadata-hash"))]
 fn main() {
-	substrate_wasm_builder::WasmBuilder::new()
-		.with_current_project()
-		.export_heap_base()
-		.import_memory()
-		.enable_metadata_hash("UNIT", 12)
+	substrate_wasm_builder::WasmBuilder::init_with_defaults()
+		.enable_metadata_hash("PAS", 10)
 		.build()
 }
 
 #[cfg(all(feature = "std", not(feature = "metadata-hash")))]
 fn main() {
-	substrate_wasm_builder::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