add CheckMetadataHash signed extension

integritee-network · Jun 28, 2024 · d5550b7 · d5550b7
1 parent 4e39511
commit d5550b7
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,6 +50,7 @@ cumulus-primitives-timestamp = { version = "0.14.0", default-features = false }
 cumulus-primitives-utility = { version = "0.14.0", default-features = false }
 frame-benchmarking = { version = "35.0.0", default-features = false }
 frame-executive = { version = "35.0.0", default-features = false }
+frame-metadata-hash-extension = { version = "0.3.0", default-features = false }
 frame-support = { version = "35.0.0", default-features = false }
 frame-system = { version = "35.0.0", default-features = false }
 frame-system-benchmarking = { version = "35.0.0", default-features = false }

diff --git a/polkadot-parachains/integritee-runtime/Cargo.toml b/polkadot-parachains/integritee-runtime/Cargo.toml
@@ -31,6 +31,7 @@ cumulus-primitives-core = { workspace = true }
 cumulus-primitives-timestamp = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
 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 }
@@ -105,7 +106,7 @@ polkadot-primitives = { workspace = true, features = ["std"] }
 polkadot-runtime-parachains = { workspace = true, features = ["std"] }
 
 [build-dependencies]
-substrate-wasm-builder = { workspace = true, optional = true }
+substrate-wasm-builder = { workspace = true, optional = true, features = ["metadata-hash"] }
 
 [features]
 default = ["std"]
@@ -123,6 +124,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",

diff --git a/polkadot-parachains/integritee-runtime/build.rs b/polkadot-parachains/integritee-runtime/build.rs
@@ -16,14 +16,10 @@
 
 #[cfg(feature = "std")]
 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("TEER", 12)
 		.build()
 }
 
-/// The wasm builder is deactivated when compiling
-/// this crate for wasm to speed up the compilation.
 #[cfg(not(feature = "std"))]
 fn main() {}
diff --git a/polkadot-parachains/shell-runtime/Cargo.toml b/polkadot-parachains/shell-runtime/Cargo.toml
@@ -27,6 +27,7 @@ cumulus-primitives-timestamp = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
 frame-benchmarking = { workspace = true, optional = true }
 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 }
@@ -68,7 +69,7 @@ hex = { workspace = true }
 hex-literal = { workspace = true }
 
 [build-dependencies]
-substrate-wasm-builder = { workspace = true }
+substrate-wasm-builder = { workspace = true, optional = true, features = ["metadata-hash"] }
 
 [features]
 default = ["std"]
@@ -83,6 +84,7 @@ std = [
     "cumulus-primitives-timestamp/std",
     "cumulus-primitives-utility/std",
     "frame-executive/std",
+    "frame-metadata-hash-extension/std",
     "frame-support/std",
     "frame-system-rpc-runtime-api/std",
     "frame-system/std",
@@ -120,6 +122,7 @@ std = [
     "staging-xcm-builder/std",
     "staging-xcm-executor/std",
     "staging-xcm/std",
+    "substrate-wasm-builder",
     "xcm-transactor-primitives/std",
 ]
 # Weird cargo behaviour: We have to feature gate the `runtime-benchmarks` behind

diff --git a/polkadot-parachains/shell-runtime/build.rs b/polkadot-parachains/shell-runtime/build.rs
@@ -16,14 +16,10 @@
 
 #[cfg(feature = "std")]
 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("TEER", 12)
 		.build()
 }
 
-/// The wasm builder is deactivated when compiling
-/// this crate for wasm to speed up the compilation.
 #[cfg(not(feature = "std"))]
 fn main() {}
diff --git a/polkadot-parachains/shell-runtime/src/lib.rs b/polkadot-parachains/shell-runtime/src/lib.rs
@@ -358,6 +358,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 =