desperate attempts to get it working

bytetigers · Jul 6, 2024 · a882fd9 · a882fd9
1 parent 4f58c15
commit a882fd9
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/runtime/altair/Cargo.toml b/runtime/altair/Cargo.toml
@@ -145,7 +145,7 @@ pallet-xcm-transactor = { workspace = true }
 staging-parachain-info = { workspace = true }
 
 [build-dependencies]
-substrate-wasm-builder = { workspace = true }
+substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
 default = ["std"]
@@ -157,6 +157,7 @@ std = [
   "serde/std",
   "log/std",
   # Substrate related
+  "substrate-wasm-builder",
   "sp-api/std",
   "sp-arithmetic/std",
   "sp-runtime/std",
@@ -459,7 +460,7 @@ try-runtime = [
 # 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"]
+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

diff --git a/runtime/altair/src/lib.rs b/runtime/altair/src/lib.rs
@@ -2053,8 +2053,8 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
-	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 	runtime_common::transfer_filter::PreBalanceTransferExtension<Runtime>,
+	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
 
 /// Unchecked extrinsic type as expected by this runtime.

diff --git a/runtime/centrifuge/Cargo.toml b/runtime/centrifuge/Cargo.toml
@@ -140,7 +140,7 @@ pallet-xcm-transactor = { workspace = true }
 staging-parachain-info = { workspace = true }
 
 [build-dependencies]
-substrate-wasm-builder = { workspace = true }
+substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
 default = ["std"]
@@ -166,6 +166,7 @@ std = [
   "sp-transaction-pool/std",
   "sp-version/std",
   "sp-staking/std",
+  "substrate-wasm-builder",
   "frame-support/std",
   "frame-system/std",
   "frame-system-rpc-runtime-api/std",
@@ -441,7 +442,7 @@ try-runtime = [
 # 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"]
+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

diff --git a/runtime/centrifuge/src/lib.rs b/runtime/centrifuge/src/lib.rs
@@ -2064,8 +2064,8 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
-	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 	runtime_common::transfer_filter::PreBalanceTransferExtension<Runtime>,
+	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
 
 /// Unchecked extrinsic type as expected by this runtime.

diff --git a/runtime/development/Cargo.toml b/runtime/development/Cargo.toml
@@ -146,7 +146,7 @@ pallet-xcm-transactor = { workspace = true }
 staging-parachain-info = { workspace = true }
 
 [build-dependencies]
-substrate-wasm-builder = { workspace = true }
+substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
 default = ["std"]
@@ -173,6 +173,7 @@ std = [
   "sp-transaction-pool/std",
   "sp-version/std",
   "sp-staking/std",
+  "substrate-wasm-builder",
   "frame-support/std",
   "frame-system/std",
   "frame-system-rpc-runtime-api/std",
@@ -463,7 +464,7 @@ try-runtime = [
 # 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"]
+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

diff --git a/runtime/development/src/lib.rs b/runtime/development/src/lib.rs
@@ -2154,8 +2154,8 @@ pub type SignedExtra = (
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
-	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 	runtime_common::transfer_filter::PreBalanceTransferExtension<Runtime>,
+	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =

diff --git a/runtime/integration-tests/src/config.rs b/runtime/integration-tests/src/config.rs
@@ -296,8 +296,8 @@ pub trait Runtime:
 				frame_system::CheckNonce<Self>,
 				frame_system::CheckWeight<Self>,
 				pallet_transaction_payment::ChargeTransactionPayment<Self>,
-				frame_metadata_hash_extension::CheckMetadataHash<Self>,
 				runtime_common::transfer_filter::PreBalanceTransferExtension<Self>,
+				frame_metadata_hash_extension::CheckMetadataHash<Self>,
 			),
 		>,
 	>;

diff --git a/runtime/integration-tests/src/env.rs b/runtime/integration-tests/src/env.rs
@@ -255,8 +255,8 @@ pub mod utils {
 			frame_system::CheckNonce::<T>::from(nonce),
 			frame_system::CheckWeight::<T>::new(),
 			pallet_transaction_payment::ChargeTransactionPayment::<T>::from(0),
-			frame_metadata_hash_extension::CheckMetadataHash::<T>::new(false),
 			runtime_common::transfer_filter::PreBalanceTransferExtension::<T>::new(),
+			frame_metadata_hash_extension::CheckMetadataHash::<T>::new(false),
 		);
 
 		let raw_payload = SignedPayload::new(runtime_call.clone(), signed_extra.clone()).unwrap();