Skip to content

Commit a882fd9

Browse files
committed
desperate attempts to get it working
1 parent 4f58c15 commit a882fd9

File tree

8 files changed

+14
-11
lines changed

8 files changed

+14
-11
lines changed

runtime/altair/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ pallet-xcm-transactor = { workspace = true }
145145
staging-parachain-info = { workspace = true }
146146

147147
[build-dependencies]
148-
substrate-wasm-builder = { workspace = true }
148+
substrate-wasm-builder = { workspace = true, optional = true }
149149

150150
[features]
151151
default = ["std"]
@@ -157,6 +157,7 @@ std = [
157157
"serde/std",
158158
"log/std",
159159
# Substrate related
160+
"substrate-wasm-builder",
160161
"sp-api/std",
161162
"sp-arithmetic/std",
162163
"sp-runtime/std",
@@ -459,7 +460,7 @@ try-runtime = [
459460
# generate the metadata hash and then a second time with the
460461
# `RUNTIME_METADATA_HASH` environment variable set for the `CheckMetadataHash`
461462
# extension.
462-
metadata-hash = ["substrate-wasm-builder/metadata-hash"]
463+
metadata-hash = ["substrate-wasm-builder?/metadata-hash"]
463464

464465
# A feature that should be enabled when the runtime should be build for on-chain
465466
# deployment. This will disable stuff that shouldn't be part of the on-chain wasm

runtime/altair/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2053,8 +2053,8 @@ pub type SignedExtra = (
20532053
frame_system::CheckNonce<Runtime>,
20542054
frame_system::CheckWeight<Runtime>,
20552055
pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
2056-
frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
20572056
runtime_common::transfer_filter::PreBalanceTransferExtension<Runtime>,
2057+
frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
20582058
);
20592059

20602060
/// Unchecked extrinsic type as expected by this runtime.

runtime/centrifuge/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ pallet-xcm-transactor = { workspace = true }
140140
staging-parachain-info = { workspace = true }
141141

142142
[build-dependencies]
143-
substrate-wasm-builder = { workspace = true }
143+
substrate-wasm-builder = { workspace = true, optional = true }
144144

145145
[features]
146146
default = ["std"]
@@ -166,6 +166,7 @@ std = [
166166
"sp-transaction-pool/std",
167167
"sp-version/std",
168168
"sp-staking/std",
169+
"substrate-wasm-builder",
169170
"frame-support/std",
170171
"frame-system/std",
171172
"frame-system-rpc-runtime-api/std",
@@ -441,7 +442,7 @@ try-runtime = [
441442
# generate the metadata hash and then a second time with the
442443
# `RUNTIME_METADATA_HASH` environment variable set for the `CheckMetadataHash`
443444
# extension.
444-
metadata-hash = ["substrate-wasm-builder/metadata-hash"]
445+
metadata-hash = ["substrate-wasm-builder?/metadata-hash"]
445446

446447
# A feature that should be enabled when the runtime should be build for on-chain
447448
# deployment. This will disable stuff that shouldn't be part of the on-chain wasm

runtime/centrifuge/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2064,8 +2064,8 @@ pub type SignedExtra = (
20642064
frame_system::CheckNonce<Runtime>,
20652065
frame_system::CheckWeight<Runtime>,
20662066
pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
2067-
frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
20682067
runtime_common::transfer_filter::PreBalanceTransferExtension<Runtime>,
2068+
frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
20692069
);
20702070

20712071
/// Unchecked extrinsic type as expected by this runtime.

runtime/development/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ pallet-xcm-transactor = { workspace = true }
146146
staging-parachain-info = { workspace = true }
147147

148148
[build-dependencies]
149-
substrate-wasm-builder = { workspace = true }
149+
substrate-wasm-builder = { workspace = true, optional = true }
150150

151151
[features]
152152
default = ["std"]
@@ -173,6 +173,7 @@ std = [
173173
"sp-transaction-pool/std",
174174
"sp-version/std",
175175
"sp-staking/std",
176+
"substrate-wasm-builder",
176177
"frame-support/std",
177178
"frame-system/std",
178179
"frame-system-rpc-runtime-api/std",
@@ -463,7 +464,7 @@ try-runtime = [
463464
# generate the metadata hash and then a second time with the
464465
# `RUNTIME_METADATA_HASH` environment variable set for the `CheckMetadataHash`
465466
# extension.
466-
metadata-hash = ["substrate-wasm-builder/metadata-hash"]
467+
metadata-hash = ["substrate-wasm-builder?/metadata-hash"]
467468

468469
# A feature that should be enabled when the runtime should be build for on-chain
469470
# deployment. This will disable stuff that shouldn't be part of the on-chain wasm

runtime/development/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2154,8 +2154,8 @@ pub type SignedExtra = (
21542154
frame_system::CheckNonce<Runtime>,
21552155
frame_system::CheckWeight<Runtime>,
21562156
pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
2157-
frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
21582157
runtime_common::transfer_filter::PreBalanceTransferExtension<Runtime>,
2158+
frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
21592159
);
21602160
/// Unchecked extrinsic type as expected by this runtime.
21612161
pub type UncheckedExtrinsic =

runtime/integration-tests/src/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,8 @@ pub trait Runtime:
296296
frame_system::CheckNonce<Self>,
297297
frame_system::CheckWeight<Self>,
298298
pallet_transaction_payment::ChargeTransactionPayment<Self>,
299-
frame_metadata_hash_extension::CheckMetadataHash<Self>,
300299
runtime_common::transfer_filter::PreBalanceTransferExtension<Self>,
300+
frame_metadata_hash_extension::CheckMetadataHash<Self>,
301301
),
302302
>,
303303
>;

runtime/integration-tests/src/env.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ pub mod utils {
255255
frame_system::CheckNonce::<T>::from(nonce),
256256
frame_system::CheckWeight::<T>::new(),
257257
pallet_transaction_payment::ChargeTransactionPayment::<T>::from(0),
258-
frame_metadata_hash_extension::CheckMetadataHash::<T>::new(false),
259258
runtime_common::transfer_filter::PreBalanceTransferExtension::<T>::new(),
259+
frame_metadata_hash_extension::CheckMetadataHash::<T>::new(false),
260260
);
261261

262262
let raw_payload = SignedPayload::new(runtime_call.clone(), signed_extra.clone()).unwrap();

0 commit comments

Comments
 (0)