From a882fd96926383f1000e1bdda7a6a42e87c297ac Mon Sep 17 00:00:00 2001 From: William Freudenberger Date: Sat, 6 Jul 2024 10:08:38 +0200 Subject: [PATCH] desperate attempts to get it working --- runtime/altair/Cargo.toml | 5 +++-- runtime/altair/src/lib.rs | 2 +- runtime/centrifuge/Cargo.toml | 5 +++-- runtime/centrifuge/src/lib.rs | 2 +- runtime/development/Cargo.toml | 5 +++-- runtime/development/src/lib.rs | 2 +- runtime/integration-tests/src/config.rs | 2 +- runtime/integration-tests/src/env.rs | 2 +- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/runtime/altair/Cargo.toml b/runtime/altair/Cargo.toml index d89508a619..ea5dd3a389 100644 --- 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 index b37e8d6fea..51333c9759 100644 --- a/runtime/altair/src/lib.rs +++ b/runtime/altair/src/lib.rs @@ -2053,8 +2053,8 @@ pub type SignedExtra = ( frame_system::CheckNonce, frame_system::CheckWeight, pallet_transaction_payment::ChargeTransactionPayment, - frame_metadata_hash_extension::CheckMetadataHash, runtime_common::transfer_filter::PreBalanceTransferExtension, + frame_metadata_hash_extension::CheckMetadataHash, ); /// Unchecked extrinsic type as expected by this runtime. diff --git a/runtime/centrifuge/Cargo.toml b/runtime/centrifuge/Cargo.toml index a2bdc31e62..22e9e044ca 100644 --- 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 index d9134e6e5a..58b80a84ad 100644 --- a/runtime/centrifuge/src/lib.rs +++ b/runtime/centrifuge/src/lib.rs @@ -2064,8 +2064,8 @@ pub type SignedExtra = ( frame_system::CheckNonce, frame_system::CheckWeight, pallet_transaction_payment::ChargeTransactionPayment, - frame_metadata_hash_extension::CheckMetadataHash, runtime_common::transfer_filter::PreBalanceTransferExtension, + frame_metadata_hash_extension::CheckMetadataHash, ); /// Unchecked extrinsic type as expected by this runtime. diff --git a/runtime/development/Cargo.toml b/runtime/development/Cargo.toml index af8e2eb92f..fa3d0c8885 100644 --- 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 index 49a93892fd..ba8f91ea8e 100644 --- a/runtime/development/src/lib.rs +++ b/runtime/development/src/lib.rs @@ -2154,8 +2154,8 @@ pub type SignedExtra = ( frame_system::CheckNonce, frame_system::CheckWeight, pallet_transaction_payment::ChargeTransactionPayment, - frame_metadata_hash_extension::CheckMetadataHash, runtime_common::transfer_filter::PreBalanceTransferExtension, + frame_metadata_hash_extension::CheckMetadataHash, ); /// 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 index 77cd0412fe..01f6169800 100644 --- a/runtime/integration-tests/src/config.rs +++ b/runtime/integration-tests/src/config.rs @@ -296,8 +296,8 @@ pub trait Runtime: frame_system::CheckNonce, frame_system::CheckWeight, pallet_transaction_payment::ChargeTransactionPayment, - frame_metadata_hash_extension::CheckMetadataHash, runtime_common::transfer_filter::PreBalanceTransferExtension, + frame_metadata_hash_extension::CheckMetadataHash, ), >, >; diff --git a/runtime/integration-tests/src/env.rs b/runtime/integration-tests/src/env.rs index fd1666ac16..d99cb84aa3 100644 --- a/runtime/integration-tests/src/env.rs +++ b/runtime/integration-tests/src/env.rs @@ -255,8 +255,8 @@ pub mod utils { frame_system::CheckNonce::::from(nonce), frame_system::CheckWeight::::new(), pallet_transaction_payment::ChargeTransactionPayment::::from(0), - frame_metadata_hash_extension::CheckMetadataHash::::new(false), runtime_common::transfer_filter::PreBalanceTransferExtension::::new(), + frame_metadata_hash_extension::CheckMetadataHash::::new(false), ); let raw_payload = SignedPayload::new(runtime_call.clone(), signed_extra.clone()).unwrap();