From bb4e3c0afffaa90c5c76fc1a69ebabb33598fe65 Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Wed, 14 Aug 2024 11:28:57 +1200 Subject: [PATCH 1/7] wip --- Cargo.lock | 55 +++++++++++++++++++++++---------------- runtime/acala/Cargo.toml | 2 ++ runtime/acala/src/lib.rs | 4 ++- runtime/karura/Cargo.toml | 2 ++ runtime/karura/src/lib.rs | 4 ++- 5 files changed, 43 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 89220a121..8efdbcb2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -899,9 +899,9 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", @@ -2872,6 +2872,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive-syn-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -2976,21 +2987,21 @@ dependencies = [ [[package]] name = "docify" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc4fd38aaa9fb98ac70794c82a00360d1e165a87fbf96a8a91f9dfc602aaee2" +checksum = "43a2f138ad521dc4a2ced1a4576148a6a610b4c5923933b062a263130a6802ce" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63fa215f3a0d40fb2a221b3aa90d8e1fbb8379785a990cb60d62ac71ebdc6460" +checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" dependencies = [ "common-path", - "derive-syn-parse", + "derive-syn-parse 0.2.0", "once_cell", "proc-macro2", "quote", @@ -3908,7 +3919,7 @@ checksum = "732fa43a05789f4ffb96955017e40643199d586c3d211754df5824a195f4eab5" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse", + "derive-syn-parse 0.1.5", "expander 2.0.0", "frame-support-procedural-tools", "itertools 0.10.5", @@ -4570,7 +4581,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite 0.2.13", - "socket2 0.4.10", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -5851,9 +5862,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" @@ -5927,7 +5938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" dependencies = [ "const-random", - "derive-syn-parse", + "derive-syn-parse 0.1.5", "macro_magic_core_macros", "proc-macro2", "quote", @@ -9322,9 +9333,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.5" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec 0.7.4", "bitvec 1.0.1", @@ -9337,11 +9348,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.5" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -13474,9 +13485,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.10.0" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" +checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "bitvec 1.0.1", "cfg-if", @@ -13488,11 +13499,11 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.10.0" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" +checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml index 36d570704..18ae754ee 100644 --- a/runtime/acala/Cargo.toml +++ b/runtime/acala/Cargo.toml @@ -16,6 +16,7 @@ hex-literal = { workspace = true } # substrate 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 } @@ -153,6 +154,7 @@ std = [ "serde_json/std", "frame-benchmarking/std", + # "frame-metadata-hash-extension/std", "frame-executive/std", "frame-support/std", "frame-system-rpc-runtime-api/std", diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs index 72663d150..aa0eeccde 100644 --- a/runtime/acala/src/lib.rs +++ b/runtime/acala/src/lib.rs @@ -1068,6 +1068,7 @@ where frame_system::CheckGenesis::::new(), frame_system::CheckEra::::from(generic::Era::mortal(period, current_block)), runtime_common::CheckNonce::::from(nonce), + frame_metadata_hash_extension::CheckMetadataHash::new(true), frame_system::CheckWeight::::new(), module_evm::SetEvmOrigin::::new(), module_transaction_payment::ChargeTransactionPayment::::from(tip), @@ -1963,6 +1964,7 @@ pub type SignedExtra = ( frame_system::CheckEra, runtime_common::CheckNonce, frame_system::CheckWeight, + frame_metadata_hash_extension::CheckMetadataHash, // `SetEvmOrigin` needs ahead of `ChargeTransactionPayment`, we set origin in `SetEvmOrigin::validate()`, then // `ChargeTransactionPayment::validate()` can process erc20 token transfer successfully in the case of using erc20 // as fee token. @@ -2542,7 +2544,7 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig } } - let (_, _, _, _, mortality, check_nonce, _, _, charge) = extra.clone(); + let (_, _, _, _, mortality, check_nonce, _, _, _, charge) = extra.clone(); if mortality != frame_system::CheckEra::from(sp_runtime::generic::Era::Immortal) { // require immortal diff --git a/runtime/karura/Cargo.toml b/runtime/karura/Cargo.toml index 681c432e9..5faee6b73 100644 --- a/runtime/karura/Cargo.toml +++ b/runtime/karura/Cargo.toml @@ -16,6 +16,7 @@ hex-literal = { workspace = true } # substrate 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 } @@ -155,6 +156,7 @@ std = [ "serde_json/std", "frame-benchmarking/std", + # "frame-metadata-hash-extension/std", "frame-executive/std", "frame-support/std", "frame-system-rpc-runtime-api/std", diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs index 06a5ff53e..b990611ac 100644 --- a/runtime/karura/src/lib.rs +++ b/runtime/karura/src/lib.rs @@ -1075,6 +1075,7 @@ where frame_system::CheckEra::::from(generic::Era::mortal(period, current_block)), runtime_common::CheckNonce::::from(nonce), frame_system::CheckWeight::::new(), + frame_metadata_hash_extension::new(true), module_evm::SetEvmOrigin::::new(), module_transaction_payment::ChargeTransactionPayment::::from(tip), ); @@ -1991,6 +1992,7 @@ pub type SignedExtra = ( frame_system::CheckEra, runtime_common::CheckNonce, frame_system::CheckWeight, + frame_metadata_hash_extension::CheckMetadataHash, // `SetEvmOrigin` needs ahead of `ChargeTransactionPayment`, we set origin in `SetEvmOrigin::validate()`, then // `ChargeTransactionPayment::validate()` can process erc20 token transfer successfully in the case of using erc20 // as fee token. @@ -2568,7 +2570,7 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig } } - let (_, _, _, _, mortality, check_nonce, _, _, charge) = extra.clone(); + let (_, _, _, _, mortality, check_nonce, _, _, _, charge) = extra.clone(); if mortality != frame_system::CheckEra::from(sp_runtime::generic::Era::Immortal) { // require immortal From fe8da0b721910f5e78f04f070fd94a32bdca31fa Mon Sep 17 00:00:00 2001 From: Xiliang Chen Date: Mon, 26 Aug 2024 17:36:18 +1200 Subject: [PATCH 2/7] Update runtime/acala/src/lib.rs Co-authored-by: zjb0807 --- runtime/acala/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs index aa0eeccde..86e0606e5 100644 --- a/runtime/acala/src/lib.rs +++ b/runtime/acala/src/lib.rs @@ -1068,8 +1068,8 @@ where frame_system::CheckGenesis::::new(), frame_system::CheckEra::::from(generic::Era::mortal(period, current_block)), runtime_common::CheckNonce::::from(nonce), - frame_metadata_hash_extension::CheckMetadataHash::new(true), frame_system::CheckWeight::::new(), + frame_metadata_hash_extension::CheckMetadataHash::new(true), module_evm::SetEvmOrigin::::new(), module_transaction_payment::ChargeTransactionPayment::::from(tip), ); From df821e19b5fe45118bb5162109a7c39116fc1ecd Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Mon, 26 Aug 2024 17:45:18 +1200 Subject: [PATCH 3/7] fix --- Cargo.lock | 45 +++++++++++++++++----------------- ecosystem-modules/stable-asset | 2 +- orml | 2 +- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c906f7a04..b5b15c30d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4471,7 +4471,7 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "orml-asset-registry" -version = "0.9.1" +version = "1.0.0" dependencies = [ "cumulus-pallet-xcm", "cumulus-primitives-core", @@ -4505,7 +4505,7 @@ dependencies = [ [[package]] name = "orml-auction" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4521,7 +4521,7 @@ dependencies = [ [[package]] name = "orml-authority" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4539,7 +4539,7 @@ dependencies = [ [[package]] name = "orml-benchmarking" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -4551,6 +4551,7 @@ dependencies = [ "scale-info", "serde", "sp-api", + "sp-core", "sp-io", "sp-runtime", "sp-runtime-interface", @@ -4560,7 +4561,7 @@ dependencies = [ [[package]] name = "orml-currencies" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4579,7 +4580,7 @@ dependencies = [ [[package]] name = "orml-gradually-update" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4594,7 +4595,7 @@ dependencies = [ [[package]] name = "orml-nft" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4609,7 +4610,7 @@ dependencies = [ [[package]] name = "orml-oracle" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -4628,7 +4629,7 @@ dependencies = [ [[package]] name = "orml-oracle-runtime-api" -version = "0.9.1" +version = "1.0.0" dependencies = [ "parity-scale-codec", "sp-api", @@ -4637,7 +4638,7 @@ dependencies = [ [[package]] name = "orml-parameters" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4653,7 +4654,7 @@ dependencies = [ [[package]] name = "orml-payments" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4671,7 +4672,7 @@ dependencies = [ [[package]] name = "orml-rewards" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4687,7 +4688,7 @@ dependencies = [ [[package]] name = "orml-tokens" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4708,7 +4709,7 @@ dependencies = [ [[package]] name = "orml-tokens-runtime-api" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "parity-scale-codec", @@ -4718,7 +4719,7 @@ dependencies = [ [[package]] name = "orml-traits" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -4737,7 +4738,7 @@ dependencies = [ [[package]] name = "orml-unknown-tokens" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4755,7 +4756,7 @@ dependencies = [ [[package]] name = "orml-utilities" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4771,7 +4772,7 @@ dependencies = [ [[package]] name = "orml-vesting" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4787,7 +4788,7 @@ dependencies = [ [[package]] name = "orml-xcm" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "frame-system", @@ -4801,7 +4802,7 @@ dependencies = [ [[package]] name = "orml-xcm-mock-message-queue" -version = "0.9.1" +version = "1.0.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -4817,7 +4818,7 @@ dependencies = [ [[package]] name = "orml-xcm-support" -version = "0.9.1" +version = "1.0.0" dependencies = [ "frame-support", "orml-traits", @@ -4830,7 +4831,7 @@ dependencies = [ [[package]] name = "orml-xtokens" -version = "0.9.1" +version = "1.0.0" dependencies = [ "cumulus-pallet-xcm", "cumulus-primitives-core", diff --git a/ecosystem-modules/stable-asset b/ecosystem-modules/stable-asset index adce350fa..0bd730d20 160000 --- a/ecosystem-modules/stable-asset +++ b/ecosystem-modules/stable-asset @@ -1 +1 @@ -Subproject commit adce350fab53d7ca7deba3c98deb4ef397527406 +Subproject commit 0bd730d20e62c3521ce0b0f4af403013fc14010c diff --git a/orml b/orml index 39cff2423..144a9625b 160000 --- a/orml +++ b/orml @@ -1 +1 @@ -Subproject commit 39cff2423e4847bbbd9ed9adb7d1b1bdbc91cd47 +Subproject commit 144a9625bc0cbd1afb81088f4d8a79a931811b49 From d2a611a9179a07e8ed50f3bffd00ce1745dffee4 Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Mon, 26 Aug 2024 17:57:11 +1200 Subject: [PATCH 4/7] fix --- runtime/acala/src/lib.rs | 2 +- runtime/karura/src/lib.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs index 5d96f5378..8bbef049d 100644 --- a/runtime/acala/src/lib.rs +++ b/runtime/acala/src/lib.rs @@ -2576,7 +2576,7 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig } } - let (_, _, _, _, mortality, check_nonce, _, _, charge) = extra.clone(); + let (_, _, _, _, mortality, check_nonce, _, _, _, charge) = extra.clone(); if mortality != frame_system::CheckEra::from(sp_runtime::generic::Era::Immortal) { // require immortal diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs index b7fd018a0..07839b206 100644 --- a/runtime/karura/src/lib.rs +++ b/runtime/karura/src/lib.rs @@ -1075,7 +1075,7 @@ where frame_system::CheckEra::::from(generic::Era::mortal(period, current_block)), runtime_common::CheckNonce::::from(nonce), frame_system::CheckWeight::::new(), - frame_metadata_hash_extension::new(true), + frame_metadata_hash_extension::CheckMetadataHash::::new(true), module_evm::SetEvmOrigin::::new(), module_transaction_payment::ChargeTransactionPayment::::from(tip), ); @@ -2606,7 +2606,7 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig } } - let (_, _, _, _, mortality, check_nonce, _, _, charge) = extra.clone(); + let (_, _, _, _, mortality, check_nonce, _, _, _, charge) = extra.clone(); if mortality != frame_system::CheckEra::from(sp_runtime::generic::Era::Immortal) { // require immortal From 89da2ea5603766d9b598802e6afde0f81e8b6d60 Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Mon, 26 Aug 2024 17:58:16 +1200 Subject: [PATCH 5/7] revert --- predeploy-contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/predeploy-contracts b/predeploy-contracts index a5ef0f272..95e0d858a 160000 --- a/predeploy-contracts +++ b/predeploy-contracts @@ -1 +1 @@ -Subproject commit a5ef0f27263296006164b1aceef962d7bece0bd3 +Subproject commit 95e0d858ac4a748c5072e4ad55413c306d5bb5e1 From 89efd8c7ff61cc6bb718de6a5e0444568a905d7c Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Mon, 26 Aug 2024 18:50:45 +1200 Subject: [PATCH 6/7] enable metadata hash --- runtime/acala/build.rs | 6 ++---- runtime/karura/build.rs | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/runtime/acala/build.rs b/runtime/acala/build.rs index 28667e9fb..cf447b3c8 100644 --- a/runtime/acala/build.rs +++ b/runtime/acala/build.rs @@ -18,10 +18,8 @@ #[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("ACA", 12) .build() } diff --git a/runtime/karura/build.rs b/runtime/karura/build.rs index 28667e9fb..29a56095c 100644 --- a/runtime/karura/build.rs +++ b/runtime/karura/build.rs @@ -18,10 +18,8 @@ #[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("KAR", 12) .build() } From 2344256ab08eb6d62686833d3072f539f4790b82 Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Mon, 26 Aug 2024 19:10:00 +1200 Subject: [PATCH 7/7] fix --- Cargo.lock | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 2 +- 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index b5b15c30d..9d48d33af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -618,6 +618,19 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -3434,6 +3447,20 @@ dependencies = [ "hash-db", ] +[[package]] +name = "merkleized-metadata" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f313fcff1d2a4bcaa2deeaa00bf7530d77d5f7bd0467a117dde2e29a75a7a17a" +dependencies = [ + "array-bytes", + "blake3", + "frame-metadata", + "parity-scale-codec", + "scale-decode", + "scale-info", +] + [[package]] name = "merlin" version = "3.0.0" @@ -6864,6 +6891,29 @@ dependencies = [ "sp-arithmetic", ] +[[package]] +name = "scale-bits" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54" +dependencies = [ + "parity-scale-codec", + "scale-type-resolver", +] + +[[package]] +name = "scale-decode" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e98f3262c250d90e700bb802eb704e1f841e03331c2eb815e46516c4edbf5b27" +dependencies = [ + "derive_more", + "parity-scale-codec", + "scale-bits", + "scale-type-resolver", + "smallvec", +] + [[package]] name = "scale-info" version = "2.11.3" @@ -6890,6 +6940,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "scale-type-resolver" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0cded6518aa0bd6c1be2b88ac81bf7044992f0f154bfbabd5ad34f43512abcb" + [[package]] name = "schnellru" version = "0.2.3" @@ -8109,13 +8165,22 @@ version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0104598a022d22430f27e535b7aed148af9dcd0a3eb23697c02168071a325e33" dependencies = [ + "array-bytes", "build-helper", "cargo_metadata 0.15.4", "console", "filetime", + "frame-metadata", + "merkleized-metadata", + "parity-scale-codec", "parity-wasm 0.45.0", "polkavm-linker", + "sc-executor", + "sp-core", + "sp-io", "sp-maybe-compressed-blob", + "sp-tracing", + "sp-version", "strum 0.26.3", "tempfile", "toml 0.8.19", diff --git a/Cargo.toml b/Cargo.toml index cdabe2ee0..be9b92439 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -298,5 +298,5 @@ xcm-builder = { version = "16.0.0", package = "staging-xcm-builder", default-fea xcm-executor = { version = "16.0.0", package = "staging-xcm-executor", default-features = false } # polkadot-sdk (client) -substrate-wasm-builder = { version = "24.0.0" } +substrate-wasm-builder = { version = "24.0.0", features = ["metadata-hash"] } xcm-simulator = { version = "16.0.0" }