From afe5643dd5224479d2ac46af1ecca8498cf9333c Mon Sep 17 00:00:00 2001 From: zqh Date: Wed, 23 Mar 2022 14:42:54 +0800 Subject: [PATCH 01/25] update version --- Cargo.lock | 2271 ++++++++++------- Cargo.toml | 387 +-- ecosystem-modules/compound-cash/Cargo.toml | 16 +- ecosystem-modules/ren/renvm-bridge/Cargo.toml | 18 +- ecosystem-modules/starport/Cargo.toml | 18 +- inspect/Cargo.toml | 14 +- modules/asset-registry/Cargo.toml | 26 +- modules/auction-manager/Cargo.toml | 18 +- modules/cdp-engine/Cargo.toml | 22 +- modules/cdp-treasury/Cargo.toml | 18 +- modules/collator-selection/Cargo.toml | 36 +- modules/currencies/Cargo.toml | 22 +- modules/dex-oracle/Cargo.toml | 22 +- modules/dex/Cargo.toml | 20 +- modules/emergency-shutdown/Cargo.toml | 18 +- modules/evm-accounts/Cargo.toml | 18 +- modules/evm-bridge/Cargo.toml | 24 +- modules/evm-utility/Cargo.toml | 13 +- modules/evm/Cargo.toml | 22 +- modules/evm/rpc/Cargo.toml | 20 +- modules/evm/rpc/runtime_api/Cargo.toml | 8 +- modules/example/Cargo.toml | 14 +- modules/homa-lite/Cargo.toml | 32 +- modules/homa-validator-list/Cargo.toml | 18 +- modules/homa/Cargo.toml | 24 +- modules/honzon/Cargo.toml | 20 +- modules/idle-scheduler/Cargo.toml | 16 +- modules/incentives/Cargo.toml | 18 +- modules/loans/Cargo.toml | 18 +- modules/nft/Cargo.toml | 24 +- modules/nominees-election/Cargo.toml | 18 +- modules/prices/Cargo.toml | 16 +- modules/relaychain/Cargo.toml | 18 +- modules/session-manager/Cargo.toml | 18 +- modules/support/Cargo.toml | 16 +- modules/transaction-pause/Cargo.toml | 18 +- modules/transaction-payment/Cargo.toml | 28 +- modules/xcm-interface/Cargo.toml | 28 +- node/Cargo.toml | 2 +- node/cli/Cargo.toml | 32 +- node/e2e-tests/test-service/Cargo.toml | 100 +- node/e2e-tests/test-service/src/lib.rs | 2 +- node/service/Cargo.toml | 104 +- node/service/src/lib.rs | 2 +- orml | 2 +- primitives/Cargo.toml | 18 +- rpc/Cargo.toml | 24 +- runtime/acala/Cargo.toml | 125 +- runtime/common/Cargo.toml | 45 +- runtime/common/src/lib.rs | 45 +- runtime/integration-tests/Cargo.toml | 136 +- runtime/karura/Cargo.toml | 125 +- runtime/mandala/Cargo.toml | 138 +- 53 files changed, 2344 insertions(+), 1931 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a699b9e50..d155068163 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,7 +35,7 @@ dependencies = [ "frame-benchmarking-cli", "log", "orml-build-script-utils", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-cli", "polkadot-parachain", "polkadot-primitives", @@ -56,7 +56,7 @@ dependencies = [ "clap 3.1.6", "derive_more", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-cli", "sc-client-api", "sc-service", @@ -77,7 +77,7 @@ dependencies = [ "module-evm-utility-macro", "num_enum", "nutsfinance-stable-asset", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "scale-info", "serde", @@ -99,7 +99,7 @@ dependencies = [ "orml-oracle-rpc", "orml-tokens-rpc", "pallet-transaction-payment-rpc", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "runtime-common", "sc-client-api", "sc-consensus-manual-seal", @@ -199,7 +199,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "runtime-common", "scale-info", @@ -242,8 +242,8 @@ dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", - "cumulus-relay-chain-local", "cumulus-test-relay-sproof-builder", "ecosystem-renvm-bridge", "ethers", @@ -263,7 +263,7 @@ dependencies = [ "orml-oracle-rpc", "orml-tokens-rpc", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-service", "runtime-common", @@ -338,7 +338,7 @@ checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if 1.0.0", "cipher", - "cpufeatures 0.2.1", + "cpufeatures 0.2.2", "opaque-debug 0.3.0", ] @@ -393,9 +393,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.55" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "159bb86af3a200e19a068f4224eae4c8bb2d0fa054c7e5d1cacd5cef95e684cd" +checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" [[package]] name = "approx" @@ -552,16 +552,15 @@ dependencies = [ [[package]] name = "async-std" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" +checksum = "52580991739c5cdb36cde8b2a516371c0a3b70dda36d916cc08b82372916808c" dependencies = [ "async-attributes", "async-channel", "async-global-executor", "async-io", "async-lock", - "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -595,9 +594,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d306121baf53310a3fd342d88dc0824f6bbeace68347593658525565abee8" +checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" [[package]] name = "async-trait" @@ -754,9 +753,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "base64ct" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874f8444adcb4952a8bc51305c8be95c8ec8237bb0d2e78d2e039f771f8828a0" +checksum = "71acf5509fc522cce1b100ac0121c635129bfd4d91cdf036bcc9b9935f97ccf5" [[package]] name = "bech32" @@ -776,14 +775,15 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "beefy-primitives", "fnv", "futures 0.3.21", + "hex", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-chain-spec", "sc-client-api", "sc-keystore", @@ -805,7 +805,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -815,8 +815,8 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-rpc", "sc-utils", "serde", @@ -828,14 +828,14 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-api", "sp-application-crypto", @@ -909,10 +909,22 @@ version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" dependencies = [ - "funty", + "funty 1.1.0", "radium 0.6.2", "tap", - "wyz", + "wyz 0.2.0", +] + +[[package]] +name = "bitvec" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" +dependencies = [ + "funty 2.0.0", + "radium 0.7.0", + "tap", + "wyz 0.5.0", ] [[package]] @@ -926,6 +938,15 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "blake2" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "blake2-rfc" version = "0.2.18" @@ -973,6 +994,20 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "blake3" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +dependencies = [ + "arrayref", + "arrayvec 0.7.2", + "cc", + "cfg-if 1.0.0", + "constant_time_eq", + "digest 0.10.3", +] + [[package]] name = "block-buffer" version = "0.7.3" @@ -1021,9 +1056,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046e47d4b2d391b1f6f8b407b1deb8dee56c1852ccd868becf2710f601b5f427" +checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" dependencies = [ "async-channel", "async-task", @@ -1045,11 +1080,11 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "finality-grandpa", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -1061,11 +1096,11 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bp-runtime", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-std", ] @@ -1073,14 +1108,14 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "bp-runtime", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-std", @@ -1089,13 +1124,13 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bp-messages", "bp-runtime", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-api", "sp-core", @@ -1107,13 +1142,13 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bp-messages", "bp-polkadot-core", "bp-runtime", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "smallvec", "sp-api", "sp-runtime", @@ -1124,12 +1159,12 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -1142,12 +1177,12 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bp-header-chain", "ed25519-dalek", "finality-grandpa", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -1157,13 +1192,13 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bp-messages", "bp-polkadot-core", "bp-rococo", "bp-runtime", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-runtime", "sp-std", @@ -1172,7 +1207,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -1183,7 +1218,7 @@ dependencies = [ "pallet-bridge-grandpa", "pallet-bridge-messages", "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-runtime", @@ -1268,6 +1303,17 @@ dependencies = [ "serde", ] +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "cache-padded" version = "1.2.0" @@ -1473,15 +1519,6 @@ dependencies = [ "syn", ] -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - [[package]] name = "coins-bip32" version = "0.3.0" @@ -1493,7 +1530,7 @@ dependencies = [ "coins-core", "digest 0.9.0", "hmac 0.11.0", - "k256", + "k256 0.9.5", "lazy_static", "serde", "sha2 0.9.9", @@ -1526,7 +1563,7 @@ dependencies = [ "base58check", "base64 0.12.3", "bech32", - "blake2", + "blake2 0.9.2", "digest 0.9.0", "generic-array 0.14.5", "hex", @@ -1618,9 +1655,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ "libc", ] @@ -1763,9 +1800,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" +checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1784,10 +1821,11 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9" +checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ + "autocfg", "cfg-if 1.0.0", "crossbeam-utils", "lazy_static", @@ -1797,9 +1835,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ "cfg-if 1.0.0", "lazy_static", @@ -1898,9 +1936,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" +checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ "quote", "syn", @@ -1938,25 +1976,26 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "clap 3.1.6", "sc-cli", "sc-service", + "url 2.2.2", ] [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", - "parity-scale-codec", - "parking_lot 0.10.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1972,13 +2011,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -2001,13 +2040,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-relay-chain-interface", "dyn-clone", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sc-client-api", "sc-consensus", @@ -2022,7 +2061,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -2046,14 +2085,14 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-relay-chain-interface", "derive_more", "futures 0.3.21", "futures-timer", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-parachain", @@ -2071,13 +2110,13 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -2095,14 +2134,15 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ + "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-pov-recovery", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-overseer", "polkadot-primitives", @@ -2124,13 +2164,13 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-executive", "frame-support", "frame-system", "pallet-aura", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-application-crypto", @@ -2142,13 +2182,13 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-io", "sp-runtime", @@ -2160,7 +2200,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -2171,7 +2211,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "scale-info", "serde", @@ -2190,7 +2230,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -2201,12 +2241,12 @@ dependencies = [ [[package]] name = "cumulus-pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-runtime", "sp-std", ] @@ -2214,12 +2254,12 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-io", @@ -2231,13 +2271,13 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.3.1", "scale-info", "sp-runtime", @@ -2249,13 +2289,13 @@ dependencies = [ [[package]] name = "cumulus-ping" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-pallet-xcm", "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-runtime", @@ -2266,10 +2306,10 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2282,13 +2322,13 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-test-relay-sproof-builder", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "scale-info", "sp-api", @@ -2305,9 +2345,11 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", + "futures 0.3.21", + "parity-scale-codec 3.1.2", "sp-inherents", "sp-std", "sp-timestamp", @@ -2316,11 +2358,11 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2331,61 +2373,64 @@ dependencies = [ ] [[package]] -name = "cumulus-relay-chain-interface" +name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-primitives-core", - "derive_more", + "cumulus-relay-chain-interface", "futures 0.3.21", + "futures-timer", "parking_lot 0.12.0", - "polkadot-overseer", + "polkadot-client", + "polkadot-service", "sc-client-api", + "sc-consensus-babe", + "sc-network", "sc-service", + "sc-telemetry", + "sc-tracing", "sp-api", "sp-blockchain", + "sp-consensus", "sp-core", "sp-runtime", "sp-state-machine", - "thiserror", + "tracing", ] [[package]] -name = "cumulus-relay-chain-local" +name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "async-trait", "cumulus-primitives-core", - "cumulus-relay-chain-interface", + "derive_more", "futures 0.3.21", - "futures-timer", + "jsonrpsee-core 0.9.0", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", - "polkadot-client", + "polkadot-overseer", "polkadot-service", "sc-client-api", - "sc-consensus-babe", - "sc-network", "sc-service", - "sc-telemetry", - "sc-tracing", "sp-api", "sp-blockchain", - "sp-consensus", "sp-core", "sp-runtime", "sp-state-machine", - "tracing", + "thiserror", ] [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sp-runtime", "sp-state-machine", @@ -2395,7 +2440,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-validation-worker-provider" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "polkadot-node-core-pvf", ] @@ -2520,6 +2565,7 @@ checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ "block-buffer 0.10.2", "crypto-common", + "subtle", ] [[package]] @@ -2543,9 +2589,9 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", @@ -2608,9 +2654,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" +checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" [[package]] name = "e2e-tests" @@ -2631,6 +2677,17 @@ dependencies = [ "signature", ] +[[package]] +name = "ecdsa" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +dependencies = [ + "der 0.5.1", + "elliptic-curve 0.11.12", + "signature", +] + [[package]] name = "ecosystem-compound-cash" version = "2.4.1" @@ -2640,7 +2697,7 @@ dependencies = [ "frame-system", "module-support", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -2661,7 +2718,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -2682,7 +2739,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -2692,9 +2749,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed12bbf7b5312f8da1c2722bc06d8c6b12c2d86a7fb35a194c7f3e6fc2bbe39" +checksum = "3d5c4b5e5959dc2c2b89918d8e2cc40fcdd623cef026ed09d2f0ee05199dc8e4" dependencies = [ "signature", ] @@ -2726,10 +2783,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83e5c176479da93a0983f0a6fdc3c1b8e7d5be0d7fe3fe05a99f15b96582b9a8" dependencies = [ "crypto-bigint 0.2.5", - "ff", + "ff 0.10.1", "generic-array 0.14.5", - "group", - "pkcs8", + "group 0.10.0", + "pkcs8 0.7.6", "rand_core 0.6.3", "subtle", "zeroize", @@ -2744,8 +2801,11 @@ dependencies = [ "base16ct", "crypto-bigint 0.3.2", "der 0.5.1", + "ff 0.11.0", "generic-array 0.14.5", + "group 0.11.0", "rand_core 0.6.3", + "sec1", "subtle", "zeroize", ] @@ -2872,7 +2932,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76ef192b63e8a44b3d08832acebbb984c3fba154b5c26f70037c860202a0d4b" dependencies = [ "anyhow", - "ethereum-types", + "ethereum-types 0.12.1", "hex", "serde", "serde_json", @@ -2881,6 +2941,19 @@ dependencies = [ "uint", ] +[[package]] +name = "ethabi" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b69517146dfab88e9238c00c724fd8e277951c3cc6f22b016d72f422a832213e" +dependencies = [ + "ethereum-types 0.13.1", + "hex", + "sha3 0.10.1", + "thiserror", + "uint", +] + [[package]] name = "ethbloom" version = "0.11.1" @@ -2889,7 +2962,20 @@ checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8" dependencies = [ "crunchy", "fixed-hash", - "impl-codec", + "impl-rlp", + "impl-serde", + "tiny-keccak", +] + +[[package]] +name = "ethbloom" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef" +dependencies = [ + "crunchy", + "fixed-hash", + "impl-codec 0.6.0", "impl-rlp", "impl-serde", "scale-info", @@ -2898,38 +2984,38 @@ dependencies = [ [[package]] name = "ethereum" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c90e0a755da706ce0970ec0fa8cc48aabcc8e8efa1245336acf718dab06ffe" +checksum = "23750149fe8834c0e24bb9adcbacbe06c45b9861f15df53e09f26cb7c4ab91ef" dependencies = [ "bytes 1.1.0", - "ethereum-types", + "ethereum-types 0.13.1", "hash-db", "hash256-std-hasher", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rlp", "rlp-derive", "scale-info", "serde", - "sha3 0.9.1", + "sha3 0.10.1", "triehash", ] [[package]] name = "ethereum" version = "0.12.0" -source = "git+https://github.com/rust-blockchain/ethereum?rev=34fd1fed1fb0261fef9c8a36acb6ecf5082036ad#34fd1fed1fb0261fef9c8a36acb6ecf5082036ad" +source = "git+https://github.com/rust-blockchain/ethereum?rev=755dffaa4903fbec1269f50cde9863cf86269a14#755dffaa4903fbec1269f50cde9863cf86269a14" dependencies = [ "bytes 1.1.0", - "ethereum-types", + "ethereum-types 0.13.1", "hash-db", "hash256-std-hasher", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rlp", "rlp-derive", "scale-info", "serde", - "sha3 0.9.1", + "sha3 0.10.1", "triehash", ] @@ -2939,12 +3025,26 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf" dependencies = [ - "ethbloom", + "ethbloom 0.11.1", + "fixed-hash", + "impl-rlp", + "impl-serde", + "primitive-types 0.10.1", + "uint", +] + +[[package]] +name = "ethereum-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6" +dependencies = [ + "ethbloom 0.12.1", "fixed-hash", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", "impl-serde", - "primitive-types", + "primitive-types 0.11.1", "scale-info", "uint", ] @@ -3030,12 +3130,12 @@ dependencies = [ "bytes 1.1.0", "cargo_metadata", "convert_case", - "ecdsa", + "ecdsa 0.12.4", "elliptic-curve 0.11.12", - "ethabi", + "ethabi 15.0.0", "generic-array 0.14.5", "hex", - "k256", + "k256 0.9.5", "once_cell", "proc-macro2", "quote", @@ -3170,18 +3270,18 @@ checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" [[package]] name = "evm" -version = "0.33.1" -source = "git+https://github.com/rust-blockchain/evm?rev=52d5fe5d1fd665a495ea34cc67c5f0c6bc6dd23e#52d5fe5d1fd665a495ea34cc67c5f0c6bc6dd23e" +version = "0.33.2" +source = "git+https://github.com/AcalaNetwork/evm?rev=a56d8af9787f0550cb4c4ab3955e81f1741d9e7c#a56d8af9787f0550cb4c4ab3955e81f1741d9e7c" dependencies = [ "auto_impl", "environmental", - "ethereum 0.11.1", + "ethereum 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "evm-core", "evm-gasometer", "evm-runtime", "log", - "parity-scale-codec", - "primitive-types", + "parity-scale-codec 3.1.2", + "primitive-types 0.11.1", "rlp", "scale-info", "serde", @@ -3191,11 +3291,11 @@ dependencies = [ [[package]] name = "evm-core" version = "0.33.0" -source = "git+https://github.com/rust-blockchain/evm?rev=52d5fe5d1fd665a495ea34cc67c5f0c6bc6dd23e#52d5fe5d1fd665a495ea34cc67c5f0c6bc6dd23e" +source = "git+https://github.com/AcalaNetwork/evm?rev=a56d8af9787f0550cb4c4ab3955e81f1741d9e7c#a56d8af9787f0550cb4c4ab3955e81f1741d9e7c" dependencies = [ - "funty", - "parity-scale-codec", - "primitive-types", + "funty 1.1.0", + "parity-scale-codec 3.1.2", + "primitive-types 0.11.1", "scale-info", "serde", ] @@ -3203,12 +3303,12 @@ dependencies = [ [[package]] name = "evm-gasometer" version = "0.33.0" -source = "git+https://github.com/rust-blockchain/evm?rev=52d5fe5d1fd665a495ea34cc67c5f0c6bc6dd23e#52d5fe5d1fd665a495ea34cc67c5f0c6bc6dd23e" +source = "git+https://github.com/AcalaNetwork/evm?rev=a56d8af9787f0550cb4c4ab3955e81f1741d9e7c#a56d8af9787f0550cb4c4ab3955e81f1741d9e7c" dependencies = [ "environmental", "evm-core", "evm-runtime", - "primitive-types", + "primitive-types 0.11.1", ] [[package]] @@ -3238,12 +3338,12 @@ dependencies = [ [[package]] name = "evm-runtime" version = "0.33.0" -source = "git+https://github.com/rust-blockchain/evm?rev=52d5fe5d1fd665a495ea34cc67c5f0c6bc6dd23e#52d5fe5d1fd665a495ea34cc67c5f0c6bc6dd23e" +source = "git+https://github.com/AcalaNetwork/evm?rev=a56d8af9787f0550cb4c4ab3955e81f1741d9e7c#a56d8af9787f0550cb4c4ab3955e81f1741d9e7c" dependencies = [ "auto_impl", "environmental", "evm-core", - "primitive-types", + "primitive-types 0.11.1", "sha3 0.8.2", ] @@ -3256,6 +3356,30 @@ dependencies = [ "futures 0.3.21", ] +[[package]] +name = "expander" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a718c0675c555c5f976fff4ea9e2c150fa06cefa201cadef87cfbf9324075881" +dependencies = [ + "blake3 1.3.1", + "fs-err", + "proc-macro2", + "quote", +] + +[[package]] +name = "expander" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "309f21c39e8e38e4b6eda07e155bd7a4e5fc4d707cefd0402cc82a8b6bb65aaa" +dependencies = [ + "blake2 0.10.4", + "fs-err", + "proc-macro2", + "quote", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -3277,6 +3401,31 @@ dependencies = [ "instant", ] +[[package]] +name = "fatality" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad875162843b0d046276327afe0136e9ed3a23d5a754210fb6f1f33610d39ab" +dependencies = [ + "fatality-proc-macro", + "thiserror", +] + +[[package]] +name = "fatality-proc-macro" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd" +dependencies = [ + "expander 0.0.4", + "indexmap", + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", + "thiserror", +] + [[package]] name = "fdlimit" version = "0.2.1" @@ -3296,6 +3445,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "ff" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2958d04124b9f27f175eaeb9a9f383d026098aa837eadd8ba22c11f13a05b9e" +dependencies = [ + "rand_core 0.6.3", + "subtle", +] + [[package]] name = "file-per-thread-logger" version = "0.1.5" @@ -3308,16 +3467,16 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.14.4" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" +checksum = "d9def033d8505edf199f6a5d07aa7e6d2d6185b164293b77f0efd108f4f3e11d" dependencies = [ "either", "futures 0.3.21", "futures-timer", "log", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.11.2", "scale-info", ] @@ -3377,9 +3536,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", ] [[package]] @@ -3395,13 +3554,13 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "linregress", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", "scale-info", "serde", @@ -3417,7 +3576,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "Inflector", "chrono", @@ -3425,30 +3584,44 @@ dependencies = [ "frame-benchmarking", "frame-support", "handlebars", + "hash-db", + "hex", + "itertools", + "kvdb", "linked-hash-map", "log", - "parity-scale-codec", + "memory-db", + "parity-scale-codec 3.1.2", + "rand 0.8.5", "sc-cli", + "sc-client-api", "sc-client-db", "sc-executor", "sc-service", "serde", "serde_json", + "serde_nanos", + "sp-api", + "sp-blockchain", "sp-core", + "sp-database", "sp-externalities", "sp-keystore", "sp-runtime", "sp-state-machine", + "sp-std", + "sp-storage", + "sp-trie", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-arithmetic", "sp-npos-elections", @@ -3458,11 +3631,11 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -3473,12 +3646,12 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ed5e5c346de62ca5c184b4325a6600d1eaca210666e4606fe4e449574978d0" +checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", ] @@ -3486,7 +3659,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "bitflags", "frame-metadata", @@ -3494,7 +3667,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "once_cell", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", "scale-info", "serde", @@ -3515,7 +3688,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -3527,7 +3700,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.3", @@ -3539,7 +3712,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro2", "quote", @@ -3549,11 +3722,11 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -3566,12 +3739,12 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-runtime", @@ -3581,16 +3754,16 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", ] [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "sp-api", @@ -3654,6 +3827,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures" version = "0.1.31" @@ -3886,16 +4065,27 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" dependencies = [ - "ff", + "ff 0.10.1", + "rand_core 0.6.3", + "subtle", +] + +[[package]] +name = "group" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +dependencies = [ + "ff 0.11.0", "rand_core 0.6.3", "subtle", ] [[package]] name = "h2" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e" +checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b" dependencies = [ "bytes 1.1.0", "fnv", @@ -3918,9 +4108,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "handlebars" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25546a65e5cf1f471f3438796fc634650b31d7fcde01d444c309aeb28b92e3a8" +checksum = "99d6a30320f094710245150395bc763ad23128d6a1ebbad7594dc4164b62c56b" dependencies = [ "log", "pest", @@ -4098,9 +4288,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.17" +version = "0.14.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" +checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" dependencies = [ "bytes 1.1.0", "futures-channel", @@ -4147,7 +4337,7 @@ dependencies = [ "hyper", "rustls 0.20.4", "tokio", - "tokio-rustls 0.23.2", + "tokio-rustls 0.23.3", ] [[package]] @@ -4228,7 +4418,16 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 2.3.1", +] + +[[package]] +name = "impl-codec" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" +dependencies = [ + "parity-scale-codec 3.1.2", ] [[package]] @@ -4336,9 +4535,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" +checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c" [[package]] name = "itertools" @@ -4528,7 +4727,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05fd8cd6c6b1bbd06881d2cf88f1fc83cc36c98f2219090f839115fb4a956cb9" dependencies = [ - "jsonrpsee-core", + "jsonrpsee-core 0.8.0", "jsonrpsee-proc-macros", "jsonrpsee-types 0.8.0", "jsonrpsee-ws-client 0.8.0", @@ -4542,14 +4741,14 @@ checksum = "3303cdf246e6ab76e2866fb3d9acb6c76a068b1b28bd923a1b7a8122257ad7b5" dependencies = [ "futures 0.3.21", "http", - "jsonrpsee-core", + "jsonrpsee-core 0.8.0", "jsonrpsee-types 0.8.0", "pin-project 1.0.10", "rustls-native-certs 0.6.1", "soketto", "thiserror", "tokio", - "tokio-rustls 0.23.2", + "tokio-rustls 0.23.3", "tokio-util", "tracing", "webpki-roots 0.22.2", @@ -4578,6 +4777,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22abc3274b265dcefe2e26c4beecf9fda4fffa48cf94930443a6c73678f020d5" +dependencies = [ + "anyhow", + "arrayvec 0.7.2", + "async-trait", + "beef", + "futures-channel", + "hyper", + "jsonrpsee-types 0.9.0", + "serde", + "serde_json", + "soketto", + "thiserror", +] + [[package]] name = "jsonrpsee-proc-macros" version = "0.8.0" @@ -4623,6 +4841,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f4c45d2e2aa1db4c7d7d7dbaabc10a5b5258d99cd9d42fbfd5260b76f80c324" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "jsonrpsee-utils" version = "0.4.1" @@ -4665,7 +4897,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5" dependencies = [ "jsonrpsee-client-transport", - "jsonrpsee-core", + "jsonrpsee-core 0.8.0", "jsonrpsee-types 0.8.0", ] @@ -4676,12 +4908,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "008b0281ca8032567c9711cd48631781c15228301860a39b32deb28d63125e46" dependencies = [ "cfg-if 1.0.0", - "ecdsa", + "ecdsa 0.12.4", "elliptic-curve 0.10.4", "sha2 0.9.9", "sha3 0.9.1", ] +[[package]] +name = "k256" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" +dependencies = [ + "cfg-if 1.0.0", + "ecdsa 0.13.4", + "elliptic-curve 0.11.12", + "sec1", +] + [[package]] name = "karura-runtime" version = "2.4.1" @@ -4769,7 +5013,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "runtime-common", "scale-info", @@ -4814,11 +5058,11 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -4828,7 +5072,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", - "kusama-runtime-constants 0.9.17 (git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060)", + "kusama-runtime-constants 0.9.18 (git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b)", "log", "pallet-authority-discovery", "pallet-authorship", @@ -4868,7 +5112,7 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -4902,8 +5146,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.17#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-support", "polkadot-primitives", @@ -4914,8 +5158,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-support", "polkadot-primitives", @@ -4935,9 +5179,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512" +checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" dependencies = [ "parity-util-mem", "smallvec", @@ -4945,20 +5189,20 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5" +checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "kvdb-rocksdb" -version = "0.14.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1b6ea8f2536f504b645ad78419c8246550e19d2c3419a167080ce08edee35a" +checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" dependencies = [ "fs-swap", "kvdb", @@ -4966,7 +5210,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rocksdb", "smallvec", @@ -4989,9 +5233,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.119" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" [[package]] name = "libloading" @@ -5494,14 +5738,17 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "6.20.3" +version = "0.6.1+6.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d" +checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" dependencies = [ "bindgen", + "bzip2-sys", "cc", "glob", "libc", + "libz-sys", + "tikv-jemalloc-sys", ] [[package]] @@ -5602,9 +5849,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +checksum = "6f35facd4a5673cb5a48822be2be1d4236c1c99cb4113cab7061ac720d5bf859" dependencies = [ "cc", "pkg-config", @@ -5642,15 +5889,6 @@ version = "0.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a261afc61b7a5e323933b402ca6a1765183687c614789b1e4db7762ed4230bca" -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - [[package]] name = "lock_api" version = "0.4.6" @@ -5662,9 +5900,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" dependencies = [ "cfg-if 1.0.0", "value-bag", @@ -5699,9 +5937,9 @@ dependencies = [ [[package]] name = "lz4" -version = "1.23.2" +version = "1.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c" +checksum = "4edcb94251b1c375c459e5abe9fb0168c1c826c3370172684844f8f3f8d1a885" dependencies = [ "libc", "lz4-sys", @@ -5709,9 +5947,9 @@ dependencies = [ [[package]] name = "lz4-sys" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae" +checksum = "d7be8908e2ed6f31c02db8a9fa962f03e36c53fbfde437363eae3306b85d7e17" dependencies = [ "cc", "libc", @@ -5823,7 +6061,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "runtime-common", "scale-info", @@ -5933,12 +6171,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d505169b746dacf02f7d14d8c80b34edfd8212159c63d23c977739a0d960c626" +checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" dependencies = [ "hash-db", - "hashbrown 0.11.2", + "hashbrown 0.12.0", "parity-util-mem", ] @@ -5971,8 +6209,8 @@ dependencies = [ [[package]] name = "metered-channel" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "derive_more", "futures 0.3.21", @@ -5983,9 +6221,9 @@ dependencies = [ [[package]] name = "mick-jaeger" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd2c2cc134e57461f0898b0e921f0a7819b5e3f3a4335b9aa390ce81a5f36fb9" +checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ "futures 0.3.21", "rand 0.8.5", @@ -6035,14 +6273,15 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", "miow 0.3.7", "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", "winapi 0.3.9", ] @@ -6094,7 +6333,7 @@ dependencies = [ "orml-utilities", "pallet-balances", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "serde_json", @@ -6122,7 +6361,7 @@ dependencies = [ "orml-traits", "orml-utilities", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6148,7 +6387,7 @@ dependencies = [ "orml-utilities", "pallet-balances", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.2.2", "scale-info", "serde", @@ -6173,7 +6412,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6196,7 +6435,7 @@ dependencies = [ "pallet-balances", "pallet-session", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-consensus-aura", @@ -6224,7 +6463,7 @@ dependencies = [ "orml-utilities", "pallet-balances", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "serde_json", @@ -6245,7 +6484,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6265,7 +6504,7 @@ dependencies = [ "module-support", "orml-traits", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6288,7 +6527,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6317,8 +6556,8 @@ dependencies = [ "orml-traits", "pallet-balances", "pallet-timestamp", - "parity-scale-codec", - "primitive-types", + "parity-scale-codec 3.1.2", + "primitive-types 0.11.1", "ripemd160", "rlp", "scale-info", @@ -6347,7 +6586,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6361,7 +6600,7 @@ name = "module-evm-bridge" version = "2.4.1" dependencies = [ "acala-primitives", - "ethereum-types", + "ethereum-types 0.13.1", "frame-support", "frame-system", "hex", @@ -6372,8 +6611,8 @@ dependencies = [ "num_enum", "pallet-balances", "pallet-timestamp", - "parity-scale-codec", - "primitive-types", + "parity-scale-codec 3.1.2", + "primitive-types 0.11.1", "scale-info", "serde", "serde_json", @@ -6398,10 +6637,11 @@ dependencies = [ name = "module-evm-utility" version = "2.4.1" dependencies = [ - "ethereum 0.12.0", + "ethereum 0.12.0 (git+https://github.com/rust-blockchain/ethereum?rev=755dffaa4903fbec1269f50cde9863cf86269a14)", "evm", "evm-gasometer", "evm-runtime", + "scale-info", "sha3 0.9.1", "sp-std", ] @@ -6422,7 +6662,7 @@ version = "2.4.1" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6443,7 +6683,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-arithmetic", "sp-core", @@ -6469,7 +6709,7 @@ dependencies = [ "orml-traits", "pallet-balances", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-arithmetic", "sp-core", @@ -6493,7 +6733,7 @@ dependencies = [ "orml-traits", "orml-utilities", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6518,7 +6758,7 @@ dependencies = [ "orml-traits", "pallet-balances", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6535,7 +6775,7 @@ dependencies = [ "frame-support", "frame-system", "module-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6556,7 +6796,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6578,7 +6818,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6603,7 +6843,7 @@ dependencies = [ "pallet-balances", "pallet-proxy", "pallet-utility", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6624,7 +6864,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6643,7 +6883,7 @@ dependencies = [ "module-support", "orml-tokens", "orml-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -6661,7 +6901,7 @@ dependencies = [ "frame-support", "frame-system", "module-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "sp-core", "sp-io", @@ -6678,7 +6918,7 @@ dependencies = [ "frame-system", "log", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-io", @@ -6694,7 +6934,7 @@ dependencies = [ "acala-primitives", "frame-support", "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -6713,7 +6953,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "smallvec", "sp-core", @@ -6737,7 +6977,7 @@ dependencies = [ "pallet-balances", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "smallvec", @@ -6766,7 +7006,7 @@ dependencies = [ "orml-traits", "pallet-balances", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -6819,7 +7059,7 @@ checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab" dependencies = [ "blake2b_simd", "blake2s_simd", - "blake3", + "blake3 0.3.8", "digest 0.9.0", "generic-array 0.14.5", "multihash-derive", @@ -6956,13 +7196,12 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" dependencies = [ "memchr", "minimal-lexical", - "version_check", ] [[package]] @@ -7019,6 +7258,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-format" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465" +dependencies = [ + "arrayvec 0.4.12", + "itoa 0.4.8", +] + [[package]] name = "num-integer" version = "0.1.44" @@ -7086,18 +7335,18 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720d3ea1055e4e4574c0c0b0f8c3fd4f24c4cdaf465948206dea090b57b526ad" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -7112,7 +7361,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7134,9 +7383,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" [[package]] name = "oorandom" @@ -7228,7 +7477,7 @@ dependencies = [ "frame-support", "frame-system", "orml-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7244,7 +7493,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-scheduler", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7264,7 +7513,7 @@ dependencies = [ "frame-benchmarking", "hash-db", "linregress", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "paste", "rand 0.8.5", @@ -7296,7 +7545,7 @@ dependencies = [ "frame-system", "hex-literal", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", "scale-info", "serde", @@ -7325,7 +7574,7 @@ dependencies = [ "orml-traits", "orml-utilities", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7340,7 +7589,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7355,7 +7604,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7372,7 +7621,7 @@ dependencies = [ "frame-system", "orml-traits", "orml-utilities", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-application-crypto", @@ -7390,7 +7639,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "orml-oracle-rpc-runtime-api", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-blockchain", "sp-runtime", @@ -7400,7 +7649,7 @@ dependencies = [ name = "orml-oracle-rpc-runtime-api" version = "0.4.1-dev" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-std", ] @@ -7412,7 +7661,7 @@ dependencies = [ "frame-support", "frame-system", "orml-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7430,7 +7679,7 @@ dependencies = [ "orml-traits", "pallet-elections-phragmen", "pallet-treasury", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7448,7 +7697,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "orml-tokens-rpc-runtime-api", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-blockchain", "sp-core", @@ -7462,7 +7711,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "orml-tokens", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-runtime", ] @@ -7475,7 +7724,7 @@ dependencies = [ "impl-trait-for-tuples", "num-traits", "orml-utilities", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-io", @@ -7491,7 +7740,7 @@ dependencies = [ "frame-support", "frame-system", "orml-xcm-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7507,7 +7756,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "serde_json", @@ -7523,7 +7772,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7539,7 +7788,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-io", @@ -7555,7 +7804,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-std", "xcm", @@ -7568,7 +7817,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "orml-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-runtime", "sp-std", "xcm", @@ -7592,7 +7841,7 @@ dependencies = [ "pallet-balances", "pallet-xcm", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-runtime-parachains", "scale-info", @@ -7628,12 +7877,12 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7645,12 +7894,12 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-runtime", "sp-std", @@ -7659,12 +7908,12 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-application-crypto", "sp-consensus-aura", @@ -7675,12 +7924,12 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-application-crypto", "sp-authority-discovery", @@ -7691,12 +7940,12 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-authorship", "sp-runtime", @@ -7706,7 +7955,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", @@ -7715,7 +7964,7 @@ dependencies = [ "pallet-authorship", "pallet-session", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-application-crypto", "sp-consensus-babe", @@ -7730,7 +7979,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7738,7 +7987,7 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -7750,13 +7999,13 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-runtime", "sp-std", @@ -7765,13 +8014,13 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "beefy-primitives", "frame-support", "frame-system", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-runtime", @@ -7781,20 +8030,20 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "beefy-merkle-tree", "beefy-primitives", "frame-support", "frame-system", "hex", - "libsecp256k1 0.7.0", + "k256 0.10.4", "log", "pallet-beefy", "pallet-mmr", "pallet-mmr-primitives", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7806,14 +8055,14 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "pallet-treasury", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -7824,14 +8073,14 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bp-message-dispatch", "bp-runtime", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-runtime", @@ -7841,7 +8090,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bp-header-chain", "bp-runtime", @@ -7851,7 +8100,7 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-finality-grandpa", @@ -7863,9 +8112,9 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "bp-message-dispatch", "bp-messages", "bp-runtime", @@ -7873,7 +8122,7 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -7884,7 +8133,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-benchmarking", "frame-support", @@ -7892,7 +8141,7 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.8.5", "scale-info", "serde", @@ -7904,13 +8153,13 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -7921,12 +8170,12 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-io", @@ -7937,14 +8186,14 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.7.3", "scale-info", "sp-arithmetic", @@ -7954,19 +8203,19 @@ dependencies = [ "sp-runtime", "sp-std", "static_assertions", - "strum", + "strum 0.23.0", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -7978,12 +8227,12 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-arithmetic", "sp-runtime", @@ -7993,7 +8242,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", @@ -8001,7 +8250,7 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-application-crypto", "sp-core", @@ -8016,13 +8265,13 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "enumflags2", "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-io", "sp-runtime", @@ -8032,14 +8281,14 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "pallet-authorship", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-application-crypto", "sp-core", @@ -8052,12 +8301,12 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -8069,13 +8318,13 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -8086,14 +8335,14 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", "frame-support", "frame-system", "pallet-mmr-primitives", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -8104,12 +8353,12 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "sp-api", "sp-core", @@ -8120,13 +8369,13 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "pallet-mmr-primitives", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "sp-api", "sp-blockchain", @@ -8137,12 +8386,12 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-io", "sp-runtime", @@ -8152,11 +8401,11 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-io", "sp-runtime", @@ -8166,13 +8415,13 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "log", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-runtime", @@ -8183,7 +8432,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8196,7 +8445,7 @@ dependencies = [ "pallet-offences", "pallet-session", "pallet-staking", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-runtime", "sp-staking", @@ -8206,12 +8455,12 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -8222,12 +8471,12 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-io", "sp-runtime", @@ -8237,11 +8486,11 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-io", "sp-runtime", @@ -8251,13 +8500,13 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-io", "sp-runtime", @@ -8267,14 +8516,14 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "log", "pallet-timestamp", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -8288,7 +8537,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", @@ -8304,11 +8553,11 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.2.2", "scale-info", "sp-runtime", @@ -8318,7 +8567,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8327,7 +8576,7 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand_chacha 0.2.2", "scale-info", "serde", @@ -8341,7 +8590,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -8352,7 +8601,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", "sp-arithmetic", @@ -8361,11 +8610,11 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-io", "sp-runtime", @@ -8375,13 +8624,13 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-inherents", "sp-io", @@ -8393,14 +8642,14 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "pallet-treasury", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -8412,11 +8661,11 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "smallvec", @@ -8429,13 +8678,13 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-blockchain", "sp-core", @@ -8446,10 +8695,10 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-runtime", ] @@ -8457,14 +8706,14 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "impl-trait-for-tuples", "pallet-balances", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-runtime", @@ -8474,13 +8723,13 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.17#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-runtime", "sp-std", @@ -8489,12 +8738,12 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-io", @@ -8505,13 +8754,13 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-runtime", "sp-std", @@ -8519,13 +8768,13 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -8537,14 +8786,14 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-runtime", "sp-std", @@ -8555,12 +8804,12 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", ] @@ -8568,7 +8817,7 @@ dependencies = [ [[package]] name = "parachains-common" version = "1.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-executive", "frame-support", @@ -8578,7 +8827,7 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-common", "scale-info", @@ -8594,9 +8843,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09aa6c5bb8070cf0456d9fc228b3022e900aae9092c48c9c45facf97422efc1d" +checksum = "3d121a9af17a43efd0a38c6afa508b927ba07785bd4709efb2ac03bf77efef8d" dependencies = [ "blake2-rfc", "crc32fast", @@ -8621,7 +8870,21 @@ dependencies = [ "bitvec 0.20.4", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive", + "parity-scale-codec-derive 2.3.1", + "serde", +] + +[[package]] +name = "parity-scale-codec" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" +dependencies = [ + "arrayvec 0.7.2", + "bitvec 1.0.0", + "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive 3.1.2", "serde", ] @@ -8637,6 +8900,18 @@ dependencies = [ "syn", ] +[[package]] +name = "parity-scale-codec-derive" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "parity-send-wrapper" version = "0.1.0" @@ -8659,16 +8934,16 @@ dependencies = [ [[package]] name = "parity-util-mem" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770" +checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.11.2", + "hashbrown 0.12.0", "impl-trait-for-tuples", "parity-util-mem-derive", - "parking_lot 0.11.2", - "primitive-types", + "parking_lot 0.12.0", + "primitive-types 0.11.1", "smallvec", "tikv-jemalloc-ctl", "tikv-jemallocator", @@ -8725,16 +9000,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" -[[package]] -name = "parking_lot" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.2", -] - [[package]] name = "parking_lot" version = "0.11.2" @@ -8742,7 +9007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.6", + "lock_api", "parking_lot_core 0.8.5", ] @@ -8752,24 +9017,10 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ - "lock_api 0.4.6", + "lock_api", "parking_lot_core 0.9.1", ] -[[package]] -name = "parking_lot_core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec", - "winapi 0.3.9", -] - [[package]] name = "parking_lot_core" version = "0.8.5" @@ -8779,7 +9030,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.11", + "redox_syscall", "smallvec", "winapi 0.3.9", ] @@ -8792,7 +9043,7 @@ checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.11", + "redox_syscall", "smallvec", "windows-sys", ] @@ -8979,10 +9230,21 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" name = "pkcs8" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" +checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" +dependencies = [ + "der 0.4.5", + "spki 0.4.1", +] + +[[package]] +name = "pkcs8" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" dependencies = [ - "der 0.4.5", - "spki", + "der 0.5.1", + "spki 0.5.4", + "zeroize", ] [[package]] @@ -9033,8 +9295,8 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -9047,8 +9309,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -9060,13 +9322,14 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "derive_more", + "fatality", "futures 0.3.21", "lru 0.7.3", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -9082,12 +9345,13 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ + "fatality", "futures 0.3.21", "lru 0.7.3", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -9102,8 +9366,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "clap 3.1.6", "frame-benchmarking-cli", @@ -9125,8 +9389,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -9156,11 +9420,11 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "always-assert", - "derive_more", + "fatality", "futures 0.3.21", "futures-timer", "polkadot-node-network-protocol", @@ -9177,10 +9441,10 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "scale-info", "sp-core", @@ -9190,13 +9454,14 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "derive_more", + "fatality", "futures 0.3.21", "lru 0.7.3", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -9212,10 +9477,10 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", @@ -9226,8 +9491,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9246,13 +9511,13 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -9265,11 +9530,11 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -9283,17 +9548,17 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "derive_more", "futures 0.3.21", "futures-timer", "kvdb", "lru 0.7.3", "merlin", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -9311,14 +9576,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -9331,10 +9596,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -9349,8 +9614,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -9364,12 +9629,12 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -9382,8 +9647,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -9397,13 +9662,13 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -9414,13 +9679,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ + "fatality", "futures 0.3.21", "kvdb", "lru 0.7.3", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -9432,8 +9698,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "async-trait", "futures 0.3.21", @@ -9449,10 +9715,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -9466,8 +9732,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "always-assert", "assert_matches", @@ -9475,7 +9741,7 @@ dependencies = [ "async-std", "futures 0.3.21", "futures-timer", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "pin-project 1.0.10", "polkadot-core-primitives", "polkadot-node-subsystem-util", @@ -9496,8 +9762,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -9512,8 +9778,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "futures 0.3.21", "memory-lru", @@ -9530,15 +9796,15 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "async-std", "lazy_static", "log", "mick-jaeger", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-primitives", "sc-network", @@ -9548,15 +9814,15 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bs58", "futures 0.3.21", "futures-timer", "log", "metered-channel", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sc-cli", "sc-service", @@ -9567,30 +9833,30 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "async-trait", - "derive_more", + "fatality", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", "sc-authority-discovery", "sc-network", - "strum", + "strum 0.24.0", "thiserror", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bounded-vec", "futures 0.3.21", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "schnorrkel", @@ -9607,8 +9873,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -9617,8 +9883,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "derive_more", "futures 0.3.21", @@ -9636,16 +9902,21 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "async-trait", "derive_more", + "fatality", "futures 0.3.21", "itertools", + "kvdb", "lru 0.7.3", "metered-channel", - "parity-scale-codec", + "parity-db", + "parity-scale-codec 3.1.2", + "parity-util-mem", + "parking_lot 0.11.2", "pin-project 1.0.10", "polkadot-node-jaeger", "polkadot-node-metrics", @@ -9664,14 +9935,14 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "futures 0.3.21", "futures-timer", "lru 0.7.3", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -9685,8 +9956,8 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "async-trait", "futures 0.3.21", @@ -9702,9 +9973,10 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ + "expander 0.0.5", "proc-macro-crate 1.1.3", "proc-macro2", "quote", @@ -9713,12 +9985,12 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "derive_more", "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "polkadot-core-primitives", "scale-info", @@ -9730,8 +10002,8 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "env_logger", "kusama-runtime", @@ -9745,13 +10017,13 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-system", "hex-literal", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", @@ -9775,8 +10047,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -9806,11 +10078,11 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -9856,7 +10128,7 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", @@ -9890,11 +10162,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -9914,7 +10186,7 @@ dependencies = [ "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-parachains", "rustc-hex", @@ -9937,8 +10209,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-support", "polkadot-primitives", @@ -9949,11 +10221,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bs58", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sp-std", "sp-tracing", @@ -9961,11 +10233,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bitflags", - "bitvec 0.20.4", + "bitvec 1.0.0", "derive_more", "frame-benchmarking", "frame-support", @@ -9979,7 +10251,7 @@ dependencies = [ "pallet-staking", "pallet-timestamp", "pallet-vesting", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", @@ -10003,8 +10275,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "async-trait", "beefy-gadget", @@ -10021,6 +10293,7 @@ dependencies = [ "pallet-mmr-primitives", "pallet-staking", "pallet-transaction-payment-rpc-runtime-api", + "parity-db", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", @@ -10104,14 +10377,14 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "arrayvec 0.5.2", - "derive_more", + "fatality", "futures 0.3.21", "indexmap", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -10125,21 +10398,21 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-primitives", "sp-core", ] [[package]] name = "polkadot-test-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-election-provider-support", "frame-executive", "frame-support", @@ -10164,7 +10437,7 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-vesting", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", @@ -10197,8 +10470,8 @@ dependencies = [ [[package]] name = "polkadot-test-service" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-benchmarking", "frame-system", @@ -10268,7 +10541,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ - "cpufeatures 0.2.1", + "cpufeatures 0.2.2", "opaque-debug 0.3.0", "universal-hash", ] @@ -10280,7 +10553,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures 0.2.2", "opaque-debug 0.3.0", "universal-hash", ] @@ -10298,7 +10571,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ "fixed-hash", - "impl-codec", + "impl-codec 0.5.1", + "impl-rlp", + "impl-serde", + "uint", +] + +[[package]] +name = "primitive-types" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" +dependencies = [ + "fixed-hash", + "impl-codec 0.6.0", "impl-rlp", "impl-serde", "scale-info", @@ -10458,9 +10744,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "b4af2ec4714533fcdf07e886f17025ace8b997b9ce51204ee69b6da831c3da57" dependencies = [ "proc-macro2", ] @@ -10477,6 +10763,12 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.7.3" @@ -10599,12 +10891,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.11" @@ -10616,12 +10902,13 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "7776223e2696f1aa4c6b0170e83212f47296a00424305117d013dfe86fb0fe55" dependencies = [ "getrandom 0.2.5", - "redox_syscall 0.2.11", + "redox_syscall", + "thiserror", ] [[package]] @@ -10670,9 +10957,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", @@ -10709,12 +10996,12 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "env_logger", "jsonrpsee 0.8.0", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "serde", "serde_json", "sp-core", @@ -10734,9 +11021,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.9" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525" +checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" dependencies = [ "base64 0.13.0", "bytes 1.1.0", @@ -10758,19 +11045,19 @@ dependencies = [ "percent-encoding 2.1.0", "pin-project-lite 0.2.8", "rustls 0.20.4", - "rustls-pemfile", + "rustls-pemfile 0.3.0", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-rustls 0.23.2", + "tokio-rustls 0.23.3", "url 2.2.2", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", "webpki-roots 0.22.2", - "winreg 0.7.0", + "winreg 0.10.1", ] [[package]] @@ -10838,9 +11125,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7" +checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" dependencies = [ "libc", "librocksdb-sys", @@ -10848,8 +11135,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "beefy-primitives", "bp-messages", @@ -10891,7 +11178,7 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", @@ -10923,8 +11210,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-support", "polkadot-primitives", @@ -10950,7 +11237,7 @@ dependencies = [ "acala-primitives", "acala-service", "cumulus-pallet-parachain-system", - "ethabi", + "ethabi 17.0.0", "frame-support", "frame-system", "hex-literal", @@ -10979,7 +11266,7 @@ dependencies = [ "pallet-scheduler", "pallet-timestamp", "pallet-utility", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "serde_json", @@ -11087,7 +11374,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-parachains", @@ -11212,7 +11499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 0.2.1", "schannel", "security-framework", ] @@ -11226,6 +11513,15 @@ dependencies = [ "base64 0.13.0", ] +[[package]] +name = "rustls-pemfile" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" +dependencies = [ + "base64 0.13.0", +] + [[package]] name = "rustversion" version = "1.0.6" @@ -11279,7 +11575,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", "sp-core", @@ -11290,7 +11586,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", @@ -11298,7 +11594,7 @@ dependencies = [ "ip_network", "libp2p", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "prost", "prost-build", "rand 0.7.3", @@ -11317,12 +11613,12 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", @@ -11340,9 +11636,9 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sp-api", "sp-block-builder", @@ -11356,11 +11652,11 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.3", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-chain-spec-derive", "sc-network", "sc-telemetry", @@ -11373,7 +11669,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -11384,7 +11680,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "chrono", "clap 3.1.6", @@ -11394,7 +11690,7 @@ dependencies = [ "libp2p", "log", "names", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "rand 0.7.3", "regex", "rpassword", @@ -11422,14 +11718,14 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "fnv", "futures 0.3.21", "hash-db", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -11450,7 +11746,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "hash-db", "kvdb", @@ -11459,8 +11755,8 @@ dependencies = [ "linked-hash-map", "log", "parity-db", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-client-api", "sc-state-db", "sp-arithmetic", @@ -11475,14 +11771,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "libp2p", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sc-utils", "serde", @@ -11499,12 +11795,12 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -11528,7 +11824,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "fork-tree", @@ -11538,8 +11834,8 @@ dependencies = [ "num-bigint 0.2.6", "num-rational 0.2.4", "num-traits", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "rand 0.7.3", "retain_mut", "sc-client-api", @@ -11571,7 +11867,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -11595,10 +11891,10 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "fork-tree", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sp-blockchain", @@ -11608,7 +11904,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "assert_matches", "async-trait", @@ -11617,7 +11913,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -11644,13 +11940,13 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-consensus", "sc-telemetry", @@ -11669,7 +11965,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "sc-client-api", "sp-authorship", @@ -11680,14 +11976,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "lazy_static", - "libsecp256k1 0.7.0", - "log", "lru 0.6.6", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -11702,16 +11996,17 @@ dependencies = [ "sp-trie", "sp-version", "sp-wasm-interface", + "tracing", "wasmi", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-allocator", "sp-core", "sp-maybe-compressed-blob", @@ -11725,10 +12020,10 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-allocator", "sc-executor-common", "scoped-tls", @@ -11741,12 +12036,12 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "cfg-if 1.0.0", "libc", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", @@ -11759,17 +12054,19 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ + "ahash", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", "futures 0.3.21", "futures-timer", + "hex", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "rand 0.8.5", "sc-block-builder", "sc-chain-spec", @@ -11797,7 +12094,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "finality-grandpa", "futures 0.3.21", @@ -11806,7 +12103,7 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-finality-grandpa", "sc-rpc", @@ -11821,7 +12118,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "ansi_term", "futures 0.3.21", @@ -11838,11 +12135,11 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "hex", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde_json", "sp-application-crypto", "sp-core", @@ -11853,9 +12150,8 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "async-std", "async-trait", "asynchronous-codec 0.5.0", "bitflags", @@ -11873,8 +12169,8 @@ dependencies = [ "linked_hash_set", "log", "lru 0.7.3", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "prost", "prost-build", @@ -11903,8 +12199,9 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ + "ahash", "futures 0.3.21", "futures-timer", "libp2p", @@ -11919,7 +12216,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "bytes 1.1.0", "fnv", @@ -11930,8 +12227,8 @@ dependencies = [ "hyper-rustls 0.22.1", "num_cpus", "once_cell", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", "sc-network", @@ -11947,7 +12244,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "libp2p", @@ -11960,7 +12257,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -11969,15 +12266,15 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -12000,7 +12297,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -12008,8 +12305,8 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sc-chain-spec", "sc-transaction-pool-api", "serde", @@ -12025,7 +12322,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -12042,7 +12339,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "directories", @@ -12053,9 +12350,9 @@ dependencies = [ "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "sc-block-builder", @@ -12106,13 +12403,13 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sp-core", ] @@ -12120,18 +12417,17 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", "sc-consensus-epochs", "sc-finality-grandpa", - "sc-rpc-api", "serde", "serde_json", "sp-blockchain", @@ -12142,13 +12438,13 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "chrono", "futures 0.3.21", "libp2p", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "serde", @@ -12160,7 +12456,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "ansi_term", "atty", @@ -12169,7 +12465,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rustc-hash", "sc-client-api", @@ -12191,7 +12487,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -12202,15 +12498,15 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "futures-timer", "linked-hash-map", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "retain_mut", "sc-client-api", "sc-transaction-pool-api", @@ -12229,7 +12525,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "log", @@ -12242,34 +12538,35 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "futures-timer", "lazy_static", - "parking_lot 0.11.2", + "log", + "parking_lot 0.12.0", "prometheus", ] [[package]] name = "scale-info" -version = "1.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" +checksum = "0563970d79bcbf3c537ce3ad36d859b30d36fc5b190efd227f1f7a84d7cf0d42" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.0", "cfg-if 1.0.0", "derive_more", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info-derive", "serde", ] [[package]] name = "scale-info-derive" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" +checksum = "b7805950c36512db9e3251c970bb7ac425f326716941862205d612ab3b5e46e2" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -12351,6 +12648,37 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sec1" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +dependencies = [ + "der 0.5.1", + "generic-array 0.14.5", + "pkcs8 0.8.0", + "subtle", + "zeroize", +] + +[[package]] +name = "secp256k1" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" +dependencies = [ + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" +dependencies = [ + "cc", +] + [[package]] name = "secrecy" version = "0.8.0" @@ -12482,6 +12810,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_nanos" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -12514,7 +12851,7 @@ checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures 0.2.2", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -12539,7 +12876,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures 0.2.2", "digest 0.9.0", "opaque-debug 0.3.0", "sha2-asm", @@ -12552,7 +12889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures 0.2.2", "digest 0.10.3", ] @@ -12590,6 +12927,16 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha3" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" +dependencies = [ + "digest 0.10.3", + "keccak", +] + [[package]] name = "sharded-slab" version = "0.1.4" @@ -12654,11 +13001,11 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "slot-range-helper" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "enumn", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", "sp-runtime", "sp-std", @@ -12692,7 +13039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7" dependencies = [ "aes-gcm", - "blake2", + "blake2 0.9.2", "chacha20poly1305", "rand 0.8.5", "rand_core 0.6.3", @@ -12743,11 +13090,11 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "hash-db", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api-proc-macro", "sp-core", "sp-runtime", @@ -12760,9 +13107,9 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "blake2-rfc", + "blake2 0.10.4", "proc-macro-crate 1.1.3", "proc-macro2", "quote", @@ -12771,10 +13118,10 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-core", @@ -12784,12 +13131,12 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-debug-derive", @@ -12800,9 +13147,9 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-api", "sp-application-crypto", @@ -12813,10 +13160,10 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-inherents", "sp-runtime", "sp-std", @@ -12825,9 +13172,9 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-inherents", "sp-runtime", @@ -12837,13 +13184,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "log", "lru 0.7.3", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "sp-api", "sp-consensus", "sp-database", @@ -12855,13 +13202,13 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-core", "sp-inherents", "sp-runtime", @@ -12874,10 +13221,10 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-api", "sp-application-crypto", @@ -12892,11 +13239,11 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "merlin", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-api", @@ -12915,21 +13262,23 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-arithmetic", "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "schnorrkel", "sp-core", "sp-runtime", @@ -12938,8 +13287,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "base58 0.2.0", "bitflags", @@ -12957,17 +13306,17 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", - "parking_lot 0.11.2", - "primitive-types", + "parking_lot 0.12.0", + "primitive-types 0.11.1", "rand 0.7.3", "regex", "scale-info", "schnorrkel", + "secp256k1", "secrecy", "serde", - "sha2 0.10.2", "sp-core-hashing", "sp-debug-derive", "sp-externalities", @@ -12978,8 +13327,6 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", - "tiny-keccak", - "twox-hash", "wasmi", "zeroize", ] @@ -12987,20 +13334,21 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "blake2-rfc", + "blake2 0.10.4", "byteorder", + "digest 0.10.3", "sha2 0.10.2", + "sha3 0.10.1", "sp-std", - "tiny-keccak", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro2", "quote", @@ -13011,16 +13359,16 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "kvdb", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro2", "quote", @@ -13029,11 +13377,11 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.11.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "0.12.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-std", "sp-storage", ] @@ -13041,11 +13389,11 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "finality-grandpa", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-api", @@ -13059,11 +13407,11 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "impl-trait-for-tuples", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-core", "sp-runtime", "sp-std", @@ -13072,15 +13420,16 @@ dependencies = [ [[package]] name = "sp-io" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "hash-db", "libsecp256k1 0.7.0", "log", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", + "secp256k1", "sp-core", "sp-externalities", "sp-keystore", @@ -13096,25 +13445,25 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "lazy_static", "sp-core", "sp-runtime", - "strum", + "strum 0.23.0", ] [[package]] name = "sp-keystore" -version = "0.11.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "0.12.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "merlin", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "schnorrkel", "serde", "sp-core", @@ -13125,7 +13474,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "thiserror", "zstd", @@ -13134,9 +13483,9 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "serde", "sp-arithmetic", @@ -13149,7 +13498,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -13160,7 +13509,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "sp-api", "sp-core", @@ -13170,7 +13519,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "backtrace", "lazy_static", @@ -13179,8 +13528,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "rustc-hash", "serde", @@ -13189,14 +13538,14 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-util-mem", "paste", "rand 0.7.3", @@ -13211,12 +13560,12 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", + "parity-scale-codec 3.1.2", + "primitive-types 0.11.1", "sp-externalities", "sp-runtime-interface-proc-macro", "sp-std", @@ -13228,8 +13577,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "Inflector", "proc-macro-crate 1.1.3", @@ -13241,7 +13590,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "serde", "serde_json", @@ -13250,9 +13599,9 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-api", "sp-core", @@ -13264,9 +13613,9 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-runtime", "sp-std", @@ -13274,14 +13623,14 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.11.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "0.12.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "hash-db", "log", "num-traits", - "parity-scale-codec", - "parking_lot 0.11.2", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", "rand 0.7.3", "smallvec", "sp-core", @@ -13298,15 +13647,15 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" [[package]] name = "sp-storage" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "ref-cast", "serde", "sp-debug-derive", @@ -13316,7 +13665,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", "sp-core", @@ -13329,12 +13678,12 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures-timer", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-api", "sp-inherents", "sp-runtime", @@ -13344,10 +13693,10 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-std", "tracing", "tracing-core", @@ -13357,7 +13706,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "sp-api", "sp-runtime", @@ -13366,11 +13715,11 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-inherents", @@ -13381,26 +13730,27 @@ dependencies = [ [[package]] name = "sp-trie" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "hash-db", "memory-db", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "sp-core", "sp-std", + "thiserror", "trie-db", "trie-root", ] [[package]] name = "sp-version" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parity-wasm 0.42.2", "scale-info", "serde", @@ -13414,9 +13764,9 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec", + "parity-scale-codec 3.1.2", "proc-macro2", "quote", "syn", @@ -13424,12 +13774,12 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-std", "wasmi", "wasmtime", @@ -13450,13 +13800,24 @@ dependencies = [ "der 0.4.5", ] +[[package]] +name = "spki" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +dependencies = [ + "base64ct", + "der 0.5.1", +] + [[package]] name = "ss58-registry" -version = "1.15.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f9799e6d412271cb2414597581128b03f3285f260ea49f5363d07df6a332b3e" +checksum = "7b84a70894df7a73666e0694f44b41a9571625e9546fb58a0818a565d2c7e084" dependencies = [ "Inflector", + "num-format", "proc-macro2", "quote", "serde", @@ -13473,7 +13834,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "statemine-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=db11baacc325537be74ad34517fcb28ed9ded6c6#db11baacc325537be74ad34517fcb28ed9ded6c6" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -13489,7 +13850,7 @@ dependencies = [ "frame-support", "frame-system", "frame-system-rpc-runtime-api", - "kusama-runtime-constants 0.9.17 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.17)", + "kusama-runtime-constants 0.9.18 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "log", "pallet-asset-tx-payment", "pallet-assets", @@ -13509,7 +13870,7 @@ dependencies = [ "pallet-xcm", "parachain-info", "parachains-common", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-core-primitives", "polkadot-parachain", "polkadot-runtime-common", @@ -13596,7 +13957,16 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" dependencies = [ - "strum_macros", + "strum_macros 0.23.1", +] + +[[package]] +name = "strum" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8" +dependencies = [ + "strum_macros 0.24.0", ] [[package]] @@ -13612,6 +13982,19 @@ dependencies = [ "syn", ] +[[package]] +name = "strum_macros" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" +dependencies = [ + "heck 0.4.0", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + [[package]] name = "substrate-bip39" version = "0.4.4" @@ -13641,7 +14024,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "platforms 2.0.0", ] @@ -13649,7 +14032,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -13657,7 +14040,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", @@ -13671,9 +14054,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "async-std", "futures-util", "hyper", "log", @@ -13685,12 +14067,12 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", "futures 0.3.21", "hex", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sc-client-api", "sc-client-db", "sc-consensus", @@ -13711,7 +14093,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "futures 0.3.21", "substrate-test-utils-derive", @@ -13721,7 +14103,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -13732,13 +14114,13 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", "sp-maybe-compressed-blob", - "strum", + "strum 0.23.0", "tempfile", "toml", "walkdir", @@ -13753,9 +14135,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" dependencies = [ "proc-macro2", "quote", @@ -13795,24 +14177,24 @@ dependencies = [ "cfg-if 1.0.0", "fastrand", "libc", - "redox_syscall 0.2.11", + "redox_syscall", "remove_dir_all", "winapi 0.3.9", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] [[package]] name = "test-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-support", "polkadot-primitives", @@ -13837,8 +14219,8 @@ dependencies = [ "cumulus-client-service", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", - "cumulus-relay-chain-local", "cumulus-test-relay-validation-worker-provider", "ecosystem-renvm-bridge", "frame-system", @@ -13854,7 +14236,7 @@ dependencies = [ "pallet-balances", "pallet-sudo", "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "parking_lot 0.12.0", "polkadot-primitives", "polkadot-service", @@ -14067,9 +14449,10 @@ dependencies = [ "bytes 1.1.0", "libc", "memchr", - "mio 0.8.0", + "mio 0.8.2", "num_cpus", "once_cell", + "parking_lot 0.12.0", "pin-project-lite 0.2.8", "signal-hook-registry", "socket2 0.4.4", @@ -14111,9 +14494,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" +checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e" dependencies = [ "rustls 0.20.4", "tokio", @@ -14163,9 +14546,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f" +checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" dependencies = [ "cfg-if 1.0.0", "pin-project-lite 0.2.8", @@ -14175,9 +14558,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" +checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" dependencies = [ "proc-macro2", "quote", @@ -14186,9 +14569,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" +checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" dependencies = [ "lazy_static", "valuable", @@ -14332,12 +14715,12 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=22d40c761a985482f93bbbea5ba4199bdba74f8e#22d40c761a985482f93bbbea5ba4199bdba74f8e" +source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "clap 3.1.6", "jsonrpsee 0.4.1", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "remote-externalities", "sc-chain-spec", "sc-cli", @@ -14367,6 +14750,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" dependencies = [ "cfg-if 1.0.0", + "digest 0.10.3", "rand 0.8.5", "static_assertions", ] @@ -14595,6 +14979,12 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.79" @@ -14957,11 +15347,11 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "beefy-primitives", - "bitvec 0.20.4", + "bitvec 1.0.0", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -15009,7 +15399,7 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "pallet-xcm-benchmarks", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", @@ -15043,8 +15433,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-support", "polkadot-primitives", @@ -15055,9 +15445,9 @@ dependencies = [ [[package]] name = "which" -version = "4.2.4" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" dependencies = [ "either", "lazy_static", @@ -15167,9 +15557,9 @@ dependencies = [ [[package]] name = "winreg" -version = "0.7.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ "winapi 0.3.9", ] @@ -15208,6 +15598,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +[[package]] +name = "wyz" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +dependencies = [ + "tap", +] + [[package]] name = "x25519-dalek" version = "1.1.1" @@ -15221,27 +15620,27 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "derivative", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "scale-info", "xcm-procedural", ] [[package]] name = "xcm-builder" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-support", "frame-system", "log", "pallet-transaction-payment", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "polkadot-parachain", "scale-info", "sp-arithmetic", @@ -15255,7 +15654,7 @@ dependencies = [ [[package]] name = "xcm-emulator" version = "0.1.0" -source = "git+https://github.com/shaunxw/xcm-simulator?rev=24ccbce563d1f99019b4cdfa2f3af4e99bac0dfc#24ccbce563d1f99019b4cdfa2f3af4e99bac0dfc" +source = "git+https://github.com/zqhxuyuan/xcm-simulator?rev=0e4574b0de910521962337b7539ace359fa1afed#0e4574b0de910521962337b7539ace359fa1afed" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -15266,7 +15665,7 @@ dependencies = [ "frame-support", "frame-system", "parachain-info", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", "polkadot-primitives", "polkadot-runtime-parachains", @@ -15278,14 +15677,14 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-benchmarking", "frame-support", "impl-trait-for-tuples", "log", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "sp-arithmetic", "sp-core", "sp-io", @@ -15297,7 +15696,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "Inflector", "proc-macro2", @@ -15307,11 +15706,11 @@ dependencies = [ [[package]] name = "xcm-simulator" -version = "0.9.17" -source = "git+https://github.com/paritytech//polkadot?rev=de0ecd4760b146ecf33f5e867d707d789e21e060#de0ecd4760b146ecf33f5e867d707d789e21e060" +version = "0.9.18" +source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-support", - "parity-scale-codec", + "parity-scale-codec 3.1.2", "paste", "polkadot-core-primitives", "polkadot-parachain", @@ -15338,9 +15737,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.3" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50344758e2f40e3a1fcfc8f6f91aa57b5f8ebd8d27919fe6451f15aaaf9ee608" +checksum = "7eb5728b8afd3f280a869ce1d4c554ffaed35f45c231fc41bfbd0381bef50317" dependencies = [ "zeroize_derive", ] diff --git a/Cargo.toml b/Cargo.toml index 13b16ce6e4..d7a47b6a18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -128,199 +128,202 @@ yamux = { opt-level = 3 } zeroize = { opt-level = 3 } [patch."https://github.com/paritytech/substrate"] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -frame-executive = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-gilt = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-nicks = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-society = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-beefy = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-bags-list = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -pallet-preimage = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -beefy-primitives = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -beefy-gadget = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -beefy-gadget-rpc = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-cli = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-consensus-uncles = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-informant = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-network = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-service = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-serializer = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -substrate-test-client = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -substrate-test-utils = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } -substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +frame-executive = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-gilt = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-nicks = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-society = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-beefy = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-bags-list = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +pallet-preimage = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +beefy-primitives = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +beefy-gadget = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +beefy-gadget-rpc = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-cli = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-consensus-uncles = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-informant = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-network = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-service = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-serializer = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +substrate-test-client = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +substrate-test-utils = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } +substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", rev = "fc3fd073d3a0acf9933c3994b660ebd7b5833f65" } [patch."https://github.com/paritytech/polkadot"] -kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-rpc = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -test-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -xcm = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } +kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-rpc = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +test-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "ef71ed8baef3007b039cdf040d24f5958edb390b" } [patch."https://github.com/paritytech/cumulus"] -cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-relay-chain-local = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -statemine-runtime = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } -parachains-common = { git = "https://github.com/paritytech//cumulus", rev = "db11baacc325537be74ad34517fcb28ed9ded6c6" } +cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +statemine-runtime = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +parachains-common = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } + +#[patch."https://github.com/paritytech/scale-info"] +#scale-info = { git = "https://github.com/paritytech/scale-info", rev = "41c80aa5a8a52f4580cfbcb4670e9ed3919d46da" } \ No newline at end of file diff --git a/ecosystem-modules/compound-cash/Cargo.toml b/ecosystem-modules/compound-cash/Cargo.toml index a19a07c0da..2e2f4151a0 100644 --- a/ecosystem-modules/compound-cash/Cargo.toml +++ b/ecosystem-modules/compound-cash/Cargo.toml @@ -6,18 +6,18 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } module-support = { path = "../../modules/support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/ecosystem-modules/ren/renvm-bridge/Cargo.toml b/ecosystem-modules/ren/renvm-bridge/Cargo.toml index a18f367bb5..0c43eb6909 100644 --- a/ecosystem-modules/ren/renvm-bridge/Cargo.toml +++ b/ecosystem-modules/ren/renvm-bridge/Cargo.toml @@ -6,14 +6,14 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } support = { package = "module-support", path = "../../../modules/support", default-features = false } orml-traits = { path = "../../../orml/traits", default-features = false } primitives = { package = "acala-primitives", path = "../../../primitives", default-features = false } @@ -22,7 +22,7 @@ primitives = { package = "acala-primitives", path = "../../../primitives", defau hex-literal = "0.3.1" orml-currencies = { path = "../../../orml/currencies" } orml-tokens = { path = "../../../orml/tokens" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/ecosystem-modules/starport/Cargo.toml b/ecosystem-modules/starport/Cargo.toml index 35fbafa37e..234c791b5a 100644 --- a/ecosystem-modules/starport/Cargo.toml +++ b/ecosystem-modules/starport/Cargo.toml @@ -5,20 +5,20 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens"} diff --git a/inspect/Cargo.toml b/inspect/Cargo.toml index b123bb5b7d..277f2fd0c8 100644 --- a/inspect/Cargo.toml +++ b/inspect/Cargo.toml @@ -5,13 +5,13 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1" } +codec = { package = "parity-scale-codec", version = "3.0.0" } clap = { version = "3.1.6", features = ["derive"] } derive_more = "0.99" log = "0.4.8" -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/modules/asset-registry/Cargo.toml b/modules/asset-registry/Cargo.toml index 842c2800f8..c2b487b616 100644 --- a/modules/asset-registry/Cargo.toml +++ b/modules/asset-registry/Cargo.toml @@ -7,27 +7,27 @@ edition = "2021" [dependencies] log = { version = "0.4.14", default-features = false } serde = { version = "1.0.136", optional = true } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] serde_json = "1.0.68" hex = { version = "0.4" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } module-evm = { path = "../evm" } module-evm-bridge = { path = "../evm-bridge" } diff --git a/modules/auction-manager/Cargo.toml b/modules/auction-manager/Cargo.toml index b25b7f7cb6..cc72bdb999 100644 --- a/modules/auction-manager/Cargo.toml +++ b/modules/auction-manager/Cargo.toml @@ -6,21 +6,21 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-auction = { path = "../../orml/auction" } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } module-dex = { path = "../dex" } diff --git a/modules/cdp-engine/Cargo.toml b/modules/cdp-engine/Cargo.toml index cd595b476a..003d3eba78 100644 --- a/modules/cdp-engine/Cargo.toml +++ b/modules/cdp-engine/Cargo.toml @@ -6,25 +6,25 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } support = { package = "module-support", path = "../support", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } rand_chacha = { version = "0.2", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-currencies = { path = "../../orml/currencies" } dex = { package = "module-dex", path = "../dex"} cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } diff --git a/modules/cdp-treasury/Cargo.toml b/modules/cdp-treasury/Cargo.toml index e4cebe0f36..0cbfa487f0 100644 --- a/modules/cdp-treasury/Cargo.toml +++ b/modules/cdp-treasury/Cargo.toml @@ -6,20 +6,20 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-currencies = { path = "../../orml/currencies" } orml-auction = { path = "../../orml/auction" } module-dex = { path = "../dex" } diff --git a/modules/collator-selection/Cargo.toml b/modules/collator-selection/Cargo.toml index 87eccf4851..9733674d8f 100644 --- a/modules/collator-selection/Cargo.toml +++ b/modules/collator-selection/Cargo.toml @@ -9,30 +9,30 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] log = { version = "0.4.0", default-features = false } -codec = { package = 'parity-scale-codec', version = '2.0.0', default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ['std'] diff --git a/modules/currencies/Cargo.toml b/modules/currencies/Cargo.toml index 6eaf9e9a5e..58a16e80a5 100644 --- a/modules/currencies/Cargo.toml +++ b/modules/currencies/Cargo.toml @@ -6,15 +6,15 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } @@ -25,9 +25,9 @@ support = { package = "module-support", path = "../support", default-features = [dev-dependencies] serde_json = "1.0.68" hex = { version = "0.4" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } tokens = { package = "orml-tokens", path = "../../orml/tokens" } module-evm = { path = "../evm" } module-evm-bridge = { path = "../evm-bridge" } diff --git a/modules/dex-oracle/Cargo.toml b/modules/dex-oracle/Cargo.toml index 628f100583..093b028886 100644 --- a/modules/dex-oracle/Cargo.toml +++ b/modules/dex-oracle/Cargo.toml @@ -6,22 +6,22 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/modules/dex/Cargo.toml b/modules/dex/Cargo.toml index 9ee4ad6cdd..1ba5d74c58 100644 --- a/modules/dex/Cargo.toml +++ b/modules/dex/Cargo.toml @@ -6,22 +6,22 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] orml-tokens = { path = "../../orml/tokens" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/modules/emergency-shutdown/Cargo.toml b/modules/emergency-shutdown/Cargo.toml index a064cd84c8..4c46ad8db8 100644 --- a/modules/emergency-shutdown/Cargo.toml +++ b/modules/emergency-shutdown/Cargo.toml @@ -6,20 +6,20 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } support = { package = "module-support", path = "../support", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-currencies = { path = "../../orml/currencies" } orml-traits = { path = "../../orml/traits" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/evm-accounts/Cargo.toml b/modules/evm-accounts/Cargo.toml index 6a7f3ca7c9..fc3e5cba17 100644 --- a/modules/evm-accounts/Cargo.toml +++ b/modules/evm-accounts/Cargo.toml @@ -6,16 +6,16 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } libsecp256k1 = { version = "0.6", default-features = false, features = ["hmac", "static-context"], optional = true } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } @@ -24,7 +24,7 @@ module-support = { path = "../support", default-features = false } module-evm-utility-macro = { path = "../evm-utility/macro" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/evm-bridge/Cargo.toml b/modules/evm-bridge/Cargo.toml index 61ba10391a..8e72f7fd88 100644 --- a/modules/evm-bridge/Cargo.toml +++ b/modules/evm-bridge/Cargo.toml @@ -9,17 +9,17 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] serde = { version = "1.0.136", optional = true, features = ["derive"] } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -primitive-types = { version = "0.10.1", default-features = false, features = ["rlp", "byteorder"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder"] } impl-trait-for-tuples = "0.2.2" -ethereum-types = { version = "0.12.0", default-features = false } +ethereum-types = { version = "0.13.1", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } module-evm = { path = "../evm", default-features = false } @@ -29,8 +29,8 @@ num_enum = { version = "0.5.1", default-features = false } [dev-dependencies] serde_json = "1.0.68" hex = { version = "0.4" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/modules/evm-utility/Cargo.toml b/modules/evm-utility/Cargo.toml index bdbff2f41f..d442a03c5b 100644 --- a/modules/evm-utility/Cargo.toml +++ b/modules/evm-utility/Cargo.toml @@ -7,18 +7,21 @@ edition = "2021" [dependencies] sha3 = { version = "0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -evm = { git = "https://github.com/rust-blockchain/evm", rev = "52d5fe5d1fd665a495ea34cc67c5f0c6bc6dd23e", default-features = false, features = ["with-codec"] } -evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "52d5fe5d1fd665a495ea34cc67c5f0c6bc6dd23e", default-features = false } -evm-runtime = { git = "https://github.com/rust-blockchain/evm", rev = "52d5fe5d1fd665a495ea34cc67c5f0c6bc6dd23e", default-features = false } -ethereum = { git = "https://github.com/rust-blockchain/ethereum", rev = "34fd1fed1fb0261fef9c8a36acb6ecf5082036ad", default-features = false, features = ["with-codec"] } +evm = { git = "https://github.com/AcalaNetwork/evm", rev = "a56d8af9787f0550cb4c4ab3955e81f1741d9e7c", default-features = false, features = ["with-codec"] } +evm-gasometer = { git = "https://github.com/AcalaNetwork/evm", rev = "a56d8af9787f0550cb4c4ab3955e81f1741d9e7c", default-features = false } +evm-runtime = { git = "https://github.com/AcalaNetwork/evm", rev = "a56d8af9787f0550cb4c4ab3955e81f1741d9e7c", default-features = false } +ethereum = { git = "https://github.com/rust-blockchain/ethereum", rev = "755dffaa4903fbec1269f50cde9863cf86269a14", default-features = false, features = ["with-codec"] } + +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } [features] default = ["std"] std = [ "sha3/std", "sp-std/std", + "scale-info/std", "evm/std", "evm/with-serde", "evm-runtime/std", diff --git a/modules/evm/Cargo.toml b/modules/evm/Cargo.toml index 1a93bbb2a7..1ca6856699 100644 --- a/modules/evm/Cargo.toml +++ b/modules/evm/Cargo.toml @@ -10,29 +10,29 @@ harness = false required-features = ["bench"] [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } hex-literal = { version = "0.3.1" } -primitive-types = { version = "0.10.1", default-features = false, features = ["rlp", "byteorder"] } +primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder"] } ripemd160 = { version = "0.9", default-features = false } rlp = { version = "0.5", default-features = false } serde = { version = "1.0.136", optional = true, features = ["derive"] } sha3 = { version = "0.9.1", default-features = false } tiny-keccak = { version = "2.0", features = ["fips202"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } serde_json = { version = "1.0", default-features = false, features = ["alloc"], optional = true } hex = { version = "0.4", default-features = false, features = ["alloc"], optional = true } num = { version = "0.4", features = ["alloc"], default-features = false } bn = { package = "substrate-bn", version = "0.6", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-bencher = { path = "../../orml/bencher", default-features = false, optional = true } orml-currencies = { path = "../../orml/currencies", default-features = false, optional = true } diff --git a/modules/evm/rpc/Cargo.toml b/modules/evm/rpc/Cargo.toml index 1369516009..cbc5f9e021 100644 --- a/modules/evm/rpc/Cargo.toml +++ b/modules/evm/rpc/Cargo.toml @@ -10,16 +10,16 @@ jsonrpc-derive = "18.0.0" rustc-hex = "2.1.0" serde = { version = "1.0.136", features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } primitives = { package = "acala-primitives", path = "../../../primitives" } module-evm-rpc-runtime-api = { path = "runtime_api" } diff --git a/modules/evm/rpc/runtime_api/Cargo.toml b/modules/evm/rpc/runtime_api/Cargo.toml index 8d62b255d5..a28e378e1e 100644 --- a/modules/evm/rpc/runtime_api/Cargo.toml +++ b/modules/evm/rpc/runtime_api/Cargo.toml @@ -5,10 +5,10 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } primitives = { package = "acala-primitives", path = "../../../../primitives", default-features = false } [features] diff --git a/modules/example/Cargo.toml b/modules/example/Cargo.toml index b0a97bcf88..19ff36a87d 100644 --- a/modules/example/Cargo.toml +++ b/modules/example/Cargo.toml @@ -6,15 +6,15 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/modules/homa-lite/Cargo.toml b/modules/homa-lite/Cargo.toml index c3eaa7b0da..8c6c41473e 100644 --- a/modules/homa-lite/Cargo.toml +++ b/modules/homa-lite/Cargo.toml @@ -5,29 +5,29 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } module-relaychain = { path = "../relaychain", features = ["kusama"] } [features] diff --git a/modules/homa-validator-list/Cargo.toml b/modules/homa-validator-list/Cargo.toml index 8813a8ad74..f2253b5348 100644 --- a/modules/homa-validator-list/Cargo.toml +++ b/modules/homa-validator-list/Cargo.toml @@ -6,21 +6,21 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-tokens = { path = "../../orml/tokens" } orml-currencies = { path = "../../orml/currencies" } diff --git a/modules/homa/Cargo.toml b/modules/homa/Cargo.toml index b1cf260495..2000ae82dc 100644 --- a/modules/homa/Cargo.toml +++ b/modules/homa/Cargo.toml @@ -5,25 +5,25 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } [features] default = ["std"] diff --git a/modules/honzon/Cargo.toml b/modules/honzon/Cargo.toml index e01a2bc43e..ccaf850cff 100644 --- a/modules/honzon/Cargo.toml +++ b/modules/honzon/Cargo.toml @@ -6,22 +6,22 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } cdp-engine = { package = "module-cdp-engine", path = "../cdp-engine", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-currencies = { path = "../../orml/currencies" } orml-traits = { path = "../../orml/traits" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/idle-scheduler/Cargo.toml b/modules/idle-scheduler/Cargo.toml index 5d20737c01..91eac96697 100644 --- a/modules/idle-scheduler/Cargo.toml +++ b/modules/idle-scheduler/Cargo.toml @@ -6,18 +6,18 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } acala-primitives = { path = "../../primitives", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/modules/incentives/Cargo.toml b/modules/incentives/Cargo.toml index 148bf478c1..36a0541f0a 100644 --- a/modules/incentives/Cargo.toml +++ b/modules/incentives/Cargo.toml @@ -6,21 +6,21 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-rewards = { path = "../../orml/rewards", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-tokens = { path = "../../orml/tokens" } orml-rewards = { path = "../../orml/rewards" } diff --git a/modules/loans/Cargo.toml b/modules/loans/Cargo.toml index 8979d589ae..d11815680b 100644 --- a/modules/loans/Cargo.toml +++ b/modules/loans/Cargo.toml @@ -6,20 +6,20 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } diff --git a/modules/nft/Cargo.toml b/modules/nft/Cargo.toml index 834c650e1a..c0e15b3b88 100644 --- a/modules/nft/Cargo.toml +++ b/modules/nft/Cargo.toml @@ -6,25 +6,25 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-nft = { path = "../../orml/nft", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-tokens = { path = "../../orml/tokens" } module-currencies = { path = "../../modules/currencies" } diff --git a/modules/nominees-election/Cargo.toml b/modules/nominees-election/Cargo.toml index cd5e10efc7..ca6bed3911 100644 --- a/modules/nominees-election/Cargo.toml +++ b/modules/nominees-election/Cargo.toml @@ -6,20 +6,20 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/prices/Cargo.toml b/modules/prices/Cargo.toml index bf142e26d2..8a21b17ce0 100644 --- a/modules/prices/Cargo.toml +++ b/modules/prices/Cargo.toml @@ -6,19 +6,19 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-tokens = { path = "../../orml/tokens" } [features] diff --git a/modules/relaychain/Cargo.toml b/modules/relaychain/Cargo.toml index 6dbb2b892a..09b2a41d34 100644 --- a/modules/relaychain/Cargo.toml +++ b/modules/relaychain/Cargo.toml @@ -6,19 +6,19 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } module-support = { path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/modules/session-manager/Cargo.toml b/modules/session-manager/Cargo.toml index 634b8ed7fc..a3a6125f9a 100644 --- a/modules/session-manager/Cargo.toml +++ b/modules/session-manager/Cargo.toml @@ -7,17 +7,17 @@ edition = "2021" [dependencies] log = { version = "0.4.14", default-features = false } serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/modules/support/Cargo.toml b/modules/support/Cargo.toml index 695e5091af..d51ed1110f 100644 --- a/modules/support/Cargo.toml +++ b/modules/support/Cargo.toml @@ -6,15 +6,15 @@ edition = "2021" [dependencies] impl-trait-for-tuples = "0.2.2" -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } [features] default = ["std"] diff --git a/modules/transaction-pause/Cargo.toml b/modules/transaction-pause/Cargo.toml index 3b84dde876..e3e5eca1ce 100644 --- a/modules/transaction-pause/Cargo.toml +++ b/modules/transaction-pause/Cargo.toml @@ -5,17 +5,17 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-tokens = { path = "../../orml/tokens" } orml-traits = { path = "../../orml/traits" } primitives = { package = "acala-primitives", path = "../../primitives" } diff --git a/modules/transaction-payment/Cargo.toml b/modules/transaction-payment/Cargo.toml index 2c083276ba..e547b8ea11 100644 --- a/modules/transaction-payment/Cargo.toml +++ b/modules/transaction-payment/Cargo.toml @@ -6,26 +6,26 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-tokens = { path = "../../orml/tokens" } module-currencies = { path = "../../modules/currencies" } module-dex = { path = "../dex" } diff --git a/modules/xcm-interface/Cargo.toml b/modules/xcm-interface/Cargo.toml index da3012e26a..4fcffbc24b 100644 --- a/modules/xcm-interface/Cargo.toml +++ b/modules/xcm-interface/Cargo.toml @@ -5,27 +5,27 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } module-relaychain = { path = "../relaychain", features = ["kusama"] } [features] diff --git a/node/Cargo.toml b/node/Cargo.toml index 780967070f..7bb52ad6ce 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -11,7 +11,7 @@ path = "src/main.rs" [dependencies] futures = "0.3.15" -parity-util-mem = { version = "0.10.0", default-features = false, features = ["jemalloc-global"] } +parity-util-mem = { version = "0.11.0", default-features = false, features = ["jemalloc-global"] } acala-cli = { path = "cli" } acala-service = { path = "service" } diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 90a13ce802..a9da5cac58 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -7,24 +7,24 @@ edition = "2021" [dependencies] log = "0.4.8" clap = { version = "3.1.6", features = ["derive"] } -codec = { package = "parity-scale-codec", version = "2.3.1" } +codec = { package = "parity-scale-codec", version = "3.0.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", optional = true } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", optional = true } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", optional = true } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", optional = true } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", optional = true } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", optional = true } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", optional = true } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } inspect = { package = "acala-inspect", path = "../../inspect" } service = { package = "acala-service", path = "../service", default-features = false, optional = true } diff --git a/node/e2e-tests/test-service/Cargo.toml b/node/e2e-tests/test-service/Cargo.toml index 38c429c9c4..678afa064b 100644 --- a/node/e2e-tests/test-service/Cargo.toml +++ b/node/e2e-tests/test-service/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1" } +codec = { package = "parity-scale-codec", version = "3.0.0" } rand = "0.7.3" serde = { version = "1.0.136", features = ["derive"] } async-trait = "0.1.42" @@ -18,57 +18,57 @@ futures = { package = "futures", version = "0.3", features = ["compat"] } hex-literal = "0.3.1" # Substrate dependencies -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", features = [ "wasmtime" ] } -sc-rpc-server = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", features = [ "wasmtime" ] } +sc-rpc-server = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } # Polkadot dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # Cumulus dependencies -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } runtime-common = { path = "../../../runtime/common" } node-runtime = { package = "mandala-runtime", path = "../../../runtime/mandala" } @@ -85,5 +85,5 @@ ecosystem-renvm-bridge = { path = "../../../ecosystem-modules/ren/renvm-bridge" [dev-dependencies] # Substrate dependencies -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/node/e2e-tests/test-service/src/lib.rs b/node/e2e-tests/test-service/src/lib.rs index 4db4b20c9e..d8d2fbe743 100644 --- a/node/e2e-tests/test-service/src/lib.rs +++ b/node/e2e-tests/test-service/src/lib.rs @@ -32,7 +32,7 @@ use cumulus_client_service::{ StartFullNodeParams, }; use cumulus_primitives_core::ParaId; -use cumulus_relay_chain_local::RelayChainLocal; +use cumulus_relay_chain_inprocess_interface::RelayChainLocal; use frame_system_rpc_runtime_api::AccountNonceApi; use futures::{channel::mpsc::Sender, SinkExt}; diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 9370bd697c..4031175270 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -13,64 +13,64 @@ serde_json = "1.0.68" futures = "0.3.15" hex = "0.4.0" ethers = "0.6.2" -codec = { package = "parity-scale-codec", version = "2.3.1" } +codec = { package = "parity-scale-codec", version = "3.0.0" } jsonrpc-core = "18.0.0" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17"} -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18"} +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } ecosystem-renvm-bridge = { path = "../../ecosystem-modules/ren/renvm-bridge" } module-collator-selection = { path = "../../modules/collator-selection" } diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 49e1c20bc2..b482b70437 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -28,8 +28,8 @@ use cumulus_client_service::{ prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, }; use cumulus_primitives_core::ParaId; +use cumulus_relay_chain_inprocess_interface::build_relay_chain_interface; use cumulus_relay_chain_interface::RelayChainInterface; -use cumulus_relay_chain_local::build_relay_chain_interface; use acala_primitives::{Block, Hash}; use cumulus_primitives_parachain_inherent::MockValidationDataInherentDataProvider; diff --git a/orml b/orml index 0a5a2df3b7..e0d31d4130 160000 --- a/orml +++ b/orml @@ -1 +1 @@ -Subproject commit 0a5a2df3b796f1fcfec3c4c32cc853716fa6c3da +Subproject commit e0d31d4130b66b438c1b7980b9106e08b1354387 diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 29f9d162fb..38304258ed 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" hex-literal = "0.3.1" bstringify = "0.1.2" serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } num_enum = { version = "0.5.1", default-features = false } -parity-util-mem = { version = "0.10.0", default-features = false, features = ["primitive-types"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +parity-util-mem = { version = "0.11.0", default-features = false, features = ["primitive-types"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } enumflags2 = { version = "0.6.3" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } module-evm-utility = { path = "../modules/evm-utility", default-features = false } module-evm-utility-macro = { path = "../modules/evm-utility/macro" } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 781acb52c4..db7a0bcd2f 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -6,19 +6,19 @@ edition = "2021" [dependencies] jsonrpc-core = "18.0.0" -codec = { package = "parity-scale-codec", version = "2.3.1" } +codec = { package = "parity-scale-codec", version = "3.0.0" } primitives = { package = "acala-primitives", path = "../primitives" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-oracle-rpc = { path = "../orml/oracle/rpc" } runtime-common = { path = "../runtime/common" } diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml index 9b6d9fb845..6993a2c469 100644 --- a/runtime/acala/Cargo.toml +++ b/runtime/acala/Cargo.toml @@ -7,71 +7,74 @@ build = "build.rs" [dependencies] smallvec = "1.4.0" -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } serde_json = { version = "1.0.68", default-features = false, features = ["alloc"] } hex = { version = "0.4", default-features = false } hex-literal = { version = "0.3.1" } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features =false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, features = ["historical"] } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +# substrate +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features =false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, features = ["historical"] } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } + # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +# orml orml-auction = { path = "../../orml/auction", default-features = false } orml-authority = { path = "../../orml/authority", default-features = false } orml-benchmarking = { path = "../../orml/benchmarking", default-features = false, optional = true } @@ -88,6 +91,7 @@ orml-xcm-support = { path = "../../orml/xcm-support", default-features = false } orml-unknown-tokens = { path = "../../orml/unknown-tokens", default-features = false } orml-xcm = { path = "../../orml/xcm", default-features = false } +# modules module-transaction-pause = { path = "../../modules/transaction-pause", default-features = false } module-transaction-payment = { path = "../../modules/transaction-payment", default-features = false } module-asset-registry = { path = "../../modules/asset-registry", default-features = false } @@ -102,6 +106,7 @@ module-emergency-shutdown = { path = "../../modules/emergency-shutdown", default module-evm = { path = "../../modules/evm", default-features = false } module-evm-accounts = { path = "../../modules/evm-accounts", default-features = false } module-evm-bridge = { path = "../../modules/evm-bridge", default-features = false } +module-evm-rpc-runtime-api = { path = "../../modules/evm/rpc/runtime_api", default-features = false } module-honzon = { path = "../../modules/honzon", default-features = false } module-loans = { path = "../../modules/loans", default-features = false } module-nft = { path = "../../modules/nft", default-features = false } @@ -116,17 +121,15 @@ module-idle-scheduler = { path = "../../modules/idle-scheduler", default-feature primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } runtime-common = { path = "../common", default-features = false } -module-evm-rpc-runtime-api = { path = "../../modules/evm/rpc/runtime_api", default-features = false } - # benchmarking deps libsecp256k1 = { version = "0.6", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 538738c8b3..fdc58c74e6 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -9,20 +9,24 @@ hex-literal = "0.3.1" static_assertions = "1.1.0" num_enum = { version = "0.5.1", default-features = false } serde = { version = "1.0.136", optional = true, default-features = false } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -ethabi = { version = "15.0.0", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +ethabi = { version = "17.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } + +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } orml-oracle = { path = "../../orml/oracle", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } @@ -31,25 +35,20 @@ module-evm = { path = "../../modules/evm", default-features = false } module-evm-utility-macro = { path = "../../modules/evm-utility/macro" } module-support = { path = "../../modules/support", default-features = false } module-idle-scheduler = { path = "../../modules/idle-scheduler", default-features = false } -primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } - module-prices = { path = "../../modules/prices", default-features = false } module-transaction-payment = { path = "../../modules/transaction-payment", default-features = false } module-nft = { path = "../../modules/nft", default-features = false } module-dex = { path = "../../modules/dex", default-features = false } - -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] serde_json = "1.0.68" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } acala-service = { path = "../../node/service", features = ["with-mandala-runtime"] } orml-tokens = { path = "../../orml/tokens" } diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 211872566a..4f93865e69 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -35,10 +35,7 @@ use frame_system::{limits, EnsureRoot}; pub use module_support::{ExchangeRate, PrecompileCallerFilter, Price, Rate, Ratio}; use primitives::{evm::is_system_contract, Balance, BlockNumber, CurrencyId}; use scale_info::TypeInfo; -use sp_core::{ - u32_trait::{_1, _2, _3, _4}, - H160, -}; +use sp_core::H160; use sp_runtime::{ traits::{BlockNumberProvider, Convert}, transaction_validity::TransactionPriority, @@ -208,27 +205,27 @@ pub type OperatorMembershipInstanceAcala = pallet_membership::Instance5; // General Council pub type EnsureRootOrAllGeneralCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrHalfGeneralCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrOneThirdsGeneralCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _3, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrTwoThirdsGeneralCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrThreeFourthsGeneralCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, GeneralCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrOneGeneralCouncil = @@ -237,79 +234,79 @@ pub type EnsureRootOrOneGeneralCouncil = // Financial Council pub type EnsureRootOrAllFinancialCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, FinancialCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrHalfFinancialCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, FinancialCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrOneThirdsFinancialCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _3, AccountId, FinancialCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrTwoThirdsFinancialCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, FinancialCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrThreeFourthsFinancialCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, FinancialCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; // Homa Council pub type EnsureRootOrAllHomaCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, HomaCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrHalfHomaCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, HomaCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrOneThirdsHomaCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _3, AccountId, HomaCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrTwoThirdsHomaCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, HomaCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrThreeFourthsHomaCouncil = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, HomaCouncilInstance>, + pallet_collective::EnsureProportionAtLeast, >; // Technical Committee Council pub type EnsureRootOrAllTechnicalCommittee = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCommitteeInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrHalfTechnicalCommittee = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, TechnicalCommitteeInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_1, _3, AccountId, TechnicalCommitteeInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrTwoThirdsTechnicalCommittee = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCommitteeInstance>, + pallet_collective::EnsureProportionAtLeast, >; pub type EnsureRootOrThreeFourthsTechnicalCommittee = EnsureOneOf< EnsureRoot, - pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, TechnicalCommitteeInstance>, + pallet_collective::EnsureProportionAtLeast, >; /// The type used to represent the kinds of proxying allowed. diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index 8161277c8a..14cac2f4a4 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -6,71 +6,74 @@ edition = "2021" [dependencies] smallvec = "1.4.0" -codec = { package = "parity-scale-codec", version = "2.3.1", features = ["derive", "max-encoded-len"] } +codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive", "max-encoded-len"] } serde = { version = "1.0.136" } serde_json = "1.0.68" hex = { version = "0.4" } hex-literal = { version = "0.3.1" } libsecp256k1 = { version = "0.6" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17"} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17"} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features =false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", features = ["historical"] } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +# substrate +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18"} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18"} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features =false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", features = ["historical"] } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } + # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +# orml orml-auction = { path = "../../orml/auction" } orml-authority = { path = "../../orml/authority" } orml-benchmarking = { path = "../../orml/benchmarking", optional = true } @@ -86,6 +89,7 @@ orml-xcm-support = { path = "../../orml/xcm-support" } orml-unknown-tokens = { path = "../../orml/unknown-tokens" } orml-xcm = { path = "../../orml/xcm" } +# modules module-transaction-payment = { path = "../../modules/transaction-payment" } module-asset-registry = { path = "../../modules/asset-registry" } module-auction-manager = { path = "../../modules/auction-manager" } @@ -99,6 +103,7 @@ module-emergency-shutdown = { path = "../../modules/emergency-shutdown" } module-evm = { path = "../../modules/evm" } module-evm-accounts = { path = "../../modules/evm-accounts" } module-evm-bridge = { path = "../../modules/evm-bridge" } +module-evm-rpc-runtime-api = { path = "../../modules/evm/rpc/runtime_api", default-features = false } module-honzon = { path = "../../modules/honzon" } module-loans = { path = "../../modules/loans" } module-nft = { path = "../../modules/nft" } @@ -117,8 +122,6 @@ mandala-runtime = { path = "../mandala", optional = true } karura-runtime = { path = "../karura", optional = true } acala-runtime = { path = "../acala", optional = true } -module-evm-rpc-runtime-api = { path = "../../modules/evm/rpc/runtime_api", default-features = false } - ecosystem-renvm-bridge = { path = "../../ecosystem-modules/ren/renvm-bridge" } ecosystem-starport = { path = "../../ecosystem-modules/starport" } ecosystem-compound-cash = { path = "../../ecosystem-modules/compound-cash" } @@ -126,18 +129,19 @@ ecosystem-compound-cash = { path = "../../ecosystem-modules/compound-cash" } [dev-dependencies] env_logger = "0.9.0" log = "0.4.14" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } -xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "24ccbce563d1f99019b4cdfa2f3af4e99bac0dfc" } +#xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "24ccbce563d1f99019b4cdfa2f3af4e99bac0dfc" } +xcm-emulator = { git = "https://github.com/zqhxuyuan/xcm-simulator", rev = "0e4574b0de910521962337b7539ace359fa1afed" } acala-service = { path = "../../node/service", features = ["with-all-runtime"] } diff --git a/runtime/karura/Cargo.toml b/runtime/karura/Cargo.toml index efffde008f..2265a4b0b8 100644 --- a/runtime/karura/Cargo.toml +++ b/runtime/karura/Cargo.toml @@ -7,71 +7,74 @@ build = "build.rs" [dependencies] smallvec = "1.4.0" -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } serde_json = { version = "1.0.68", default-features = false, features = ["alloc"] } hex = { version = "0.4", default-features = false } hex-literal = { version = "0.3.1" } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features =false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, features = ["historical"] } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +# substrate +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features =false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, features = ["historical"] } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } + # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +# orml orml-auction = { path = "../../orml/auction", default-features = false } orml-authority = { path = "../../orml/authority", default-features = false } orml-benchmarking = { path = "../../orml/benchmarking", default-features = false, optional = true } @@ -88,6 +91,7 @@ orml-xcm-support = { path = "../../orml/xcm-support", default-features = false } orml-unknown-tokens = { path = "../../orml/unknown-tokens", default-features = false } orml-xcm = { path = "../../orml/xcm", default-features = false } +# modules module-transaction-pause = { path = "../../modules/transaction-pause", default-features = false } module-transaction-payment = { path = "../../modules/transaction-payment", default-features = false } module-asset-registry = { path = "../../modules/asset-registry", default-features = false } @@ -102,6 +106,7 @@ module-emergency-shutdown = { path = "../../modules/emergency-shutdown", default module-evm = { path = "../../modules/evm", default-features = false } module-evm-accounts = { path = "../../modules/evm-accounts", default-features = false } module-evm-bridge = { path = "../../modules/evm-bridge", default-features = false } +module-evm-rpc-runtime-api = { path = "../../modules/evm/rpc/runtime_api", default-features = false } module-honzon = { path = "../../modules/honzon", default-features = false } module-loans = { path = "../../modules/loans", default-features = false } module-nft = { path = "../../modules/nft", default-features = false } @@ -117,17 +122,15 @@ nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } runtime-common = { path = "../common", default-features = false } -module-evm-rpc-runtime-api = { path = "../../modules/evm/rpc/runtime_api", default-features = false } - # benchmarking deps libsecp256k1 = { version = "0.6", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/runtime/mandala/Cargo.toml b/runtime/mandala/Cargo.toml index 3d2eee2da9..24343dcfdb 100644 --- a/runtime/mandala/Cargo.toml +++ b/runtime/mandala/Cargo.toml @@ -7,76 +7,78 @@ build = "build.rs" [dependencies] smallvec = "1.4.0" -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["derive", "max-encoded-len"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } serde = { version = "1.0.136", optional = true, default-features = false } serde_json = { version = "1.0.68", default-features = false, features = ["alloc"] } hex = { version = "0.4", default-features = false } hex-literal = { version = "0.3.1" } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } - -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features =false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, features = ["historical"] } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } - +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } libsecp256k1 = { version = "0.6", default-features = false, optional = true } +# substrate +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features =false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, features = ["historical"] } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } + # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } + # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +# orml orml-auction = { path = "../../orml/auction", default-features = false } orml-authority = { path = "../../orml/authority", default-features = false } orml-benchmarking = { path = "../../orml/benchmarking", default-features = false, optional = true } @@ -93,6 +95,7 @@ orml-xcm-support = { path = "../../orml/xcm-support", default-features = false } orml-unknown-tokens = { path = "../../orml/unknown-tokens", default-features = false } orml-xcm = { path = "../../orml/xcm", default-features = false } +# modules module-transaction-pause = { path = "../../modules/transaction-pause", default-features = false } module-transaction-payment = { path = "../../modules/transaction-payment", default-features = false } module-asset-registry = { path = "../../modules/asset-registry", default-features = false } @@ -107,6 +110,7 @@ module-emergency-shutdown = { path = "../../modules/emergency-shutdown", default module-evm = { path = "../../modules/evm", default-features = false } module-evm-accounts = { path = "../../modules/evm-accounts", default-features = false } module-evm-bridge = { path = "../../modules/evm-bridge", default-features = false } +module-evm-rpc-runtime-api = { path = "../../modules/evm/rpc/runtime_api", default-features = false } module-evm-utility = { path = "../../modules/evm-utility", default-features = false } module-honzon = { path = "../../modules/honzon", default-features = false } module-loans = { path = "../../modules/loans", default-features = false } @@ -124,21 +128,19 @@ nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } runtime-common = { path = "../common", default-features = false } -module-evm-rpc-runtime-api = { path = "../../modules/evm/rpc/runtime_api", default-features = false } - ecosystem-renvm-bridge = { path = "../../ecosystem-modules/ren/renvm-bridge", default-features = false } ecosystem-starport = { path = "../../ecosystem-modules/starport", default-features = false } ecosystem-compound-cash = { path = "../../ecosystem-modules/compound-cash", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } acala-service = { path = "../../node/service", features = ["with-mandala-runtime"] } From a08f613b570366ae3ad75a80461c05a485fa7316 Mon Sep 17 00:00:00 2001 From: zqh Date: Wed, 23 Mar 2022 19:12:58 +0800 Subject: [PATCH 02/25] fix compile --- Cargo.lock | 470 ++++++++++++--------- Cargo.toml | 1 + modules/earning/Cargo.toml | 19 +- node/Cargo.toml | 2 +- node/cli/src/command.rs | 3 +- node/e2e-tests/test-service/Cargo.toml | 3 + node/e2e-tests/test-service/src/builder.rs | 14 +- node/e2e-tests/test-service/src/lib.rs | 12 +- node/e2e-tests/test-service/src/service.rs | 88 ++-- node/service/Cargo.toml | 2 + node/service/src/chain_spec/mandala.rs | 30 +- node/service/src/lib.rs | 73 +++- primitives/Cargo.toml | 2 +- runtime/acala/src/xcm_config.rs | 1 + runtime/karura/src/xcm_config.rs | 1 + runtime/mandala/src/xcm_config.rs | 1 + 16 files changed, 446 insertions(+), 276 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 995e373805..2687649234 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,7 +81,7 @@ dependencies = [ "parity-scale-codec 3.1.2", "parity-util-mem", "paste", - "scale-info 2.0.1", + "scale-info", "serde", "serde_json", "sp-api", @@ -204,7 +204,7 @@ dependencies = [ "parity-scale-codec 3.1.2", "polkadot-parachain", "runtime-common", - "scale-info 2.0.1", + "scale-info", "serde", "serde_json", "smallvec", @@ -236,6 +236,7 @@ dependencies = [ "acala-rpc", "acala-runtime", "async-trait", + "cumulus-client-cli", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", "cumulus-client-consensus-relay-chain", @@ -246,6 +247,7 @@ dependencies = [ "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", + "cumulus-relay-chain-rpc-interface", "cumulus-test-relay-sproof-builder", "ecosystem-renvm-bridge", "ethers", @@ -692,6 +694,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom 0.2.5", + "instant", + "pin-project-lite 0.2.8", + "rand 0.8.5", + "tokio", +] + [[package]] name = "backtrace" version = "0.3.64" @@ -838,7 +854,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-api", "sp-application-crypto", "sp-core", @@ -1087,7 +1103,7 @@ dependencies = [ "finality-grandpa", "frame-support", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-finality-grandpa", @@ -1103,7 +1119,7 @@ dependencies = [ "bp-runtime", "frame-support", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-std", ] @@ -1118,7 +1134,7 @@ dependencies = [ "frame-system", "impl-trait-for-tuples", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-std", ] @@ -1133,7 +1149,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-api", "sp-core", "sp-runtime", @@ -1167,7 +1183,7 @@ dependencies = [ "hash-db", "num-traits", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -1221,7 +1237,7 @@ dependencies = [ "pallet-bridge-messages", "pallet-transaction-payment", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-runtime", "sp-state-machine", @@ -2173,7 +2189,7 @@ dependencies = [ "frame-system", "pallet-aura", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-application-crypto", "sp-consensus-aura", @@ -2191,7 +2207,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -2215,7 +2231,7 @@ dependencies = [ "pallet-balances", "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-externalities", @@ -2262,7 +2278,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -2281,7 +2297,7 @@ dependencies = [ "log", "parity-scale-codec 3.1.2", "rand_chacha 0.3.1", - "scale-info 2.0.1", + "scale-info", "sp-runtime", "sp-std", "xcm", @@ -2298,7 +2314,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -2332,7 +2348,7 @@ dependencies = [ "cumulus-test-relay-sproof-builder", "parity-scale-codec 3.1.2", "sc-client-api", - "scale-info 2.0.1", + "scale-info", "sp-api", "sp-core", "sp-inherents", @@ -2426,6 +2442,32 @@ dependencies = [ "thiserror", ] +[[package]] +name = "cumulus-relay-chain-rpc-interface" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" +dependencies = [ + "async-trait", + "backoff", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures 0.3.21", + "futures-timer", + "jsonrpsee 0.9.0", + "parity-scale-codec 3.1.2", + "parking_lot 0.12.0", + "polkadot-service", + "sc-client-api", + "sc-rpc-api", + "sp-api", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "tracing", + "url 2.2.2", +] + [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" @@ -2700,7 +2742,7 @@ dependencies = [ "module-support", "pallet-timestamp", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -2721,7 +2763,7 @@ dependencies = [ "orml-traits", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -2742,7 +2784,7 @@ dependencies = [ "orml-traits", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -2980,7 +3022,7 @@ dependencies = [ "impl-codec 0.6.0", "impl-rlp", "impl-serde", - "scale-info 2.0.1", + "scale-info", "tiny-keccak", ] @@ -2997,7 +3039,7 @@ dependencies = [ "parity-scale-codec 3.1.2", "rlp", "rlp-derive", - "scale-info 2.0.1", + "scale-info", "serde", "sha3 0.10.1", "triehash", @@ -3015,7 +3057,7 @@ dependencies = [ "parity-scale-codec 3.1.2", "rlp", "rlp-derive", - "scale-info 2.0.1", + "scale-info", "serde", "sha3 0.10.1", "triehash", @@ -3047,7 +3089,7 @@ dependencies = [ "impl-rlp", "impl-serde", "primitive-types 0.11.1", - "scale-info 2.0.1", + "scale-info", "uint", ] @@ -3285,7 +3327,7 @@ dependencies = [ "parity-scale-codec 3.1.2", "primitive-types 0.11.1", "rlp", - "scale-info 2.0.1", + "scale-info", "serde", "sha3 0.8.2", ] @@ -3298,7 +3340,7 @@ dependencies = [ "funty 1.1.0", "parity-scale-codec 3.1.2", "primitive-types 0.11.1", - "scale-info 2.0.1", + "scale-info", "serde", ] @@ -3480,7 +3522,7 @@ dependencies = [ "num-traits", "parity-scale-codec 3.1.2", "parking_lot 0.11.2", - "scale-info 2.0.1", + "scale-info", ] [[package]] @@ -3564,7 +3606,7 @@ dependencies = [ "log", "parity-scale-codec 3.1.2", "paste", - "scale-info 2.0.1", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -3624,7 +3666,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-arithmetic", "sp-npos-elections", "sp-std", @@ -3638,7 +3680,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -3654,7 +3696,7 @@ checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", ] @@ -3671,7 +3713,7 @@ dependencies = [ "once_cell", "parity-scale-codec 3.1.2", "paste", - "scale-info 2.0.1", + "scale-info", "serde", "smallvec", "sp-arithmetic", @@ -3729,7 +3771,7 @@ dependencies = [ "frame-support", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -3747,7 +3789,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -4337,9 +4379,12 @@ checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" dependencies = [ "http", "hyper", + "log", "rustls 0.20.4", + "rustls-native-certs 0.6.1", "tokio", "tokio-rustls 0.23.3", + "webpki-roots 0.22.2", ] [[package]] @@ -4735,6 +4780,18 @@ dependencies = [ "jsonrpsee-ws-client 0.8.0", ] +[[package]] +name = "jsonrpsee" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d0b8cc1959f8c05256ace093b2317482da9127f1d9227564f47e7e6bf9bda8" +dependencies = [ + "jsonrpsee-core 0.9.0", + "jsonrpsee-http-client", + "jsonrpsee-types 0.9.0", + "jsonrpsee-ws-client 0.9.0", +] + [[package]] name = "jsonrpsee-client-transport" version = "0.8.0" @@ -4756,6 +4813,27 @@ dependencies = [ "webpki-roots 0.22.2", ] +[[package]] +name = "jsonrpsee-client-transport" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa370c2c717d798c3c0a315ae3f0a707a388c6963c11f9da7dbbe1d3f7392f5f" +dependencies = [ + "futures 0.3.21", + "http", + "jsonrpsee-core 0.9.0", + "jsonrpsee-types 0.9.0", + "pin-project 1.0.10", + "rustls-native-certs 0.6.1", + "soketto", + "thiserror", + "tokio", + "tokio-rustls 0.23.3", + "tokio-util", + "tracing", + "webpki-roots 0.22.2", +] + [[package]] name = "jsonrpsee-core" version = "0.8.0" @@ -4790,12 +4868,35 @@ dependencies = [ "async-trait", "beef", "futures-channel", + "futures-util", "hyper", "jsonrpsee-types 0.9.0", + "rustc-hash", "serde", "serde_json", "soketto", "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-http-client" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d31b837273d09dd80051eefa57d337769dff6c3266108c43a3544ac7ffed9d68" +dependencies = [ + "async-trait", + "hyper", + "hyper-rustls 0.23.0", + "jsonrpsee-core 0.9.0", + "jsonrpsee-types 0.9.0", + "rustc-hash", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", ] [[package]] @@ -4898,11 +4999,22 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5" dependencies = [ - "jsonrpsee-client-transport", + "jsonrpsee-client-transport 0.8.0", "jsonrpsee-core 0.8.0", "jsonrpsee-types 0.8.0", ] +[[package]] +name = "jsonrpsee-ws-client" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b58983485b2b626c276f1eb367d62dae82132451b281072a7bfa536a33ddf3" +dependencies = [ + "jsonrpsee-client-transport 0.9.0", + "jsonrpsee-core 0.9.0", + "jsonrpsee-types 0.9.0", +] + [[package]] name = "k256" version = "0.9.5" @@ -5018,7 +5130,7 @@ dependencies = [ "parity-scale-codec 3.1.2", "polkadot-parachain", "runtime-common", - "scale-info 2.0.1", + "scale-info", "serde", "serde_json", "smallvec", @@ -5119,7 +5231,7 @@ dependencies = [ "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.0.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -6067,7 +6179,7 @@ dependencies = [ "parity-scale-codec 3.1.2", "polkadot-parachain", "runtime-common", - "scale-info 2.0.1", + "scale-info", "serde", "serde_json", "smallvec", @@ -6337,7 +6449,7 @@ dependencies = [ "pallet-balances", "pallet-timestamp", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "serde_json", "sp-core", @@ -6365,7 +6477,7 @@ dependencies = [ "orml-utilities", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6392,7 +6504,7 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec 3.1.2", "rand_chacha 0.2.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-application-crypto", "sp-core", @@ -6416,7 +6528,7 @@ dependencies = [ "orml-traits", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6439,7 +6551,7 @@ dependencies = [ "pallet-session", "pallet-timestamp", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-consensus-aura", "sp-core", @@ -6467,7 +6579,7 @@ dependencies = [ "pallet-balances", "pallet-timestamp", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "serde_json", "sp-core", @@ -6488,7 +6600,7 @@ dependencies = [ "orml-traits", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6508,7 +6620,7 @@ dependencies = [ "orml-traits", "pallet-timestamp", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6526,9 +6638,9 @@ dependencies = [ "module-support", "orml-traits", "pallet-balances", - "parity-scale-codec 2.3.1", + "parity-scale-codec 3.1.2", "paste", - "scale-info 1.0.0", + "scale-info", "serde", "sp-core", "sp-io", @@ -6551,7 +6663,7 @@ dependencies = [ "orml-traits", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6583,7 +6695,7 @@ dependencies = [ "primitive-types 0.11.1", "ripemd160", "rlp", - "scale-info 2.0.1", + "scale-info", "serde", "serde_json", "sha3 0.9.1", @@ -6610,7 +6722,7 @@ dependencies = [ "orml-traits", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6636,7 +6748,7 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec 3.1.2", "primitive-types 0.11.1", - "scale-info 2.0.1", + "scale-info", "serde", "serde_json", "sp-core", @@ -6664,7 +6776,7 @@ dependencies = [ "evm", "evm-gasometer", "evm-runtime", - "scale-info 2.0.1", + "scale-info", "sha3 0.9.1", "sp-std", ] @@ -6686,7 +6798,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6707,7 +6819,7 @@ dependencies = [ "orml-traits", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-arithmetic", "sp-core", "sp-io", @@ -6733,7 +6845,7 @@ dependencies = [ "pallet-balances", "pallet-xcm", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-arithmetic", "sp-core", "sp-io", @@ -6757,7 +6869,7 @@ dependencies = [ "orml-utilities", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6782,7 +6894,7 @@ dependencies = [ "pallet-balances", "pallet-timestamp", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6799,7 +6911,7 @@ dependencies = [ "frame-system", "module-support", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6820,7 +6932,7 @@ dependencies = [ "orml-traits", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6842,7 +6954,7 @@ dependencies = [ "orml-traits", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6867,7 +6979,7 @@ dependencies = [ "pallet-proxy", "pallet-utility", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6888,7 +7000,7 @@ dependencies = [ "orml-traits", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6907,7 +7019,7 @@ dependencies = [ "orml-tokens", "orml-traits", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -6942,7 +7054,7 @@ dependencies = [ "log", "pallet-session", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -6958,7 +7070,7 @@ dependencies = [ "frame-support", "impl-trait-for-tuples", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6977,7 +7089,7 @@ dependencies = [ "orml-traits", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "smallvec", "sp-core", "sp-io", @@ -7001,7 +7113,7 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "smallvec", "sp-core", @@ -7030,7 +7142,7 @@ dependencies = [ "pallet-balances", "pallet-xcm", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -7384,8 +7496,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", - "parity-scale-codec 2.3.1", - "scale-info 1.0.0", + "parity-scale-codec 3.1.2", + "scale-info", "serde", "sp-core", "sp-io", @@ -7501,7 +7613,7 @@ dependencies = [ "frame-system", "orml-traits", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -7517,7 +7629,7 @@ dependencies = [ "frame-system", "pallet-scheduler", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -7570,7 +7682,7 @@ dependencies = [ "log", "parity-scale-codec 3.1.2", "paste", - "scale-info 2.0.1", + "scale-info", "serde", "sp-api", "sp-io", @@ -7598,7 +7710,7 @@ dependencies = [ "orml-utilities", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -7613,7 +7725,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -7628,7 +7740,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -7645,7 +7757,7 @@ dependencies = [ "orml-traits", "orml-utilities", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-application-crypto", "sp-core", @@ -7685,7 +7797,7 @@ dependencies = [ "frame-system", "orml-traits", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -7703,7 +7815,7 @@ dependencies = [ "pallet-elections-phragmen", "pallet-treasury", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -7748,7 +7860,7 @@ dependencies = [ "num-traits", "orml-utilities", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -7764,7 +7876,7 @@ dependencies = [ "frame-system", "orml-xcm-support", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -7780,7 +7892,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "serde_json", "sp-io", @@ -7796,7 +7908,7 @@ dependencies = [ "frame-system", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -7812,7 +7924,7 @@ dependencies = [ "frame-system", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -7828,7 +7940,7 @@ dependencies = [ "frame-system", "pallet-xcm", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-std", "xcm", "xcm-executor", @@ -7867,7 +7979,7 @@ dependencies = [ "parity-scale-codec 3.1.2", "polkadot-parachain", "polkadot-runtime-parachains", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -7906,7 +8018,7 @@ dependencies = [ "frame-system", "pallet-transaction-payment", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -7923,7 +8035,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-runtime", "sp-std", ] @@ -7937,7 +8049,7 @@ dependencies = [ "frame-system", "pallet-timestamp", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-application-crypto", "sp-consensus-aura", "sp-runtime", @@ -7953,7 +8065,7 @@ dependencies = [ "frame-system", "pallet-session", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-application-crypto", "sp-authority-discovery", "sp-runtime", @@ -7969,7 +8081,7 @@ dependencies = [ "frame-system", "impl-trait-for-tuples", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-authorship", "sp-runtime", "sp-std", @@ -7988,7 +8100,7 @@ dependencies = [ "pallet-session", "pallet-timestamp", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", @@ -8011,7 +8123,7 @@ dependencies = [ "log", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -8029,7 +8141,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-runtime", "sp-std", ] @@ -8044,7 +8156,7 @@ dependencies = [ "frame-system", "pallet-session", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -8067,7 +8179,7 @@ dependencies = [ "pallet-mmr-primitives", "pallet-session", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -8086,7 +8198,7 @@ dependencies = [ "log", "pallet-treasury", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -8104,7 +8216,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -8124,7 +8236,7 @@ dependencies = [ "log", "num-traits", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-finality-grandpa", "sp-runtime", @@ -8146,7 +8258,7 @@ dependencies = [ "log", "num-traits", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -8166,7 +8278,7 @@ dependencies = [ "pallet-session", "parity-scale-codec 3.1.2", "rand 0.8.5", - "scale-info 2.0.1", + "scale-info", "serde", "sp-runtime", "sp-staking", @@ -8183,7 +8295,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -8199,7 +8311,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -8218,7 +8330,7 @@ dependencies = [ "log", "parity-scale-codec 3.1.2", "rand 0.7.3", - "scale-info 2.0.1", + "scale-info", "sp-arithmetic", "sp-core", "sp-io", @@ -8239,7 +8351,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-npos-elections", @@ -8256,7 +8368,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-arithmetic", "sp-runtime", "sp-std", @@ -8274,7 +8386,7 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-application-crypto", "sp-core", "sp-finality-grandpa", @@ -8295,7 +8407,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -8312,7 +8424,7 @@ dependencies = [ "log", "pallet-authorship", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-application-crypto", "sp-core", "sp-io", @@ -8330,7 +8442,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-keyring", @@ -8348,7 +8460,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -8366,7 +8478,7 @@ dependencies = [ "frame-system", "pallet-mmr-primitives", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -8415,7 +8527,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -8429,7 +8541,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -8445,7 +8557,7 @@ dependencies = [ "log", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-runtime", "sp-staking", @@ -8469,7 +8581,7 @@ dependencies = [ "pallet-session", "pallet-staking", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-runtime", "sp-staking", "sp-std", @@ -8484,7 +8596,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -8500,7 +8612,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -8514,7 +8626,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -8530,7 +8642,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -8547,7 +8659,7 @@ dependencies = [ "log", "pallet-timestamp", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -8582,7 +8694,7 @@ dependencies = [ "frame-system", "parity-scale-codec 3.1.2", "rand_chacha 0.2.2", - "scale-info 2.0.1", + "scale-info", "sp-runtime", "sp-std", ] @@ -8601,7 +8713,7 @@ dependencies = [ "pallet-session", "parity-scale-codec 3.1.2", "rand_chacha 0.2.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-application-crypto", "sp-io", @@ -8638,7 +8750,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -8654,7 +8766,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-inherents", "sp-io", "sp-runtime", @@ -8673,7 +8785,7 @@ dependencies = [ "log", "pallet-treasury", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -8689,7 +8801,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "smallvec", "sp-core", @@ -8737,7 +8849,7 @@ dependencies = [ "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -8753,7 +8865,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-runtime", "sp-std", ] @@ -8767,7 +8879,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -8784,7 +8896,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-runtime", "sp-std", ] @@ -8798,7 +8910,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -8817,7 +8929,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-runtime", "sp-std", "xcm", @@ -8833,7 +8945,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", ] @@ -8853,7 +8965,7 @@ dependencies = [ "parity-scale-codec 3.1.2", "polkadot-primitives", "polkadot-runtime-common", - "scale-info 2.0.1", + "scale-info", "sp-consensus-aura", "sp-core", "sp-io", @@ -9469,7 +9581,7 @@ source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf dependencies = [ "parity-scale-codec 3.1.2", "parity-util-mem", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -10016,7 +10128,7 @@ dependencies = [ "parity-scale-codec 3.1.2", "parity-util-mem", "polkadot-core-primitives", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -10050,7 +10162,7 @@ dependencies = [ "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", - "scale-info 2.0.1", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -10157,7 +10269,7 @@ dependencies = [ "polkadot-runtime-constants", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.0.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -10213,7 +10325,7 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.0.1", + "scale-info", "serde", "serde_derive", "slot-range-helper", @@ -10280,7 +10392,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", - "scale-info 2.0.1", + "scale-info", "serde", "sp-api", "sp-core", @@ -10466,7 +10578,7 @@ dependencies = [ "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.0.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -10610,7 +10722,7 @@ dependencies = [ "impl-codec 0.6.0", "impl-rlp", "impl-serde", - "scale-info 2.0.1", + "scale-info", "uint", ] @@ -11207,7 +11319,7 @@ dependencies = [ "polkadot-runtime-common", "polkadot-runtime-parachains", "rococo-runtime-constants", - "scale-info 2.0.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -11290,7 +11402,7 @@ dependencies = [ "pallet-timestamp", "pallet-utility", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "serde_json", "sp-core", @@ -12571,19 +12683,6 @@ dependencies = [ "prometheus", ] -[[package]] -name = "scale-info" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" -dependencies = [ - "bitvec 0.20.4", - "cfg-if 1.0.0", - "derive_more", - "parity-scale-codec 2.3.1", - "scale-info-derive 1.0.0", -] - [[package]] name = "scale-info" version = "2.0.1" @@ -12594,22 +12693,10 @@ dependencies = [ "cfg-if 1.0.0", "derive_more", "parity-scale-codec 3.1.2", - "scale-info-derive 2.0.0", + "scale-info-derive", "serde", ] -[[package]] -name = "scale-info-derive" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" -dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "scale-info-derive" version = "2.0.0" @@ -13170,7 +13257,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core", "sp-io", @@ -13185,7 +13272,7 @@ dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-debug-derive", "sp-std", @@ -13198,7 +13285,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-api", "sp-application-crypto", "sp-runtime", @@ -13273,7 +13360,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "async-trait", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-api", "sp-application-crypto", "sp-consensus", @@ -13292,7 +13379,7 @@ dependencies = [ "async-trait", "merlin", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -13313,7 +13400,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-arithmetic", "sp-runtime", @@ -13360,7 +13447,7 @@ dependencies = [ "primitive-types 0.11.1", "rand 0.7.3", "regex", - "scale-info 2.0.1", + "scale-info", "schnorrkel", "secp256k1", "secrecy", @@ -13442,7 +13529,7 @@ dependencies = [ "finality-grandpa", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -13534,7 +13621,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-arithmetic", "sp-core", @@ -13597,7 +13684,7 @@ dependencies = [ "parity-util-mem", "paste", "rand 0.7.3", - "scale-info 2.0.1", + "scale-info", "serde", "sp-application-crypto", "sp-arithmetic", @@ -13650,7 +13737,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-api", "sp-core", "sp-runtime", @@ -13664,7 +13751,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-runtime", "sp-std", ] @@ -13768,7 +13855,7 @@ dependencies = [ "async-trait", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-inherents", "sp-runtime", @@ -13784,7 +13871,7 @@ dependencies = [ "hash-db", "memory-db", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "sp-core", "sp-std", "thiserror", @@ -13800,7 +13887,7 @@ dependencies = [ "impl-serde", "parity-scale-codec 3.1.2", "parity-wasm 0.42.2", - "scale-info 2.0.1", + "scale-info", "serde", "sp-core-hashing-proc-macro", "sp-runtime", @@ -13922,7 +14009,7 @@ dependencies = [ "polkadot-core-primitives", "polkadot-parachain", "polkadot-runtime-common", - "scale-info 2.0.1", + "scale-info", "serde", "smallvec", "sp-api", @@ -14260,6 +14347,7 @@ dependencies = [ "acala-service", "async-trait", "criterion", + "cumulus-client-cli", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", "cumulus-client-consensus-relay-chain", @@ -14269,6 +14357,7 @@ dependencies = [ "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", + "cumulus-relay-chain-rpc-interface", "cumulus-test-relay-validation-worker-provider", "ecosystem-renvm-bridge", "frame-system", @@ -14324,6 +14413,7 @@ dependencies = [ "substrate-test-client", "substrate-test-utils", "tokio", + "url 2.2.2", ] [[package]] @@ -15453,7 +15543,7 @@ dependencies = [ "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.0.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -15675,7 +15765,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "scale-info", "xcm-procedural", ] @@ -15690,7 +15780,7 @@ dependencies = [ "pallet-transaction-payment", "parity-scale-codec 3.1.2", "polkadot-parachain", - "scale-info 2.0.1", + "scale-info", "sp-arithmetic", "sp-io", "sp-runtime", diff --git a/Cargo.toml b/Cargo.toml index d7a47b6a18..17a9899aea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -320,6 +320,7 @@ cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", r cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } statemine-runtime = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } diff --git a/modules/earning/Cargo.toml b/modules/earning/Cargo.toml index 366e5a3d69..4a07ea4526 100644 --- a/modules/earning/Cargo.toml +++ b/modules/earning/Cargo.toml @@ -5,15 +5,15 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } @@ -21,9 +21,10 @@ support = { package = "module-support", path = "../support", default-features = primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } paste = "1.0" + [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/node/Cargo.toml b/node/Cargo.toml index 7bb52ad6ce..15cacaa002 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -11,7 +11,7 @@ path = "src/main.rs" [dependencies] futures = "0.3.15" -parity-util-mem = { version = "0.11.0", default-features = false, features = ["jemalloc-global"] } +parity-util-mem = { version = "0.11", default-features = false, features = ["jemalloc-global"] } acala-cli = { path = "cli" } acala-service = { path = "service" } diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs index 9800083faa..b4864ba51d 100644 --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -457,6 +457,7 @@ pub fn run() -> sc_cli::Result<()> { let runner = cli.create_runner(&cli.run.normalize())?; let chain_spec = &runner.config().chain_spec; let is_mandala_dev = chain_spec.is_mandala_dev(); + let collator_options = cli.run.collator_options(); set_default_ss58_version(chain_spec); @@ -495,7 +496,7 @@ pub fn run() -> sc_cli::Result<()> { with_runtime_or_err!(config.chain_spec, { { - service::start_node::(config, polkadot_config, id) + service::start_node::(config, polkadot_config, collator_options, id) .await .map(|r| r.0) .map_err(Into::into) diff --git a/node/e2e-tests/test-service/Cargo.toml b/node/e2e-tests/test-service/Cargo.toml index 678afa064b..761c0eeb2e 100644 --- a/node/e2e-tests/test-service/Cargo.toml +++ b/node/e2e-tests/test-service/Cargo.toml @@ -16,6 +16,7 @@ jsonrpc-core = "18.0.0" log = "0.4.14" futures = { package = "futures", version = "0.3", features = ["compat"] } hex-literal = "0.3.1" +url = "2.2.2" # Substrate dependencies frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } @@ -59,6 +60,7 @@ polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "r polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } # Cumulus dependencies +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } @@ -69,6 +71,7 @@ cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/c cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } runtime-common = { path = "../../../runtime/common" } node-runtime = { package = "mandala-runtime", path = "../../../runtime/mandala" } diff --git a/node/e2e-tests/test-service/src/builder.rs b/node/e2e-tests/test-service/src/builder.rs index de881d7352..3e6f8b967c 100644 --- a/node/e2e-tests/test-service/src/builder.rs +++ b/node/e2e-tests/test-service/src/builder.rs @@ -32,6 +32,7 @@ pub struct TestNodeBuilder { storage_update_func_relay_chain: Option>, consensus: Consensus, seal_mode: SealMode, + relay_chain_full_node_url: Option, } impl TestNodeBuilder { @@ -55,6 +56,7 @@ impl TestNodeBuilder { storage_update_func_relay_chain: None, consensus: Consensus::Aura, seal_mode: SealMode::ParaSeal, + relay_chain_full_node_url: None, } } @@ -149,6 +151,12 @@ impl TestNodeBuilder { self } + /// Connect to full node via RPC. + pub fn use_external_relay_chain_node_at_url(mut self, network_address: Url) -> Self { + self.relay_chain_full_node_url = Some(network_address); + self + } + /// Build the [`TestNode`]. pub async fn build(self) -> TestNode { let parachain_config = node_config( @@ -172,6 +180,10 @@ impl TestNodeBuilder { relay_chain_config.network.node_name = format!("{} (relay chain)", relay_chain_config.network.node_name); + let collator_options = CollatorOptions { + relay_chain_rpc_url: self.relay_chain_full_node_url, + }; + let multiaddr = parachain_config.network.listen_addresses[0].clone(); let (task_manager, client, network, rpc_handlers, transaction_pool, backend, seal_sink) = match self.seal_mode { SealMode::DevInstantSeal | SealMode::DevAuraSeal => { @@ -186,6 +198,7 @@ impl TestNodeBuilder { parachain_config, self.collator_key, relay_chain_config, + collator_options, self.para_id, self.wrap_announce_block, |_| Ok(Default::default()), @@ -283,7 +296,6 @@ pub fn node_config( state_cache_child_ratio: None, state_pruning: PruningMode::ArchiveAll, keep_blocks: KeepBlocks::All, - transaction_storage: TransactionStorageMode::BlockBody, chain_spec: spec, wasm_method: WasmExecutionMethod::Interpreted, // NOTE: we enforce the use of the native runtime to make the errors more debuggable diff --git a/node/e2e-tests/test-service/src/lib.rs b/node/e2e-tests/test-service/src/lib.rs index d8d2fbe743..9aef65e910 100644 --- a/node/e2e-tests/test-service/src/lib.rs +++ b/node/e2e-tests/test-service/src/lib.rs @@ -24,6 +24,7 @@ mod service; use futures::channel::{mpsc, oneshot}; use std::{future::Future, sync::Arc, time::Duration}; +use cumulus_client_cli::CollatorOptions; use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; use cumulus_client_consensus_common::{ParachainCandidate, ParachainConsensus}; use cumulus_client_network::BlockAnnounceValidator; @@ -32,7 +33,9 @@ use cumulus_client_service::{ StartFullNodeParams, }; use cumulus_primitives_core::ParaId; -use cumulus_relay_chain_inprocess_interface::RelayChainLocal; +use cumulus_relay_chain_inprocess_interface::RelayChainInProcessInterface; +use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult}; +use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface; use frame_system_rpc_runtime_api::AccountNonceApi; use futures::{channel::mpsc::Sender, SinkExt}; @@ -52,7 +55,7 @@ use sc_network::{config::TransportConfig, multiaddr, NetworkService}; use sc_service::{ config::{ DatabaseSource, KeepBlocks, KeystoreConfig, MultiaddrWithPeerId, NetworkConfiguration, OffchainWorkerConfig, - PruningMode, TransactionStorageMode, WasmExecutionMethod, + PruningMode, WasmExecutionMethod, }, BasePath, ChainSpec, Configuration, PartialComponents, Role, RpcHandlers, SpawnTasksParams, TFullBackend, TFullCallExecutor, TFullClient, TaskManager, @@ -73,9 +76,8 @@ use sp_runtime::{ }; use sp_state_machine::{BasicExternalities, Ext}; use sp_trie::PrefixedMemoryDB; -use substrate_test_client::{ - sp_consensus::SlotData, BlockchainEventsExt, RpcHandlersExt, RpcTransactionError, RpcTransactionOutput, -}; +use substrate_test_client::{BlockchainEventsExt, RpcHandlersExt, RpcTransactionError, RpcTransactionOutput}; +use url::Url; use node_primitives::{signature::AcalaMultiSignature, AccountId, Address, Balance, Signature}; use node_runtime::{Block, BlockId, Hash, Header, Runtime, RuntimeApi, SignedExtra}; diff --git a/node/e2e-tests/test-service/src/service.rs b/node/e2e-tests/test-service/src/service.rs index fe7a4b065b..3701a5a889 100644 --- a/node/e2e-tests/test-service/src/service.rs +++ b/node/e2e-tests/test-service/src/service.rs @@ -74,7 +74,7 @@ pub fn new_partial( } SealMode::DevAuraSeal => { // aura import queue - let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration(); + let slot_duration = sc_consensus_aura::slot_duration(&*client)?; ( sc_consensus_aura::import_queue::( @@ -85,10 +85,11 @@ pub fn new_partial( create_inherent_data_providers: move |_, ()| async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( - *timestamp, - slot_duration, - ); + let slot = + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( + *timestamp, + slot_duration, + ); Ok(( timestamp, @@ -111,9 +112,9 @@ pub fn new_partial( let create_inherent_data_providers = Box::new(move |_, _| async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *timestamp, - slot_duration.slot_duration(), + slot_duration, ); Ok((timestamp, slot)) @@ -210,11 +211,11 @@ pub async fn start_dev_node( match seal_mode { SealMode::DevInstantSeal => { - let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration(); + let slot_duration = sc_consensus_aura::slot_duration(&*client)?; let create_inherent_data_providers = Box::new(move |_, _| async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *timestamp, slot_duration, ); @@ -243,7 +244,7 @@ pub async fn start_dev_node( SealMode::DevAuraSeal => { // aura let can_author_with = sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()); - let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration(); + let slot_duration = sc_consensus_aura::slot_duration(&*client)?; let aura = sc_consensus_aura::start_aura::< sp_consensus_aura::sr25519::AuthorityPair, _, @@ -267,7 +268,7 @@ pub async fn start_dev_node( create_inherent_data_providers: move |_, ()| async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *timestamp, slot_duration, ); @@ -332,6 +333,35 @@ pub async fn start_dev_node( )) } +async fn build_relay_chain_interface( + relay_chain_config: Configuration, + collator_key: Option, + collator_options: CollatorOptions, + task_manager: &mut TaskManager, +) -> RelayChainResult> { + if let Some(relay_chain_url) = collator_options.relay_chain_rpc_url { + return Ok(Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>); + } + + let relay_chain_full_node = polkadot_test_service::new_full( + relay_chain_config, + if let Some(ref key) = collator_key { + polkadot_service::IsCollator::Yes(key.clone()) + } else { + polkadot_service::IsCollator::Yes(CollatorPair::generate().0) + }, + None, + )?; + + task_manager.add_child(relay_chain_full_node.task_manager); + Ok(Arc::new(RelayChainInProcessInterface::new( + relay_chain_full_node.client.clone(), + relay_chain_full_node.backend.clone(), + Arc::new(Mutex::new(Box::new(relay_chain_full_node.network.clone()))), + relay_chain_full_node.overseer_handle.clone(), + )) as Arc<_>) +} + /// Start a node with the given parachain `Configuration` and relay chain `Configuration`. /// /// This is the actual implementation that is abstract over the executor and the runtime api. @@ -340,6 +370,7 @@ pub async fn start_node_impl( parachain_config: Configuration, collator_key: Option, relay_chain_config: Configuration, + collator_options: CollatorOptions, para_id: ParaId, wrap_announce_block: Option AnnounceBlockFn>>, rpc_ext_builder: RB, @@ -370,32 +401,22 @@ where let transaction_pool = params.transaction_pool.clone(); let mut task_manager = params.task_manager; - let relay_chain_full_node = polkadot_test_service::new_full( + let client = params.client.clone(); + let backend = params.backend.clone(); + let backend_for_node = backend.clone(); + + let relay_chain_interface = build_relay_chain_interface( relay_chain_config, - if let Some(ref key) = collator_key { - polkadot_service::IsCollator::Yes(key.clone()) - } else { - polkadot_service::IsCollator::Yes(CollatorPair::generate().0) - }, - None, + collator_key.clone(), + collator_options.clone(), + &mut task_manager, ) + .await .map_err(|e| match e { - polkadot_service::Error::Sub(x) => x, + RelayChainError::ServiceError(polkadot_service::Error::Sub(x)) => x, s => s.to_string().into(), })?; - let client = params.client.clone(); - let backend = params.backend.clone(); - let backend_for_node = backend.clone(); - - let relay_chain_interface = Arc::new(RelayChainLocal::new( - relay_chain_full_node.client.clone(), - relay_chain_full_node.backend.clone(), - Arc::new(Mutex::new(Box::new(relay_chain_full_node.network.clone()))), - relay_chain_full_node.overseer_handle.clone(), - )); - task_manager.add_child(relay_chain_full_node.task_manager); - let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), para_id); let block_announce_validator_builder = move |_| Box::new(block_announce_validator) as Box<_>; @@ -510,9 +531,9 @@ where let time = sp_timestamp::InherentDataProvider::from_system_time(); let slot = - sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *time, - slot_duration.slot_duration(), + slot_duration, ); let parachain_inherent = parachain_inherent.ok_or_else(|| { @@ -567,6 +588,7 @@ where // the recovery delay of pov-recovery. We don't want to wait for too // long on the full node to recover, so we reduce this time here. relay_chain_slot_duration: Duration::from_millis(6), + collator_options, }; start_full_node(params)?; diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 4031175270..ac84203cb2 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -57,6 +57,7 @@ sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "pol sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } @@ -68,6 +69,7 @@ cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumul cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } diff --git a/node/service/src/chain_spec/mandala.rs b/node/service/src/chain_spec/mandala.rs index 5d5cfdb13b..d5809d5477 100644 --- a/node/service/src/chain_spec/mandala.rs +++ b/node/service/src/chain_spec/mandala.rs @@ -50,21 +50,21 @@ fn get_evm_accounts(mnemonic: Option<&str>) -> Vec { let mut evm_accounts = Vec::new(); // Child key at derivation path: m/44'/60'/0'/0/{index} - for index in 0..10u32 { - let wallet = MnemonicBuilder::::default() - .phrase(phrase) - .index(index) - .unwrap() - .build() - .unwrap(); - evm_accounts.push(wallet.address()); - log::info!( - "index: {:?}, private_key: {:x?} address: {:?}", - index, - hex::encode(wallet.signer().to_bytes()), - wallet.address() - ); - } + // for index in 0..10u32 { + // let wallet = MnemonicBuilder::::default() + // .phrase(phrase) + // .index(index) + // .unwrap() + // .build() + // .unwrap(); + // evm_accounts.push(wallet.address()); + // log::info!( + // "index: {:?}, private_key: {:x?} address: {:?}", + // index, + // hex::encode(wallet.signer().to_bytes()), + // wallet.address() + // ); + // } evm_accounts } diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index b482b70437..59934c7e05 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -20,7 +20,7 @@ #![allow(clippy::type_complexity)] //! Acala service. Specialized wrapper over substrate service. - +use cumulus_client_cli::CollatorOptions; use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; use cumulus_client_consensus_common::ParachainConsensus; use cumulus_client_network::BlockAnnounceValidator; @@ -28,8 +28,8 @@ use cumulus_client_service::{ prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, }; use cumulus_primitives_core::ParaId; -use cumulus_relay_chain_inprocess_interface::build_relay_chain_interface; -use cumulus_relay_chain_interface::RelayChainInterface; +use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult}; +use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface; use acala_primitives::{Block, Hash}; use cumulus_primitives_parachain_inherent::MockValidationDataInherentDataProvider; @@ -40,17 +40,18 @@ use sc_executor::NativeElseWasmExecutor; use sc_network::NetworkService; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, Role, TFullBackend, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; -use sp_consensus::SlotData; use sp_consensus_aura::sr25519::{AuthorityId as AuraId, AuthorityPair as AuraPair}; use sp_keystore::SyncCryptoStorePtr; use sp_runtime::traits::BlakeTwo256; use sp_trie::PrefixedMemoryDB; use substrate_prometheus_endpoint::Registry; +use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; use std::{sync::Arc, time::Duration}; pub use client::*; +use polkadot_service::CollatorPair; pub use sc_service::{ config::{DatabaseSource, PrometheusConfig}, ChainSpec, @@ -267,7 +268,7 @@ where ) } else { // aura import queue - let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration(); + let slot_duration = sc_consensus_aura::slot_duration(&*client)?; sc_consensus_aura::import_queue::(ImportQueueParams { block_import: client.clone(), @@ -276,7 +277,7 @@ where create_inherent_data_providers: move |_, ()| async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *timestamp, slot_duration, ); @@ -300,9 +301,9 @@ where create_inherent_data_providers: move |_, _| async move { let time = sp_timestamp::InherentDataProvider::from_system_time(); - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *time, - slot_duration.slot_duration(), + slot_duration, ); Ok((time, slot)) @@ -327,6 +328,22 @@ where }) } +async fn build_relay_chain_interface( + polkadot_config: Configuration, + parachain_config: &Configuration, + telemetry_worker_handle: Option, + task_manager: &mut TaskManager, + collator_options: CollatorOptions, +) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option)> { + match collator_options.relay_chain_rpc_url { + Some(relay_chain_url) => Ok(( + Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>, + None, + )), + None => build_inprocess_relay_chain(polkadot_config, parachain_config, telemetry_worker_handle, task_manager), + } +} + /// Start a node with the given parachain `Configuration` and relay chain /// `Configuration`. /// @@ -336,6 +353,7 @@ where async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, + collator_options: CollatorOptions, id: ParaId, _rpc_ext_builder: RB, build_consensus: BIC, @@ -375,13 +393,25 @@ where let backend = params.backend.clone(); let mut task_manager = params.task_manager; - let (relay_chain_interface, collator_key) = - build_relay_chain_interface(polkadot_config, telemetry_worker_handle, &mut task_manager).map_err( - |e| match e { - polkadot_service::Error::Sub(x) => x, - s => format!("{}", s).into(), - }, - )?; + let (relay_chain_interface, collator_key) = build_relay_chain_interface( + polkadot_config, + ¶chain_config, + telemetry_worker_handle, + &mut task_manager, + collator_options.clone(), + ) + .await + .map_err(|e| match e { + RelayChainError::ServiceError(polkadot_service::Error::Sub(x)) => x, + s => s.to_string().into(), + })?; + // let (relay_chain_interface, collator_key) = + // build_relay_chain_interface(polkadot_config, telemetry_worker_handle, &mut task_manager).map_err( + // |e| match e { + // polkadot_service::Error::Sub(x) => x, + // s => format!("{}", s).into(), + // }, + // )?; let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id); let force_authoring = parachain_config.force_authoring; @@ -469,7 +499,7 @@ where spawner, parachain_consensus, import_queue, - collator_key, + collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, }; @@ -483,6 +513,7 @@ where relay_chain_interface, import_queue, relay_chain_slot_duration, + collator_options, }; start_full_node(params)?; @@ -497,6 +528,7 @@ where pub async fn start_node( parachain_config: Configuration, polkadot_config: Configuration, + collator_options: CollatorOptions, id: ParaId, ) -> sc_service::error::Result<(TaskManager, Arc>)> where @@ -508,6 +540,7 @@ where start_node_impl( parachain_config, polkadot_config, + collator_options, id, |_| Ok(Default::default()), |client, @@ -553,9 +586,9 @@ where let time = sp_timestamp::InherentDataProvider::from_system_time(); - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *time, - slot_duration.slot_duration(), + slot_duration, ); let parachain_inherent = parachain_inherent.ok_or_else(|| { @@ -750,7 +783,7 @@ fn inner_mandala_dev(config: Configuration, instant_sealing: bool) -> Result(StartAuraParams { slot_duration: sc_consensus_aura::slot_duration(&*client)?, client: client.clone(), @@ -760,7 +793,7 @@ fn inner_mandala_dev(config: Configuration, instant_sealing: bool) -> Result Date: Wed, 23 Mar 2022 23:20:23 +0800 Subject: [PATCH 03/25] remove ethers --- Cargo.lock | 1430 ++++------------- Cargo.toml | 5 +- node/service/Cargo.toml | 6 +- node/service/src/chain_spec/mandala.rs | 77 +- node/service/src/lib.rs | 7 - .../src/relaychain/kusama_test_net.rs | 2 +- .../integration-tests/src/xcm_interface.rs | 8 +- 7 files changed, 407 insertions(+), 1128 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2687649234..c43336ade2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,7 +35,7 @@ dependencies = [ "frame-benchmarking-cli", "log", "orml-build-script-utils", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-cli", "polkadot-parachain", "polkadot-primitives", @@ -56,7 +56,7 @@ dependencies = [ "clap 3.1.6", "derive_more", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-cli", "sc-client-api", "sc-service", @@ -78,7 +78,7 @@ dependencies = [ "num_enum", "nutsfinance-stable-asset", "orml-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "paste", "scale-info", @@ -101,7 +101,7 @@ dependencies = [ "orml-oracle-rpc", "orml-tokens-rpc", "pallet-transaction-payment-rpc", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "runtime-common", "sc-client-api", "sc-consensus-manual-seal", @@ -201,7 +201,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "runtime-common", "scale-info", @@ -236,6 +236,8 @@ dependencies = [ "acala-rpc", "acala-runtime", "async-trait", + "coins-bip32", + "coins-bip39", "cumulus-client-cli", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", @@ -250,13 +252,14 @@ dependencies = [ "cumulus-relay-chain-rpc-interface", "cumulus-test-relay-sproof-builder", "ecosystem-renvm-bridge", - "ethers", + "elliptic-curve", "frame-benchmarking", "frame-system-rpc-runtime-api", "futures 0.3.21", "hex", "hex-literal", "jsonrpc-core", + "k256", "karura-runtime", "log", "mandala-runtime", @@ -267,7 +270,7 @@ dependencies = [ "orml-oracle-rpc", "orml-tokens-rpc", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-service", "runtime-common", @@ -308,6 +311,7 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "substrate-prometheus-endpoint", + "tiny-keccak", ] [[package]] @@ -355,7 +359,7 @@ dependencies = [ "aead", "aes", "cipher", - "ctr 0.8.0", + "ctr", "ghash", "subtle", ] @@ -613,17 +617,6 @@ dependencies = [ "syn", ] -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures 0.3.21", - "pharos", - "rustc_version 0.4.0", -] - [[package]] name = "asynchronous-codec" version = "0.5.0" @@ -800,7 +793,7 @@ dependencies = [ "futures 0.3.21", "hex", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-chain-spec", "sc-client-api", @@ -833,7 +826,7 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-rpc", "sc-utils", @@ -853,7 +846,7 @@ name = "beefy-primitives" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-api", "sp-application-crypto", @@ -921,18 +914,6 @@ dependencies = [ "radium 0.3.0", ] -[[package]] -name = "bitvec" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" -dependencies = [ - "funty 1.1.0", - "radium 0.6.2", - "tap", - "wyz 0.2.0", -] - [[package]] name = "bitvec" version = "1.0.0" @@ -942,7 +923,7 @@ dependencies = [ "funty 2.0.0", "radium 0.7.0", "tap", - "wyz 0.5.0", + "wyz", ] [[package]] @@ -1102,7 +1083,7 @@ source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf dependencies = [ "finality-grandpa", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -1118,7 +1099,7 @@ source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf dependencies = [ "bp-runtime", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-std", ] @@ -1133,7 +1114,7 @@ dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-std", @@ -1148,7 +1129,7 @@ dependencies = [ "bp-runtime", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-api", "sp-core", @@ -1166,7 +1147,7 @@ dependencies = [ "bp-polkadot-core", "bp-runtime", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "smallvec", "sp-api", "sp-runtime", @@ -1182,7 +1163,7 @@ dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -1200,7 +1181,7 @@ dependencies = [ "bp-header-chain", "ed25519-dalek", "finality-grandpa", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -1216,7 +1197,7 @@ dependencies = [ "bp-polkadot-core", "bp-rococo", "bp-runtime", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-runtime", "sp-std", @@ -1236,7 +1217,7 @@ dependencies = [ "pallet-bridge-grandpa", "pallet-bridge-messages", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-runtime", @@ -1317,9 +1298,6 @@ name = "bytes" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" -dependencies = [ - "serde", -] [[package]] name = "bzip2-sys" @@ -1539,16 +1517,17 @@ dependencies = [ [[package]] name = "coins-bip32" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b669993c632e5fec4a297085ec57381f53e4646c123cb77a7ca754e005c921" +checksum = "471b39eadc9323de375dce5eff149a5a1ebd21c67f1da34a56f87ee62191d4ea" dependencies = [ "bincode", "bs58", "coins-core", "digest 0.9.0", + "getrandom 0.2.5", "hmac 0.11.0", - "k256 0.9.5", + "k256", "lazy_static", "serde", "sha2 0.9.9", @@ -1557,9 +1536,9 @@ dependencies = [ [[package]] name = "coins-bip39" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38426029442f91bd49973d6f59f28e3dbb14e633e3019ac4ec6bce402c44f81c" +checksum = "8f473ea37dfc9d2cb94fdde50c3d41f28c3f384b367573d66386fea38d76d466" dependencies = [ "bitvec 0.17.4", "coins-bip32", @@ -1593,17 +1572,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi 0.3.9", -] - [[package]] name = "concurrent-queue" version = "1.2.2" @@ -1613,12 +1581,6 @@ dependencies = [ "cache-padded", ] -[[package]] -name = "const-oid" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" - [[package]] name = "const-oid" version = "0.7.1" @@ -1867,18 +1829,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto-bigint" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8658c15c5d921ddf980f7fe25b1e82f4b7a4083b2c4985fea4922edb8e43e07d" -dependencies = [ - "generic-array 0.14.5", - "rand_core 0.6.3", - "subtle", - "zeroize", -] - [[package]] name = "crypto-bigint" version = "0.3.2" @@ -1962,15 +1912,6 @@ dependencies = [ "syn", ] -[[package]] -name = "ctr" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481" -dependencies = [ - "cipher", -] - [[package]] name = "ctr" version = "0.8.0" @@ -2012,7 +1953,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -2035,7 +1976,7 @@ dependencies = [ "cumulus-client-consensus-common", "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -2064,7 +2005,7 @@ dependencies = [ "cumulus-relay-chain-interface", "dyn-clone", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sc-client-api", "sc-consensus", @@ -2110,7 +2051,7 @@ dependencies = [ "derive_more", "futures 0.3.21", "futures-timer", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-parachain", @@ -2134,7 +2075,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -2160,7 +2101,7 @@ dependencies = [ "cumulus-client-pov-recovery", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-overseer", "polkadot-primitives", @@ -2188,7 +2129,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-aura", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-application-crypto", @@ -2206,7 +2147,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-io", "sp-runtime", @@ -2229,7 +2170,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "scale-info", "serde", @@ -2264,7 +2205,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-runtime", "sp-std", ] @@ -2277,7 +2218,7 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-io", @@ -2295,7 +2236,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.3.1", "scale-info", "sp-runtime", @@ -2313,7 +2254,7 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-runtime", @@ -2327,7 +2268,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2346,7 +2287,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-test-relay-sproof-builder", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "scale-info", "sp-api", @@ -2367,7 +2308,7 @@ source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d762 dependencies = [ "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-inherents", "sp-std", "sp-timestamp", @@ -2380,7 +2321,7 @@ source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d762 dependencies = [ "cumulus-primitives-core", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2428,7 +2369,7 @@ dependencies = [ "derive_more", "futures 0.3.21", "jsonrpsee-core 0.9.0", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-overseer", "polkadot-service", @@ -2454,7 +2395,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "jsonrpsee 0.9.0", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-service", "sc-client-api", @@ -2474,7 +2415,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech//cumulus?rev=b1e91afb7421309b203d7627b736d9bcf58260eb#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sp-runtime", "sp-state-machine", @@ -2541,22 +2482,13 @@ dependencies = [ "syn", ] -[[package]] -name = "der" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4" -dependencies = [ - "const-oid 0.6.2", -] - [[package]] name = "der" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" dependencies = [ - "const-oid 0.7.1", + "const-oid", ] [[package]] @@ -2709,26 +2641,15 @@ dependencies = [ "test-service", ] -[[package]] -name = "ecdsa" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ee23aa5b4f68c7a092b5c3beb25f50c406adc75e2363634f242f28ab255372" -dependencies = [ - "der 0.4.5", - "elliptic-curve 0.10.4", - "hmac 0.11.0", - "signature", -] - [[package]] name = "ecdsa" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" dependencies = [ - "der 0.5.1", - "elliptic-curve 0.11.12", + "der", + "elliptic-curve", + "rfc6979", "signature", ] @@ -2741,7 +2662,7 @@ dependencies = [ "frame-system", "module-support", "pallet-timestamp", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -2762,7 +2683,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -2783,7 +2704,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -2820,22 +2741,6 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -[[package]] -name = "elliptic-curve" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e5c176479da93a0983f0a6fdc3c1b8e7d5be0d7fe3fe05a99f15b96582b9a8" -dependencies = [ - "crypto-bigint 0.2.5", - "ff 0.10.1", - "generic-array 0.14.5", - "group 0.10.0", - "pkcs8 0.7.6", - "rand_core 0.6.3", - "subtle", - "zeroize", -] - [[package]] name = "elliptic-curve" version = "0.11.12" @@ -2843,26 +2748,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" dependencies = [ "base16ct", - "crypto-bigint 0.3.2", - "der 0.5.1", - "ff 0.11.0", + "crypto-bigint", + "der", + "ff", "generic-array 0.14.5", - "group 0.11.0", + "group", "rand_core 0.6.3", "sec1", "subtle", "zeroize", ] -[[package]] -name = "encoding_rs" -version = "0.8.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" -dependencies = [ - "cfg-if 1.0.0", -] - [[package]] name = "enum-as-inner" version = "0.3.4" @@ -2947,70 +2843,19 @@ dependencies = [ "libc", ] -[[package]] -name = "eth-keystore" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d47d900a7dea08593d398104f8288e37858b0ad714c8d08cd03fdb86563e6402" -dependencies = [ - "aes", - "ctr 0.7.0", - "digest 0.9.0", - "hex", - "hmac 0.11.0", - "pbkdf2 0.8.0", - "rand 0.8.5", - "scrypt", - "serde", - "serde_json", - "sha2 0.9.9", - "sha3 0.9.1", - "thiserror", - "uuid", -] - -[[package]] -name = "ethabi" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76ef192b63e8a44b3d08832acebbb984c3fba154b5c26f70037c860202a0d4b" -dependencies = [ - "anyhow", - "ethereum-types 0.12.1", - "hex", - "serde", - "serde_json", - "sha3 0.9.1", - "thiserror", - "uint", -] - [[package]] name = "ethabi" version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b69517146dfab88e9238c00c724fd8e277951c3cc6f22b016d72f422a832213e" dependencies = [ - "ethereum-types 0.13.1", + "ethereum-types", "hex", "sha3 0.10.1", "thiserror", "uint", ] -[[package]] -name = "ethbloom" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8" -dependencies = [ - "crunchy", - "fixed-hash", - "impl-rlp", - "impl-serde", - "tiny-keccak", -] - [[package]] name = "ethbloom" version = "0.12.1" @@ -3019,7 +2864,7 @@ checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef" dependencies = [ "crunchy", "fixed-hash", - "impl-codec 0.6.0", + "impl-codec", "impl-rlp", "impl-serde", "scale-info", @@ -3033,10 +2878,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23750149fe8834c0e24bb9adcbacbe06c45b9861f15df53e09f26cb7c4ab91ef" dependencies = [ "bytes 1.1.0", - "ethereum-types 0.13.1", + "ethereum-types", "hash-db", "hash256-std-hasher", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rlp", "rlp-derive", "scale-info", @@ -3051,10 +2896,10 @@ version = "0.12.0" source = "git+https://github.com/rust-blockchain/ethereum?rev=755dffaa4903fbec1269f50cde9863cf86269a14#755dffaa4903fbec1269f50cde9863cf86269a14" dependencies = [ "bytes 1.1.0", - "ethereum-types 0.13.1", + "ethereum-types", "hash-db", "hash256-std-hasher", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rlp", "rlp-derive", "scale-info", @@ -3063,249 +2908,22 @@ dependencies = [ "triehash", ] -[[package]] -name = "ethereum-types" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf" -dependencies = [ - "ethbloom 0.11.1", - "fixed-hash", - "impl-rlp", - "impl-serde", - "primitive-types 0.10.1", - "uint", -] - [[package]] name = "ethereum-types" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6" dependencies = [ - "ethbloom 0.12.1", + "ethbloom", "fixed-hash", - "impl-codec 0.6.0", + "impl-codec", "impl-rlp", "impl-serde", - "primitive-types 0.11.1", + "primitive-types", "scale-info", "uint", ] -[[package]] -name = "ethers" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59989141d334913ea2784f923e014ff9f7da373455aa12f884ab5f71378eb465" -dependencies = [ - "ethers-contract", - "ethers-core", - "ethers-etherscan", - "ethers-middleware", - "ethers-providers", - "ethers-signers", - "ethers-solc", -] - -[[package]] -name = "ethers-contract" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c49f7c627973e1fcb46404d7846b3bc6c2a7a33616628258f61d26c6e6b89a" -dependencies = [ - "ethers-contract-abigen", - "ethers-contract-derive", - "ethers-core", - "ethers-providers", - "futures-util", - "hex", - "once_cell", - "pin-project 1.0.10", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "ethers-contract-abigen" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658ab90a1fc5f338e8bf6fa6cd614ef4c8d573da40d0c89f45d21c595bda5f3b" -dependencies = [ - "Inflector", - "anyhow", - "cfg-if 1.0.0", - "ethers-core", - "getrandom 0.2.5", - "hex", - "once_cell", - "proc-macro2", - "quote", - "reqwest", - "serde", - "serde_json", - "syn", - "url 2.2.2", -] - -[[package]] -name = "ethers-contract-derive" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f974650dae34a335f3e2f32166be0739d7f87c3825842ad6f8195164cb5ea433" -dependencies = [ - "ethers-contract-abigen", - "ethers-core", - "hex", - "proc-macro2", - "quote", - "serde_json", - "syn", -] - -[[package]] -name = "ethers-core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f15e1a2a54bc6bc3f8ea94afafbb374264f8322fcacdae06fefda80a206739ac" -dependencies = [ - "arrayvec 0.7.2", - "bytes 1.1.0", - "cargo_metadata", - "convert_case", - "ecdsa 0.12.4", - "elliptic-curve 0.11.12", - "ethabi 15.0.0", - "generic-array 0.14.5", - "hex", - "k256 0.9.5", - "once_cell", - "proc-macro2", - "quote", - "rand 0.8.5", - "rlp", - "rlp-derive", - "serde", - "serde_json", - "syn", - "thiserror", - "tiny-keccak", -] - -[[package]] -name = "ethers-etherscan" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6bfff9fc96e83d3a25390fe7a505b6c1ae4290314251bf0825cfed90d1b750" -dependencies = [ - "ethers-core", - "reqwest", - "serde", - "serde-aux", - "serde_json", - "thiserror", -] - -[[package]] -name = "ethers-middleware" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3831e5e98736715e848ec966dd76ce216a8e4f531f7d3e09ef43eead1c63df" -dependencies = [ - "async-trait", - "ethers-contract", - "ethers-core", - "ethers-etherscan", - "ethers-providers", - "ethers-signers", - "futures-util", - "instant", - "reqwest", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "url 2.2.2", -] - -[[package]] -name = "ethers-providers" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68d511a99f39a26c9b32a6f62360789ba0e214d8f4c012bf1fbdc7b00da0e4f" -dependencies = [ - "async-trait", - "auto_impl", - "ethers-core", - "futures-channel", - "futures-core", - "futures-timer", - "futures-util", - "hex", - "parking_lot 0.11.2", - "pin-project 1.0.10", - "reqwest", - "serde", - "serde_json", - "thiserror", - "tracing", - "tracing-futures", - "url 2.2.2", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-timer", - "web-sys", - "ws_stream_wasm", -] - -[[package]] -name = "ethers-signers" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e76778f397d5185bb09d9ea4238f41880394e4fb3b6d5fdc75541c0a70df55" -dependencies = [ - "async-trait", - "coins-bip32", - "coins-bip39", - "elliptic-curve 0.11.12", - "eth-keystore", - "ethers-core", - "futures-executor", - "futures-util", - "hex", - "rand 0.8.5", - "semver 1.0.6", - "sha2 0.9.9", - "thiserror", -] - -[[package]] -name = "ethers-solc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b73d8386c8a965c90a4fd3accea7e409d20051f613950efa9c442560bd4f03" -dependencies = [ - "colored", - "ethers-core", - "getrandom 0.2.5", - "glob", - "hex", - "home", - "md-5", - "once_cell", - "regex", - "semver 1.0.6", - "serde", - "serde_json", - "sha2 0.9.9", - "thiserror", - "tracing", - "walkdir", -] - [[package]] name = "event-listener" version = "2.5.2" @@ -3324,8 +2942,8 @@ dependencies = [ "evm-gasometer", "evm-runtime", "log", - "parity-scale-codec 3.1.2", - "primitive-types 0.11.1", + "parity-scale-codec", + "primitive-types", "rlp", "scale-info", "serde", @@ -3338,8 +2956,8 @@ version = "0.33.0" source = "git+https://github.com/AcalaNetwork/evm?rev=a56d8af9787f0550cb4c4ab3955e81f1741d9e7c#a56d8af9787f0550cb4c4ab3955e81f1741d9e7c" dependencies = [ "funty 1.1.0", - "parity-scale-codec 3.1.2", - "primitive-types 0.11.1", + "parity-scale-codec", + "primitive-types", "scale-info", "serde", ] @@ -3352,7 +2970,7 @@ dependencies = [ "environmental", "evm-core", "evm-runtime", - "primitive-types 0.11.1", + "primitive-types", ] [[package]] @@ -3387,7 +3005,7 @@ dependencies = [ "auto_impl", "environmental", "evm-core", - "primitive-types 0.11.1", + "primitive-types", "sha3 0.8.2", ] @@ -3479,16 +3097,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ff" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f" -dependencies = [ - "rand_core 0.6.3", - "subtle", -] - [[package]] name = "ff" version = "0.11.0" @@ -3520,7 +3128,7 @@ dependencies = [ "futures-timer", "log", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.11.2", "scale-info", ] @@ -3562,27 +3170,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "fork-tree" version = "3.0.0" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", ] [[package]] @@ -3604,7 +3197,7 @@ dependencies = [ "frame-system", "linregress", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", "scale-info", "serde", @@ -3635,7 +3228,7 @@ dependencies = [ "linked-hash-map", "log", "memory-db", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.8.5", "sc-cli", "sc-client-api", @@ -3665,7 +3258,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-arithmetic", "sp-npos-elections", @@ -3679,7 +3272,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -3695,7 +3288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", ] @@ -3711,7 +3304,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "once_cell", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", "scale-info", "serde", @@ -3770,7 +3363,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "frame-support", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -3788,7 +3381,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-runtime", @@ -3800,7 +3393,7 @@ name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", ] @@ -4103,24 +3696,13 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "group" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" -dependencies = [ - "ff 0.10.1", - "rand_core 0.6.3", - "subtle", -] - [[package]] name = "group" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" dependencies = [ - "ff 0.11.0", + "ff", "rand_core 0.6.3", "subtle", ] @@ -4270,15 +3852,6 @@ dependencies = [ "hmac 0.8.1", ] -[[package]] -name = "home" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "hostname" version = "0.3.1" @@ -4387,19 +3960,6 @@ dependencies = [ "webpki-roots 0.22.2", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes 1.1.0", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "idna" version = "0.1.5" @@ -4452,20 +4012,11 @@ dependencies = [ "async-io", "futures 0.3.21", "futures-lite", - "if-addrs", - "ipnet", - "libc", - "log", - "winapi 0.3.9", -] - -[[package]] -name = "impl-codec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" -dependencies = [ - "parity-scale-codec 2.3.1", + "if-addrs", + "ipnet", + "libc", + "log", + "winapi 0.3.9", ] [[package]] @@ -4474,7 +4025,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", ] [[package]] @@ -4524,9 +4075,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", ] [[package]] @@ -4577,7 +4125,7 @@ dependencies = [ "socket2 0.3.19", "widestring", "winapi 0.3.9", - "winreg 0.6.2", + "winreg", ] [[package]] @@ -5015,19 +4563,6 @@ dependencies = [ "jsonrpsee-types 0.9.0", ] -[[package]] -name = "k256" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008b0281ca8032567c9711cd48631781c15228301860a39b32deb28d63125e46" -dependencies = [ - "cfg-if 1.0.0", - "ecdsa 0.12.4", - "elliptic-curve 0.10.4", - "sha2 0.9.9", - "sha3 0.9.1", -] - [[package]] name = "k256" version = "0.10.4" @@ -5035,9 +4570,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" dependencies = [ "cfg-if 1.0.0", - "ecdsa 0.13.4", - "elliptic-curve 0.11.12", + "ecdsa", + "elliptic-curve", "sec1", + "sha2 0.9.9", + "sha3 0.9.1", ] [[package]] @@ -5127,7 +4664,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "runtime-common", "scale-info", @@ -5226,7 +4763,7 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -5682,7 +5219,7 @@ dependencies = [ "log", "pin-project 1.0.10", "rand 0.7.3", - "salsa20 0.9.0", + "salsa20", "sha3 0.9.1", ] @@ -6176,7 +5713,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "runtime-common", "scale-info", @@ -6240,17 +5777,6 @@ dependencies = [ "rawpointer", ] -[[package]] -name = "md-5" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "opaque-debug 0.3.0", -] - [[package]] name = "memchr" version = "2.4.1" @@ -6345,12 +5871,6 @@ dependencies = [ "thrift", ] -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -6448,7 +5968,7 @@ dependencies = [ "orml-utilities", "pallet-balances", "pallet-timestamp", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "serde_json", @@ -6476,7 +5996,7 @@ dependencies = [ "orml-traits", "orml-utilities", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6502,7 +6022,7 @@ dependencies = [ "orml-utilities", "pallet-balances", "pallet-timestamp", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", "serde", @@ -6527,7 +6047,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6550,7 +6070,7 @@ dependencies = [ "pallet-balances", "pallet-session", "pallet-timestamp", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-consensus-aura", @@ -6578,7 +6098,7 @@ dependencies = [ "orml-utilities", "pallet-balances", "pallet-timestamp", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "serde_json", @@ -6599,7 +6119,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6619,7 +6139,7 @@ dependencies = [ "module-support", "orml-traits", "pallet-timestamp", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6638,7 +6158,7 @@ dependencies = [ "module-support", "orml-traits", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", "scale-info", "serde", @@ -6662,7 +6182,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6691,8 +6211,8 @@ dependencies = [ "orml-traits", "pallet-balances", "pallet-timestamp", - "parity-scale-codec 3.1.2", - "primitive-types 0.11.1", + "parity-scale-codec", + "primitive-types", "ripemd160", "rlp", "scale-info", @@ -6721,7 +6241,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6735,7 +6255,7 @@ name = "module-evm-bridge" version = "2.4.1" dependencies = [ "acala-primitives", - "ethereum-types 0.13.1", + "ethereum-types", "frame-support", "frame-system", "hex", @@ -6746,8 +6266,8 @@ dependencies = [ "num_enum", "pallet-balances", "pallet-timestamp", - "parity-scale-codec 3.1.2", - "primitive-types 0.11.1", + "parity-scale-codec", + "primitive-types", "scale-info", "serde", "serde_json", @@ -6797,7 +6317,7 @@ version = "2.4.1" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6818,7 +6338,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-arithmetic", "sp-core", @@ -6844,7 +6364,7 @@ dependencies = [ "orml-traits", "pallet-balances", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-arithmetic", "sp-core", @@ -6868,7 +6388,7 @@ dependencies = [ "orml-traits", "orml-utilities", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6893,7 +6413,7 @@ dependencies = [ "orml-traits", "pallet-balances", "pallet-timestamp", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6910,7 +6430,7 @@ dependencies = [ "frame-support", "frame-system", "module-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6931,7 +6451,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6953,7 +6473,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6978,7 +6498,7 @@ dependencies = [ "pallet-balances", "pallet-proxy", "pallet-utility", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -6999,7 +6519,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -7018,7 +6538,7 @@ dependencies = [ "module-support", "orml-tokens", "orml-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -7036,7 +6556,7 @@ dependencies = [ "frame-support", "frame-system", "module-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "sp-core", "sp-io", @@ -7053,7 +6573,7 @@ dependencies = [ "frame-system", "log", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-io", @@ -7069,7 +6589,7 @@ dependencies = [ "acala-primitives", "frame-support", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -7088,7 +6608,7 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "smallvec", "sp-core", @@ -7112,7 +6632,7 @@ dependencies = [ "pallet-balances", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "smallvec", @@ -7141,7 +6661,7 @@ dependencies = [ "orml-traits", "pallet-balances", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -7288,24 +6808,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "native-tls" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "net2" version = "0.2.37" @@ -7496,7 +6998,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -7563,39 +7065,12 @@ dependencies = [ "syn", ] -[[package]] -name = "openssl" -version = "0.10.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-sys", -] - [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-sys" -version = "0.9.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "ordered-float" version = "1.1.1" @@ -7612,7 +7087,7 @@ dependencies = [ "frame-support", "frame-system", "orml-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -7628,7 +7103,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-scheduler", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -7648,7 +7123,7 @@ dependencies = [ "frame-benchmarking", "hash-db", "linregress", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "paste", "rand 0.8.5", @@ -7680,7 +7155,7 @@ dependencies = [ "frame-system", "hex-literal", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", "scale-info", "serde", @@ -7709,7 +7184,7 @@ dependencies = [ "orml-traits", "orml-utilities", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -7724,7 +7199,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -7739,7 +7214,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -7756,7 +7231,7 @@ dependencies = [ "frame-system", "orml-traits", "orml-utilities", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-application-crypto", @@ -7774,7 +7249,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "orml-oracle-rpc-runtime-api", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-blockchain", "sp-runtime", @@ -7784,7 +7259,7 @@ dependencies = [ name = "orml-oracle-rpc-runtime-api" version = "0.4.1-dev" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-std", ] @@ -7796,7 +7271,7 @@ dependencies = [ "frame-support", "frame-system", "orml-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -7814,7 +7289,7 @@ dependencies = [ "orml-traits", "pallet-elections-phragmen", "pallet-treasury", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -7832,7 +7307,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "orml-tokens-rpc-runtime-api", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-blockchain", "sp-core", @@ -7846,7 +7321,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "orml-tokens", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-runtime", ] @@ -7859,7 +7334,7 @@ dependencies = [ "impl-trait-for-tuples", "num-traits", "orml-utilities", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-io", @@ -7875,7 +7350,7 @@ dependencies = [ "frame-support", "frame-system", "orml-xcm-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -7891,7 +7366,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "serde_json", @@ -7907,7 +7382,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -7923,7 +7398,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-io", @@ -7939,7 +7414,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-std", "xcm", @@ -7952,7 +7427,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "orml-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-runtime", "sp-std", "xcm", @@ -7976,7 +7451,7 @@ dependencies = [ "pallet-balances", "pallet-xcm", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-runtime-parachains", "scale-info", @@ -8017,7 +7492,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -8034,7 +7509,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-runtime", "sp-std", @@ -8048,7 +7523,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-timestamp", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-application-crypto", "sp-consensus-aura", @@ -8064,7 +7539,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-application-crypto", "sp-authority-discovery", @@ -8080,7 +7555,7 @@ dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-authorship", "sp-runtime", @@ -8099,7 +7574,7 @@ dependencies = [ "pallet-authorship", "pallet-session", "pallet-timestamp", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-application-crypto", "sp-consensus-babe", @@ -8122,7 +7597,7 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -8140,7 +7615,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-runtime", "sp-std", @@ -8155,7 +7630,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-runtime", @@ -8172,13 +7647,13 @@ dependencies = [ "frame-support", "frame-system", "hex", - "k256 0.10.4", + "k256", "log", "pallet-beefy", "pallet-mmr", "pallet-mmr-primitives", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -8197,7 +7672,7 @@ dependencies = [ "frame-system", "log", "pallet-treasury", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -8215,7 +7690,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-runtime", @@ -8235,7 +7710,7 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-finality-grandpa", @@ -8257,7 +7732,7 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -8276,7 +7751,7 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.8.5", "scale-info", "serde", @@ -8294,7 +7769,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -8310,7 +7785,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-io", @@ -8328,7 +7803,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.7.3", "scale-info", "sp-arithmetic", @@ -8350,7 +7825,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -8367,7 +7842,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-arithmetic", "sp-runtime", @@ -8385,7 +7860,7 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-application-crypto", "sp-core", @@ -8406,7 +7881,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-io", "sp-runtime", @@ -8423,7 +7898,7 @@ dependencies = [ "frame-system", "log", "pallet-authorship", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-application-crypto", "sp-core", @@ -8441,7 +7916,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -8459,7 +7934,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -8477,7 +7952,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-mmr-primitives", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -8493,7 +7968,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "sp-api", "sp-core", @@ -8510,7 +7985,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "pallet-mmr-primitives", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "sp-api", "sp-blockchain", @@ -8526,7 +8001,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-io", "sp-runtime", @@ -8540,7 +8015,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-io", "sp-runtime", @@ -8556,7 +8031,7 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-runtime", @@ -8580,7 +8055,7 @@ dependencies = [ "pallet-offences", "pallet-session", "pallet-staking", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-runtime", "sp-staking", @@ -8595,7 +8070,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -8611,7 +8086,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-io", "sp-runtime", @@ -8625,7 +8100,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-io", "sp-runtime", @@ -8641,7 +8116,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-io", "sp-runtime", @@ -8658,7 +8133,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-timestamp", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -8692,7 +8167,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", "sp-runtime", @@ -8711,7 +8186,7 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", "serde", @@ -8749,7 +8224,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-io", "sp-runtime", @@ -8765,7 +8240,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-inherents", "sp-io", @@ -8784,7 +8259,7 @@ dependencies = [ "frame-system", "log", "pallet-treasury", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -8800,7 +8275,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "smallvec", @@ -8819,7 +8294,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-blockchain", "sp-core", @@ -8833,7 +8308,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "pallet-transaction-payment", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-runtime", ] @@ -8848,7 +8323,7 @@ dependencies = [ "frame-system", "impl-trait-for-tuples", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-runtime", @@ -8864,7 +8339,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-runtime", "sp-std", @@ -8878,7 +8353,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-io", @@ -8895,7 +8370,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-runtime", "sp-std", @@ -8909,7 +8384,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -8928,7 +8403,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-runtime", "sp-std", @@ -8944,7 +8419,7 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", ] @@ -8962,7 +8437,7 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "scale-info", @@ -8995,20 +8470,6 @@ dependencies = [ "snap", ] -[[package]] -name = "parity-scale-codec" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" -dependencies = [ - "arrayvec 0.7.2", - "bitvec 0.20.4", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive 2.3.1", - "serde", -] - [[package]] name = "parity-scale-codec" version = "3.1.2" @@ -9019,22 +8480,10 @@ dependencies = [ "bitvec 1.0.0", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.1.2", + "parity-scale-codec-derive", "serde", ] -[[package]] -name = "parity-scale-codec-derive" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" -dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "parity-scale-codec-derive" version = "3.1.2" @@ -9078,7 +8527,7 @@ dependencies = [ "impl-trait-for-tuples", "parity-util-mem-derive", "parking_lot 0.12.0", - "primitive-types 0.11.1", + "primitive-types", "smallvec", "tikv-jemalloc-ctl", "tikv-jemallocator", @@ -9293,16 +8742,6 @@ dependencies = [ "indexmap", ] -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures 0.3.21", - "rustc_version 0.4.0", -] - [[package]] name = "pin-project" version = "0.4.29" @@ -9361,24 +8800,14 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" -dependencies = [ - "der 0.4.5", - "spki 0.4.1", -] - [[package]] name = "pkcs8" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" dependencies = [ - "der 0.5.1", - "spki 0.5.4", + "der", + "spki", "zeroize", ] @@ -9464,7 +8893,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.3", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -9486,7 +8915,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.3", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -9579,7 +9008,7 @@ name = "polkadot-core-primitives" version = "0.9.18" source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "scale-info", "sp-core", @@ -9596,7 +9025,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.3", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -9615,7 +9044,7 @@ name = "polkadot-erasure-coding" version = "0.9.18" source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", @@ -9651,7 +9080,7 @@ source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-network-protocol", "polkadot-node-subsystem", @@ -9669,7 +9098,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -9693,7 +9122,7 @@ dependencies = [ "kvdb", "lru 0.7.3", "merlin", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -9718,7 +9147,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -9769,7 +9198,7 @@ source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf dependencies = [ "async-trait", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -9803,7 +9232,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "kvdb", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -9821,7 +9250,7 @@ dependencies = [ "futures 0.3.21", "kvdb", "lru 0.7.3", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -9876,7 +9305,7 @@ dependencies = [ "async-std", "futures 0.3.21", "futures-timer", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "pin-project 1.0.10", "polkadot-core-primitives", "polkadot-node-subsystem-util", @@ -9938,7 +9367,7 @@ dependencies = [ "lazy_static", "log", "mick-jaeger", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-node-primitives", "polkadot-primitives", @@ -9957,7 +9386,7 @@ dependencies = [ "futures-timer", "log", "metered-channel", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sc-cli", "sc-service", @@ -9974,7 +9403,7 @@ dependencies = [ "async-trait", "fatality", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", @@ -9991,7 +9420,7 @@ source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf dependencies = [ "bounded-vec", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "schnorrkel", @@ -10049,7 +9478,7 @@ dependencies = [ "lru 0.7.3", "metered-channel", "parity-db", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.2", "pin-project 1.0.10", @@ -10125,7 +9554,7 @@ source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf dependencies = [ "derive_more", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", "scale-info", @@ -10158,7 +9587,7 @@ dependencies = [ "bitvec 1.0.0", "frame-system", "hex-literal", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", @@ -10263,7 +9692,7 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", @@ -10321,7 +9750,7 @@ dependencies = [ "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-parachains", "rustc-hex", @@ -10360,7 +9789,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "bs58", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sp-std", "sp-tracing", @@ -10386,7 +9815,7 @@ dependencies = [ "pallet-staking", "pallet-timestamp", "pallet-vesting", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", @@ -10519,7 +9948,7 @@ dependencies = [ "fatality", "futures 0.3.21", "indexmap", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -10536,7 +9965,7 @@ name = "polkadot-statement-table" version = "0.9.18" source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sp-core", ] @@ -10572,7 +10001,7 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-vesting", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", @@ -10699,19 +10128,6 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -[[package]] -name = "primitive-types" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" -dependencies = [ - "fixed-hash", - "impl-codec 0.5.1", - "impl-rlp", - "impl-serde", - "uint", -] - [[package]] name = "primitive-types" version = "0.11.1" @@ -10719,7 +10135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", - "impl-codec 0.6.0", + "impl-codec", "impl-rlp", "impl-serde", "scale-info", @@ -10892,12 +10308,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" -[[package]] -name = "radium" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" - [[package]] name = "radium" version = "0.7.0" @@ -11136,7 +10546,7 @@ dependencies = [ "env_logger", "jsonrpsee 0.8.0", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "serde_json", "sp-core", @@ -11154,47 +10564,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "reqwest" -version = "0.11.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" -dependencies = [ - "base64 0.13.0", - "bytes 1.1.0", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls 0.23.0", - "hyper-tls", - "ipnet", - "js-sys", - "lazy_static", - "log", - "mime", - "native-tls", - "percent-encoding 2.1.0", - "pin-project-lite 0.2.8", - "rustls 0.20.4", - "rustls-pemfile 0.3.0", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.23.3", - "url 2.2.2", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.22.2", - "winreg 0.10.1", -] - [[package]] name = "resolv-conf" version = "0.7.0" @@ -11211,6 +10580,17 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" +[[package]] +name = "rfc6979" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" +dependencies = [ + "crypto-bigint", + "hmac 0.11.0", + "zeroize", +] + [[package]] name = "ring" version = "0.16.20" @@ -11313,7 +10693,7 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", @@ -11372,7 +10752,7 @@ dependencies = [ "acala-primitives", "acala-service", "cumulus-pallet-parachain-system", - "ethabi 17.0.0", + "ethabi", "frame-support", "frame-system", "hex-literal", @@ -11401,7 +10781,7 @@ dependencies = [ "pallet-scheduler", "pallet-timestamp", "pallet-utility", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "serde_json", @@ -11509,7 +10889,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-parachains", @@ -11634,7 +11014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" dependencies = [ "openssl-probe", - "rustls-pemfile 0.2.1", + "rustls-pemfile", "schannel", "security-framework", ] @@ -11648,15 +11028,6 @@ dependencies = [ "base64 0.13.0", ] -[[package]] -name = "rustls-pemfile" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" -dependencies = [ - "base64 0.13.0", -] - [[package]] name = "rustversion" version = "1.0.6" @@ -11680,15 +11051,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" -[[package]] -name = "salsa20" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecbd2eb639fd7cab5804a0837fe373cc2172d15437e804c054a9fb885cb923b0" -dependencies = [ - "cipher", -] - [[package]] name = "salsa20" version = "0.9.0" @@ -11729,7 +11091,7 @@ dependencies = [ "ip_network", "libp2p", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "prost", "prost-build", "rand 0.7.3", @@ -11753,7 +11115,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", @@ -11773,7 +11135,7 @@ name = "sc-block-builder" version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sp-api", "sp-block-builder", @@ -11791,7 +11153,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.3", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-chain-spec-derive", "sc-network", "sc-telemetry", @@ -11825,7 +11187,7 @@ dependencies = [ "libp2p", "log", "names", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.7.3", "regex", "rpassword", @@ -11859,7 +11221,7 @@ dependencies = [ "futures 0.3.21", "hash-db", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-executor", "sc-transaction-pool-api", @@ -11890,7 +11252,7 @@ dependencies = [ "linked-hash-map", "log", "parity-db", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-client-api", "sc-state-db", @@ -11935,7 +11297,7 @@ dependencies = [ "async-trait", "futures 0.3.21", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -11969,7 +11331,7 @@ dependencies = [ "num-bigint 0.2.6", "num-rational 0.2.4", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "rand 0.7.3", "retain_mut", @@ -12029,7 +11391,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "fork-tree", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-blockchain", @@ -12048,7 +11410,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -12081,7 +11443,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-telemetry", @@ -12115,7 +11477,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "lazy_static", "lru 0.6.6", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-executor-common", "sc-executor-wasmi", @@ -12141,7 +11503,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-allocator", "sp-core", "sp-maybe-compressed-blob", @@ -12158,7 +11520,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-allocator", "sc-executor-common", "scoped-tls", @@ -12176,7 +11538,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", @@ -12200,7 +11562,7 @@ dependencies = [ "futures-timer", "hex", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "rand 0.8.5", "sc-block-builder", @@ -12238,7 +11600,7 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-finality-grandpa", "sc-rpc", @@ -12304,7 +11666,7 @@ dependencies = [ "linked_hash_set", "log", "lru 0.7.3", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "pin-project 1.0.10", "prost", @@ -12362,7 +11724,7 @@ dependencies = [ "hyper-rustls 0.22.1", "num_cpus", "once_cell", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", @@ -12408,7 +11770,7 @@ dependencies = [ "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-block-builder", "sc-chain-spec", @@ -12440,7 +11802,7 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sc-chain-spec", "sc-transaction-pool-api", @@ -12485,7 +11847,7 @@ dependencies = [ "jsonrpc-core", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.0", "pin-project 1.0.10", @@ -12541,7 +11903,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", "parking_lot 0.12.0", @@ -12557,7 +11919,7 @@ dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", @@ -12639,7 +12001,7 @@ dependencies = [ "futures-timer", "linked-hash-map", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.0", "retain_mut", @@ -12692,7 +12054,7 @@ dependencies = [ "bitvec 1.0.0", "cfg-if 1.0.0", "derive_more", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info-derive", "serde", ] @@ -12749,20 +12111,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scrypt" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879588d8f90906e73302547e20fffefdd240eb3e0e744e142321f5d49dea0518" -dependencies = [ - "base64ct", - "hmac 0.11.0", - "password-hash", - "pbkdf2 0.8.0", - "salsa20 0.8.1", - "sha2 0.9.9", -] - [[package]] name = "sct" version = "0.6.1" @@ -12789,9 +12137,9 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" dependencies = [ - "der 0.5.1", + "der", "generic-array 0.14.5", - "pkcs8 0.8.0", + "pkcs8", "subtle", "zeroize", ] @@ -12888,12 +12236,6 @@ dependencies = [ "pest", ] -[[package]] -name = "send_wrapper" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930c0acf610d3fdb5e2ab6213019aaa04e227ebe9547b0649ba599b16d788bd7" - [[package]] name = "serde" version = "1.0.136" @@ -12903,16 +12245,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-aux" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93abf9799c576f004252b2a05168d58527fb7c54de12e94b4d12fe3475ffad24" -dependencies = [ - "serde", - "serde_json", -] - [[package]] name = "serde_cbor" version = "0.11.2" @@ -12954,18 +12286,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.1", - "ryu", - "serde", -] - [[package]] name = "sha-1" version = "0.8.2" @@ -13014,7 +12334,6 @@ dependencies = [ "cpufeatures 0.2.2", "digest 0.9.0", "opaque-debug 0.3.0", - "sha2-asm", ] [[package]] @@ -13028,15 +12347,6 @@ dependencies = [ "digest 0.10.3", ] -[[package]] -name = "sha2-asm" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf27176fb5d15398e3a479c652c20459d9dac830dedd1fa55b42a77dbcdbfcea" -dependencies = [ - "cc", -] - [[package]] name = "sha3" version = "0.8.2" @@ -13140,7 +12450,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "enumn", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", "sp-runtime", "sp-std", @@ -13229,7 +12539,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "hash-db", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api-proc-macro", "sp-core", "sp-runtime", @@ -13256,7 +12566,7 @@ name = "sp-application-crypto" version = "6.0.0" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-core", @@ -13271,7 +12581,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-debug-derive", @@ -13284,7 +12594,7 @@ name = "sp-authority-discovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-api", "sp-application-crypto", @@ -13298,7 +12608,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-inherents", "sp-runtime", "sp-std", @@ -13309,7 +12619,7 @@ name = "sp-block-builder" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -13324,7 +12634,7 @@ dependencies = [ "futures 0.3.21", "log", "lru 0.7.3", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sp-api", "sp-consensus", @@ -13343,7 +12653,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-core", "sp-inherents", "sp-runtime", @@ -13359,7 +12669,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-api", "sp-application-crypto", @@ -13378,7 +12688,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "async-trait", "merlin", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-api", @@ -13399,7 +12709,7 @@ name = "sp-consensus-slots" version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-arithmetic", @@ -13413,7 +12723,7 @@ name = "sp-consensus-vrf" version = "0.10.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "schnorrkel", "sp-core", "sp-runtime", @@ -13441,10 +12751,10 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.0", - "primitive-types 0.11.1", + "primitive-types", "rand 0.7.3", "regex", "scale-info", @@ -13516,7 +12826,7 @@ version = "0.12.0" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-std", "sp-storage", ] @@ -13528,7 +12838,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "finality-grandpa", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-api", @@ -13546,7 +12856,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "async-trait", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-core", "sp-runtime", "sp-std", @@ -13562,7 +12872,7 @@ dependencies = [ "hash-db", "libsecp256k1 0.7.0", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "secp256k1", "sp-core", @@ -13597,7 +12907,7 @@ dependencies = [ "async-trait", "futures 0.3.21", "merlin", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "schnorrkel", "serde", @@ -13620,7 +12930,7 @@ name = "sp-npos-elections" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "serde", "sp-arithmetic", @@ -13680,7 +12990,7 @@ dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "paste", "rand 0.7.3", @@ -13699,8 +13009,8 @@ version = "6.0.0" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", - "primitive-types 0.11.1", + "parity-scale-codec", + "primitive-types", "sp-externalities", "sp-runtime-interface-proc-macro", "sp-std", @@ -13736,7 +13046,7 @@ name = "sp-session" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-api", "sp-core", @@ -13750,7 +13060,7 @@ name = "sp-staking" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-runtime", "sp-std", @@ -13764,7 +13074,7 @@ dependencies = [ "hash-db", "log", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "rand 0.7.3", "smallvec", @@ -13790,7 +13100,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "ref-cast", "serde", "sp-debug-derive", @@ -13818,7 +13128,7 @@ dependencies = [ "async-trait", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -13831,7 +13141,7 @@ name = "sp-tracing" version = "5.0.0" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-std", "tracing", "tracing-core", @@ -13854,7 +13164,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "async-trait", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-inherents", @@ -13870,7 +13180,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "hash-db", "memory-db", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "sp-core", "sp-std", @@ -13885,7 +13195,7 @@ version = "5.0.0" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-wasm 0.42.2", "scale-info", "serde", @@ -13901,7 +13211,7 @@ name = "sp-version-proc-macro" version = "4.0.0-dev" source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3994b660ebd7b5833f65#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "proc-macro2", "quote", "syn", @@ -13914,7 +13224,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-std", "wasmi", "wasmtime", @@ -13926,15 +13236,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "spki" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c01a0c15da1b0b0e1494112e7af814a678fec9bd157881b49beac661e9b6f32" -dependencies = [ - "der 0.4.5", -] - [[package]] name = "spki" version = "0.5.4" @@ -13942,7 +13243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" dependencies = [ "base64ct", - "der 0.5.1", + "der", ] [[package]] @@ -14005,7 +13306,7 @@ dependencies = [ "pallet-xcm", "parachain-info", "parachains-common", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-runtime-common", @@ -14175,7 +13476,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", @@ -14207,7 +13508,7 @@ dependencies = [ "async-trait", "futures 0.3.21", "hex", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-client-db", "sc-consensus", @@ -14373,7 +13674,7 @@ dependencies = [ "pallet-balances", "pallet-sudo", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "polkadot-primitives", "polkadot-service", @@ -14609,16 +13910,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.22.0" @@ -14858,7 +14149,7 @@ dependencies = [ "clap 3.1.6", "jsonrpsee 0.4.1", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "remote-externalities", "sc-chain-spec", "sc-cli", @@ -15028,16 +14319,6 @@ dependencies = [ "percent-encoding 2.1.0", ] -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.5", - "serde", -] - [[package]] name = "valuable" version = "0.1.0" @@ -15537,7 +14818,7 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "pallet-xcm-benchmarks", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", @@ -15693,15 +14974,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "ws2_32-sys" version = "0.2.1" @@ -15712,30 +14984,6 @@ dependencies = [ "winapi-build", ] -[[package]] -name = "ws_stream_wasm" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47ca1ab42f5afed7fc332b22b6e932ca5414b209465412c8cdf0ad23bc0de645" -dependencies = [ - "async_io_stream", - "futures 0.3.21", - "js-sys", - "pharos", - "rustc_version 0.4.0", - "send_wrapper", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "wyz" version = "0.5.0" @@ -15764,7 +15012,7 @@ dependencies = [ "derivative", "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "scale-info", "xcm-procedural", ] @@ -15778,7 +15026,7 @@ dependencies = [ "frame-system", "log", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "scale-info", "sp-arithmetic", @@ -15803,7 +15051,7 @@ dependencies = [ "frame-support", "frame-system", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", "polkadot-primitives", "polkadot-runtime-parachains", @@ -15822,7 +15070,7 @@ dependencies = [ "frame-support", "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-arithmetic", "sp-core", "sp-io", @@ -15848,7 +15096,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech//polkadot?rev=ef71ed8baef3007b039cdf040d24f5958edb390b#ef71ed8baef3007b039cdf040d24f5958edb390b" dependencies = [ "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", "polkadot-core-primitives", "polkadot-parachain", diff --git a/Cargo.toml b/Cargo.toml index 17a9899aea..ef856ebcd8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -324,7 +324,4 @@ cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumu cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } statemine-runtime = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } -parachains-common = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } - -#[patch."https://github.com/paritytech/scale-info"] -#scale-info = { git = "https://github.com/paritytech/scale-info", rev = "41c80aa5a8a52f4580cfbcb4670e9ed3919d46da" } \ No newline at end of file +parachains-common = { git = "https://github.com/paritytech//cumulus", rev = "b1e91afb7421309b203d7627b736d9bcf58260eb" } \ No newline at end of file diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index ac84203cb2..1d072ec193 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -12,7 +12,11 @@ serde = { version = "1.0.136", features = ["derive"] } serde_json = "1.0.68" futures = "0.3.15" hex = "0.4.0" -ethers = "0.6.2" +coins-bip32 = "0.6.0" +coins-bip39 = "0.6.0" +elliptic-curve = { version = "0.11.12", default-features = false, features = ["hazmat", "sec1"] } +k256 = { version = "0.10.4", default-features = false, features = ["keccak256", "ecdsa", "std"] } +tiny-keccak = { version = "2.0", features = ["keccak"] } codec = { package = "parity-scale-codec", version = "3.0.0" } jsonrpc-core = "18.0.0" diff --git a/node/service/src/chain_spec/mandala.rs b/node/service/src/chain_spec/mandala.rs index d5809d5477..5ead6361cc 100644 --- a/node/service/src/chain_spec/mandala.rs +++ b/node/service/src/chain_spec/mandala.rs @@ -16,9 +16,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +use crate::chain_spec::{get_account_id_from_seed, get_authority_keys_from_seed, Extensions, TELEMETRY_URL}; use acala_primitives::{AccountId, Balance, Nonce, TokenSymbol}; -use ethers::signers::{coins_bip39::English, MnemonicBuilder, Signer}; +use coins_bip39::{English, Mnemonic, Wordlist}; use hex_literal::hex; +use k256::ecdsa::SigningKey; +use k256::EncodedPoint as K256PublicKey; use module_evm::GenesisAccount; use sc_chain_spec::ChainType; use sc_telemetry::TelemetryEndpoints; @@ -28,13 +31,15 @@ use sp_core::{bytes::from_hex, crypto::UncheckedInto, sr25519, Bytes, H160}; use sp_finality_grandpa::AuthorityId as GrandpaId; use sp_runtime::{traits::Zero, FixedPointNumber, FixedU128}; use sp_std::{collections::btree_map::BTreeMap, str::FromStr}; - -use crate::chain_spec::{get_account_id_from_seed, get_authority_keys_from_seed, Extensions, TELEMETRY_URL}; +use tiny_keccak::{Hasher, Keccak}; pub type ChainSpec = sc_service::GenericChainSpec; pub const PARA_ID: u32 = 2000; +// Child key at derivation path: m/44'/60'/0'/0/{index} +const DEFAULT_DERIVATION_PATH_PREFIX: &str = "m/44'/60'/0'/0/"; + /// Development testnet config (single validator Alice), non-parachain pub fn dev_testnet_config(mnemonic: Option<&str>) -> Result { dev_testnet_config_from_chain_id("mandala-dev", mnemonic) @@ -45,26 +50,58 @@ pub fn parachain_dev_testnet_config(mnemonic: Option<&str>) -> Result) -> Vec { +fn generate_evm_address(mnemonic: Option<&str>, index: u32) -> H160 { let phrase = mnemonic.unwrap_or("fox sight canyon orphan hotel grow hedgehog build bless august weather swarm"); + let derivation_path = + coins_bip32::path::DerivationPath::from_str(&format!("{}{}", DEFAULT_DERIVATION_PATH_PREFIX, index)) + .expect("should parse the default derivation path"); + let mnemonic = Mnemonic::::new_from_phrase(&phrase).unwrap(); + + let derived_priv_key = mnemonic.derive_key(&derivation_path, None).unwrap(); + let key: &SigningKey = derived_priv_key.as_ref(); + let secret_key = SigningKey::from_bytes(&key.to_bytes()).unwrap(); + + // let uncompressed_pub_key = K256PublicKey::from(&secret_key.verifying_key()).decompress(); + // let public_key = uncompressed_pub_key.unwrap().to_bytes(); + let public_key = K256PublicKey::from(&secret_key.verifying_key()).to_bytes(); + debug_assert_eq!(public_key[0], 0x04); + let hash = keccak256(&public_key[1..]); + H160::from_slice(&hash[12..]) +} + +fn keccak256(bytes: S) -> [u8; 32] +where + S: AsRef<[u8]>, +{ + let mut output = [0u8; 32]; + let mut hasher = Keccak::v256(); + hasher.update(bytes.as_ref()); + hasher.finalize(&mut output); + output +} + +fn get_evm_accounts(mnemonic: Option<&str>) -> Vec { + // let phrase = mnemonic.unwrap_or("fox sight canyon orphan hotel grow hedgehog build bless august + // weather swarm"); let mut evm_accounts = Vec::new(); - // Child key at derivation path: m/44'/60'/0'/0/{index} - // for index in 0..10u32 { - // let wallet = MnemonicBuilder::::default() - // .phrase(phrase) - // .index(index) - // .unwrap() - // .build() - // .unwrap(); - // evm_accounts.push(wallet.address()); - // log::info!( - // "index: {:?}, private_key: {:x?} address: {:?}", - // index, - // hex::encode(wallet.signer().to_bytes()), - // wallet.address() - // ); - // } + for index in 0..10u32 { + // let wallet = MnemonicBuilder::::default() + // .phrase(phrase) + // .index(index) + // .unwrap() + // .build() + // .unwrap(); + // evm_accounts.push(wallet.address()); + let addr = generate_evm_address::(mnemonic, index); + evm_accounts.push(addr); + log::info!( + "index: {:?}, address: {:?}", + index, + // hex::encode(wallet.signer().to_bytes()), + addr + ); + } evm_accounts } diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 59934c7e05..4a0c2bad8d 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -405,13 +405,6 @@ where RelayChainError::ServiceError(polkadot_service::Error::Sub(x)) => x, s => s.to_string().into(), })?; - // let (relay_chain_interface, collator_key) = - // build_relay_chain_interface(polkadot_config, telemetry_worker_handle, &mut task_manager).map_err( - // |e| match e { - // polkadot_service::Error::Sub(x) => x, - // s => format!("{}", s).into(), - // }, - // )?; let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id); let force_authoring = parachain_config.force_authoring; diff --git a/runtime/integration-tests/src/relaychain/kusama_test_net.rs b/runtime/integration-tests/src/relaychain/kusama_test_net.rs index 7ebc57c6f2..7eddb70b68 100644 --- a/runtime/integration-tests/src/relaychain/kusama_test_net.rs +++ b/runtime/integration-tests/src/relaychain/kusama_test_net.rs @@ -93,7 +93,7 @@ fn default_parachains_host_configuration() -> HostConfiguration { max_upward_queue_size: 1024 * 1024, max_downward_message_size: 1024, ump_service_total_weight: 4 * 1_000_000_000, - max_upward_message_size: 1024 * 1024, + max_upward_message_size: 50 * 1024, max_upward_message_num_per_candidate: 5, hrmp_sender_deposit: 0, hrmp_recipient_deposit: 0, diff --git a/runtime/integration-tests/src/xcm_interface.rs b/runtime/integration-tests/src/xcm_interface.rs index 6ea7c31a43..b83a60fa5a 100644 --- a/runtime/integration-tests/src/xcm_interface.rs +++ b/runtime/integration-tests/src/xcm_interface.rs @@ -20,7 +20,7 @@ use crate::relaychain::kusama_test_net::*; use crate::setup::*; -use frame_support::{assert_ok, weights::Weight}; +use frame_support::{assert_ok, weights::Weight, BoundedVec}; use module_homa::UnlockChunk; use module_support::HomaSubAccountXcm; use module_xcm_interface::XcmInterfaceOperation; @@ -277,7 +277,7 @@ fn xcm_interface_bond_extra_on_sub_account_works() { stash: homa_lite_sub_account.clone(), total: 500 * dollar(RELAY_CHAIN_CURRENCY), active: 500 * dollar(RELAY_CHAIN_CURRENCY), - unlocking: vec![], + unlocking: BoundedVec::default(), claimed_rewards: vec![], }) ); @@ -315,7 +315,7 @@ fn xcm_interface_bond_extra_on_sub_account_works() { stash: homa_lite_sub_account.clone(), total: 1000 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE, active: 1000 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE, - unlocking: vec![], + unlocking: BoundedVec::default(), claimed_rewards: vec![], }) ); @@ -360,7 +360,7 @@ fn xcm_interface_unbond_on_sub_account_works() { stash: homa_lite_sub_account.clone(), total: dollar(RELAY_CHAIN_CURRENCY), active: dollar(RELAY_CHAIN_CURRENCY), - unlocking: vec![], + unlocking: BoundedVec::default(), claimed_rewards: vec![], }) ); From 1b113e5c002e04507e93118af4d900cbd757c5c0 Mon Sep 17 00:00:00 2001 From: zqh Date: Thu, 24 Mar 2022 16:24:20 +0800 Subject: [PATCH 04/25] remove ethers --- node/service/Cargo.toml | 8 +++--- node/service/src/chain_spec/mandala.rs | 40 ++++++++++---------------- 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 1d072ec193..927701367b 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -10,16 +10,16 @@ async-trait = { version = "0.1.48" } hex-literal = "0.3.1" serde = { version = "1.0.136", features = ["derive"] } serde_json = "1.0.68" +codec = { package = "parity-scale-codec", version = "3.0.0" } futures = "0.3.15" hex = "0.4.0" +jsonrpc-core = "18.0.0" + coins-bip32 = "0.6.0" coins-bip39 = "0.6.0" elliptic-curve = { version = "0.11.12", default-features = false, features = ["hazmat", "sec1"] } k256 = { version = "0.10.4", default-features = false, features = ["keccak256", "ecdsa", "std"] } tiny-keccak = { version = "2.0", features = ["keccak"] } -codec = { package = "parity-scale-codec", version = "3.0.0" } - -jsonrpc-core = "18.0.0" sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } @@ -121,4 +121,4 @@ with-all-runtime = [ "with-mandala-runtime", "with-karura-runtime", "with-acala-runtime", -] +] \ No newline at end of file diff --git a/node/service/src/chain_spec/mandala.rs b/node/service/src/chain_spec/mandala.rs index 5ead6361cc..7aa572a9ba 100644 --- a/node/service/src/chain_spec/mandala.rs +++ b/node/service/src/chain_spec/mandala.rs @@ -18,10 +18,16 @@ use crate::chain_spec::{get_account_id_from_seed, get_authority_keys_from_seed, Extensions, TELEMETRY_URL}; use acala_primitives::{AccountId, Balance, Nonce, TokenSymbol}; -use coins_bip39::{English, Mnemonic, Wordlist}; use hex_literal::hex; -use k256::ecdsa::SigningKey; -use k256::EncodedPoint as K256PublicKey; + +use coins_bip39::{English, Mnemonic, Wordlist}; +use elliptic_curve::sec1::ToEncodedPoint; +use k256::{ + ecdsa::{SigningKey, VerifyingKey}, + EncodedPoint as K256PublicKey, +}; +use tiny_keccak::{Hasher, Keccak}; + use module_evm::GenesisAccount; use sc_chain_spec::ChainType; use sc_telemetry::TelemetryEndpoints; @@ -31,7 +37,6 @@ use sp_core::{bytes::from_hex, crypto::UncheckedInto, sr25519, Bytes, H160}; use sp_finality_grandpa::AuthorityId as GrandpaId; use sp_runtime::{traits::Zero, FixedPointNumber, FixedU128}; use sp_std::{collections::btree_map::BTreeMap, str::FromStr}; -use tiny_keccak::{Hasher, Keccak}; pub type ChainSpec = sc_service::GenericChainSpec; @@ -59,12 +64,12 @@ fn generate_evm_address(mnemonic: Option<&str>, index: u32) -> H160 let derived_priv_key = mnemonic.derive_key(&derivation_path, None).unwrap(); let key: &SigningKey = derived_priv_key.as_ref(); - let secret_key = SigningKey::from_bytes(&key.to_bytes()).unwrap(); + let secret_key: SigningKey = SigningKey::from_bytes(&key.to_bytes()).unwrap(); + let verify_key: VerifyingKey = secret_key.verifying_key(); + + let point: &K256PublicKey = &verify_key.to_encoded_point(false); + let public_key = point.to_bytes(); - // let uncompressed_pub_key = K256PublicKey::from(&secret_key.verifying_key()).decompress(); - // let public_key = uncompressed_pub_key.unwrap().to_bytes(); - let public_key = K256PublicKey::from(&secret_key.verifying_key()).to_bytes(); - debug_assert_eq!(public_key[0], 0x04); let hash = keccak256(&public_key[1..]); H160::from_slice(&hash[12..]) } @@ -81,26 +86,11 @@ where } fn get_evm_accounts(mnemonic: Option<&str>) -> Vec { - // let phrase = mnemonic.unwrap_or("fox sight canyon orphan hotel grow hedgehog build bless august - // weather swarm"); - let mut evm_accounts = Vec::new(); for index in 0..10u32 { - // let wallet = MnemonicBuilder::::default() - // .phrase(phrase) - // .index(index) - // .unwrap() - // .build() - // .unwrap(); - // evm_accounts.push(wallet.address()); let addr = generate_evm_address::(mnemonic, index); evm_accounts.push(addr); - log::info!( - "index: {:?}, address: {:?}", - index, - // hex::encode(wallet.signer().to_bytes()), - addr - ); + println!("index: {:?}, evm address: {:?}", index, addr); } evm_accounts } From 37bcedbd3734cab808ff2cb0a650e7e319adf6eb Mon Sep 17 00:00:00 2001 From: zqh Date: Thu, 24 Mar 2022 21:29:33 +0800 Subject: [PATCH 05/25] update mandala --- node/service/src/chain_spec/mandala.rs | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/node/service/src/chain_spec/mandala.rs b/node/service/src/chain_spec/mandala.rs index 7aa572a9ba..5a9d7b81b4 100644 --- a/node/service/src/chain_spec/mandala.rs +++ b/node/service/src/chain_spec/mandala.rs @@ -19,15 +19,6 @@ use crate::chain_spec::{get_account_id_from_seed, get_authority_keys_from_seed, Extensions, TELEMETRY_URL}; use acala_primitives::{AccountId, Balance, Nonce, TokenSymbol}; use hex_literal::hex; - -use coins_bip39::{English, Mnemonic, Wordlist}; -use elliptic_curve::sec1::ToEncodedPoint; -use k256::{ - ecdsa::{SigningKey, VerifyingKey}, - EncodedPoint as K256PublicKey, -}; -use tiny_keccak::{Hasher, Keccak}; - use module_evm::GenesisAccount; use sc_chain_spec::ChainType; use sc_telemetry::TelemetryEndpoints; @@ -38,6 +29,14 @@ use sp_finality_grandpa::AuthorityId as GrandpaId; use sp_runtime::{traits::Zero, FixedPointNumber, FixedU128}; use sp_std::{collections::btree_map::BTreeMap, str::FromStr}; +use coins_bip39::{English, Mnemonic, Wordlist}; +use elliptic_curve::sec1::ToEncodedPoint; +use k256::{ + ecdsa::{SigningKey, VerifyingKey}, + EncodedPoint as K256PublicKey, +}; +use tiny_keccak::{Hasher, Keccak}; + pub type ChainSpec = sc_service::GenericChainSpec; pub const PARA_ID: u32 = 2000; @@ -55,8 +54,7 @@ pub fn parachain_dev_testnet_config(mnemonic: Option<&str>) -> Result(mnemonic: Option<&str>, index: u32) -> H160 { - let phrase = mnemonic.unwrap_or("fox sight canyon orphan hotel grow hedgehog build bless august weather swarm"); +fn generate_evm_address(phrase: &str, index: u32) -> H160 { let derivation_path = coins_bip32::path::DerivationPath::from_str(&format!("{}{}", DEFAULT_DERIVATION_PATH_PREFIX, index)) .expect("should parse the default derivation path"); @@ -86,11 +84,12 @@ where } fn get_evm_accounts(mnemonic: Option<&str>) -> Vec { + let phrase = mnemonic.unwrap_or("fox sight canyon orphan hotel grow hedgehog build bless august weather swarm"); let mut evm_accounts = Vec::new(); for index in 0..10u32 { - let addr = generate_evm_address::(mnemonic, index); + let addr = generate_evm_address::(phrase, index); evm_accounts.push(addr); - println!("index: {:?}, evm address: {:?}", index, addr); + log::info!("index: {:?}, evm address: {:?}", index, addr); } evm_accounts } From 50729515c318b8da91518e20c037f2cb0e601ae3 Mon Sep 17 00:00:00 2001 From: zqh Date: Sat, 2 Apr 2022 12:07:05 +0800 Subject: [PATCH 06/25] update orml --- orml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orml b/orml index e0d31d4130..2b5d4ce1d0 160000 --- a/orml +++ b/orml @@ -1 +1 @@ -Subproject commit e0d31d4130b66b438c1b7980b9106e08b1354387 +Subproject commit 2b5d4ce1d08fb54c0007c2055653892d2c93a92e From 49f10111b8e6cf93423e778d06b179bd49b1c929 Mon Sep 17 00:00:00 2001 From: zqh Date: Sat, 2 Apr 2022 12:11:29 +0800 Subject: [PATCH 07/25] update stable-asset --- ecosystem-modules/stable-asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecosystem-modules/stable-asset b/ecosystem-modules/stable-asset index a815dcf38e..a4054ad6fb 160000 --- a/ecosystem-modules/stable-asset +++ b/ecosystem-modules/stable-asset @@ -1 +1 @@ -Subproject commit a815dcf38ef1ba9751ecf12f83b36e86264e8069 +Subproject commit a4054ad6fb787b1606b55dc1b31657ec10cb0334 From d5f344e98270a9cfb951cef4b8a5ae16f0d66291 Mon Sep 17 00:00:00 2001 From: zqh Date: Sat, 2 Apr 2022 12:59:22 +0800 Subject: [PATCH 08/25] fix test --- Cargo.toml | 1 + ecosystem-modules/ren/renvm-bridge/src/tests.rs | 14 +++++++------- node/e2e-tests/test-service/tests/standalone.rs | 2 +- runtime/integration-tests/src/runtime.rs | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ef856ebcd8..e7fb363e67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,6 +116,7 @@ percent-encoding = { opt-level = 3 } primitive-types = { opt-level = 3 } ring = { opt-level = 3 } rustls = { opt-level = 3 } +secp256k1 = { opt-level = 3 } sha2 = { opt-level = 3 } sha3 = { opt-level = 3 } smallvec = { opt-level = 3 } diff --git a/ecosystem-modules/ren/renvm-bridge/src/tests.rs b/ecosystem-modules/ren/renvm-bridge/src/tests.rs index 789f1ca68e..a149dfce72 100644 --- a/ecosystem-modules/ren/renvm-bridge/src/tests.rs +++ b/ecosystem-modules/ren/renvm-bridge/src/tests.rs @@ -70,7 +70,7 @@ fn burn_works() { hex!["4fe557069c2424260b9d0cca31049e70ede95c49964578044d80c74f3a118505"], 93802, hex!["64c1212efd301721c9343fdf299f022778ea336608c1ae089136045b8d6f3e5c"], - EcdsaSignature::from_slice(&hex!["5566d8eb9fec05a6636381302ad7dd6b28a0ec62e6e45038fbb095c6503ee08a69a450c566ce60ccca1233d32c24a366176d189bbe5613ae633ce3ae4b6b9a7e1b"]), + EcdsaSignature::from_slice(&hex!["5566d8eb9fec05a6636381302ad7dd6b28a0ec62e6e45038fbb095c6503ee08a69a450c566ce60ccca1233d32c24a366176d189bbe5613ae633ce3ae4b6b9a7e1b"]).unwrap(), ) ); assert_eq!(Balances::free_balance(issuer), 93802); @@ -157,7 +157,7 @@ fn mint_works() { hex!["67028f26328144de6ef80b8cd3b05e0cefb488762c340d1574c0542f752996cb"], 93963, hex!["f6a75cc370a2dda6dfc8d016529766bb6099d7fa0d787d9fe5d3a7e60c9ac2a0"], - EcdsaSignature::from_slice(&hex!["defda6eef01da2e2a90ce30ba73e90d32204ae84cae782b485f01d16b69061e0381a69cafed3deb6112af044c42ed0f7c73ee0eec7b533334d31a06db50fc40e1b"]), + EcdsaSignature::from_slice(&hex!["defda6eef01da2e2a90ce30ba73e90d32204ae84cae782b485f01d16b69061e0381a69cafed3deb6112af044c42ed0f7c73ee0eec7b533334d31a06db50fc40e1b"]).unwrap(), ) ); @@ -169,7 +169,7 @@ fn mint_works() { hex!["425673f98610064b76dbd334783f45ea192f0e954db75ba2ae6b6058a8143d67"], 87266, hex!["fe125f912d2de05e3e34b96a0ce8a8e35d9ed883e830b978871f3e1f5d393726"], - EcdsaSignature::from_slice(&hex!["acd463fa396c54995e444234e96d793d3977e75f445da219c10bc4947c22622f325f24dfc31e8e56ec21f04fc7669e91db861778a8367444bde6dfb5f95e15ed1b"]), + EcdsaSignature::from_slice(&hex!["acd463fa396c54995e444234e96d793d3977e75f445da219c10bc4947c22622f325f24dfc31e8e56ec21f04fc7669e91db861778a8367444bde6dfb5f95e15ed1b"]).unwrap(), ) ); @@ -181,7 +181,7 @@ fn mint_works() { hex!["425673f98610064b76dbd334783f45ea192f0e954db75ba2ae6b6058a8143d67"], 87266, hex!["fe125f912d2de05e3e34b96a0ce8a8e35d9ed883e830b978871f3e1f5d393726"], - EcdsaSignature::from_slice(&hex!["acd463fa396c54995e444234e96d793d3977e75f445da219c10bc4947c22622f325f24dfc31e8e56ec21f04fc7669e91db861778a8367444bde6dfb5f95e15ed1b"]), + EcdsaSignature::from_slice(&hex!["acd463fa396c54995e444234e96d793d3977e75f445da219c10bc4947c22622f325f24dfc31e8e56ec21f04fc7669e91db861778a8367444bde6dfb5f95e15ed1b"]).unwrap(), ), TransactionValidityError::Invalid(InvalidTransaction::Stale) ); @@ -192,7 +192,7 @@ fn mint_works() { hex!["425673f98610064b76dbd334783f45ea192f0e954db75ba2ae6b6058a8143d67"], 87266, hex!["fe125f912d2de05e3e34b96a0ce8a8e35d9ed883e830b978871f3e1f5d393726"], - EcdsaSignature::from_slice(&hex!["000463fa396c54995e444234e96d793d3977e75f445da219c10bc4947c22622f325f24dfc31e8e56ec21f04fc7669e91db861778a8367444bde6dfb5f95e15ed1b"]), + EcdsaSignature::from_slice(&hex!["000463fa396c54995e444234e96d793d3977e75f445da219c10bc4947c22622f325f24dfc31e8e56ec21f04fc7669e91db861778a8367444bde6dfb5f95e15ed1b"]).unwrap(), ), TransactionValidityError::Invalid(InvalidTransaction::BadProof) ); @@ -207,7 +207,7 @@ fn rotate_key_works() { assert_noop!( rotate_key( new_key, - EcdsaSignature::from_slice(&hex!["defda6eef01da2e2a90ce30ba73e90d32204ae84cae782b485f01d16b69061e0381a69cafed3deb6112af044c42ed0f7c73ee0eec7b533334d31a06db50fc40e1b"]), + EcdsaSignature::from_slice(&hex!["defda6eef01da2e2a90ce30ba73e90d32204ae84cae782b485f01d16b69061e0381a69cafed3deb6112af044c42ed0f7c73ee0eec7b533334d31a06db50fc40e1b"]).unwrap(), ), TransactionValidityError::Invalid(InvalidTransaction::BadProof) ); @@ -223,7 +223,7 @@ fn transaction_length_of_mint() { p_hash: hex!["425673f98610064b76dbd334783f45ea192f0e954db75ba2ae6b6058a8143d67"], amount: 10000 * 10u128.saturating_pow(8), // 10000 BTC n_hash: hex!["fe125f912d2de05e3e34b96a0ce8a8e35d9ed883e830b978871f3e1f5d393726"], - sig: EcdsaSignature::from_slice(&hex!["000463fa396c54995e444234e96d793d3977e75f445da219c10bc4947c22622f325f24dfc31e8e56ec21f04fc7669e91db861778a8367444bde6dfb5f95e15ed1b"]) + sig: EcdsaSignature::from_slice(&hex!["000463fa396c54995e444234e96d793d3977e75f445da219c10bc4947c22622f325f24dfc31e8e56ec21f04fc7669e91db861778a8367444bde6dfb5f95e15ed1b"]).unwrap() }; let call_len = call.using_encoded(|c| c.len()); diff --git a/node/e2e-tests/test-service/tests/standalone.rs b/node/e2e-tests/test-service/tests/standalone.rs index 2b5d17f0f1..f8ec6e6926 100644 --- a/node/e2e-tests/test-service/tests/standalone.rs +++ b/node/e2e-tests/test-service/tests/standalone.rs @@ -109,7 +109,7 @@ async fn transaction_pool_priority_order_test() { p_hash: hex!["67028f26328144de6ef80b8cd3b05e0cefb488762c340d1574c0542f752996cb"], amount: 93963, n_hash: hex!["f6a75cc370a2dda6dfc8d016529766bb6099d7fa0d787d9fe5d3a7e60c9ac2a0"], - sig: EcdsaSignature::from_slice(&hex!["defda6eef01da2e2a90ce30ba73e90d32204ae84cae782b485f01d16b69061e0381a69cafed3deb6112af044c42ed0f7c73ee0eec7b533334d31a06db50fc40e1b"]), + sig: EcdsaSignature::from_slice(&hex!["defda6eef01da2e2a90ce30ba73e90d32204ae84cae782b485f01d16b69061e0381a69cafed3deb6112af044c42ed0f7c73ee0eec7b533334d31a06db50fc40e1b"]).unwrap(), }, None, ).await.unwrap(); diff --git a/runtime/integration-tests/src/runtime.rs b/runtime/integration-tests/src/runtime.rs index 51fc882b60..b30f1d7ca9 100644 --- a/runtime/integration-tests/src/runtime.rs +++ b/runtime/integration-tests/src/runtime.rs @@ -362,7 +362,7 @@ mod mandala_only_tests { // tips = 0 // unsigned extrinsic - let sig = EcdsaSignature::from_slice(&hex!["defda6eef01da2e2a90ce30ba73e90d32204ae84cae782b485f01d16b69061e0381a69cafed3deb6112af044c42ed0f7c73ee0eec7b533334d31a06db50fc40e1b"]); + let sig = EcdsaSignature::from_slice(&hex!["defda6eef01da2e2a90ce30ba73e90d32204ae84cae782b485f01d16b69061e0381a69cafed3deb6112af044c42ed0f7c73ee0eec7b533334d31a06db50fc40e1b"]).unwrap(); let call = ecosystem_renvm_bridge::Call::mint { who: hex!["d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d"].into(), p_hash: hex!["67028f26328144de6ef80b8cd3b05e0cefb488762c340d1574c0542f752996cb"], From 9e2808c8f7e871f8998ce8ca1c95f9ada84407f0 Mon Sep 17 00:00:00 2001 From: zqh Date: Sat, 2 Apr 2022 13:49:25 +0800 Subject: [PATCH 09/25] update evm dep --- Cargo.lock | 42 +++++++------------------- modules/evm-utility/Cargo.toml | 6 ++-- node/service/src/chain_spec/mandala.rs | 2 +- 3 files changed, 15 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 52b7c08247..1ad6cde3e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -921,7 +921,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ - "funty 2.0.0", + "funty", "radium 0.7.0", "tap", "wyz", @@ -2933,8 +2933,8 @@ checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" [[package]] name = "evm" -version = "0.33.2" -source = "git+https://github.com/AcalaNetwork/evm?rev=a56d8af9787f0550cb4c4ab3955e81f1741d9e7c#a56d8af9787f0550cb4c4ab3955e81f1741d9e7c" +version = "0.35.0" +source = "git+https://github.com/rust-blockchain/evm?rev=0b686f8c2c83a52638917caa649dc23302fda80d#0b686f8c2c83a52638917caa649dc23302fda80d" dependencies = [ "auto_impl", "environmental", @@ -2948,15 +2948,14 @@ dependencies = [ "rlp", "scale-info", "serde", - "sha3 0.8.2", + "sha3 0.10.1", ] [[package]] name = "evm-core" -version = "0.33.0" -source = "git+https://github.com/AcalaNetwork/evm?rev=a56d8af9787f0550cb4c4ab3955e81f1741d9e7c#a56d8af9787f0550cb4c4ab3955e81f1741d9e7c" +version = "0.35.0" +source = "git+https://github.com/rust-blockchain/evm?rev=0b686f8c2c83a52638917caa649dc23302fda80d#0b686f8c2c83a52638917caa649dc23302fda80d" dependencies = [ - "funty 1.1.0", "parity-scale-codec", "primitive-types", "scale-info", @@ -2965,8 +2964,8 @@ dependencies = [ [[package]] name = "evm-gasometer" -version = "0.33.0" -source = "git+https://github.com/AcalaNetwork/evm?rev=a56d8af9787f0550cb4c4ab3955e81f1741d9e7c#a56d8af9787f0550cb4c4ab3955e81f1741d9e7c" +version = "0.35.0" +source = "git+https://github.com/rust-blockchain/evm?rev=0b686f8c2c83a52638917caa649dc23302fda80d#0b686f8c2c83a52638917caa649dc23302fda80d" dependencies = [ "environmental", "evm-core", @@ -3000,14 +2999,14 @@ dependencies = [ [[package]] name = "evm-runtime" -version = "0.33.0" -source = "git+https://github.com/AcalaNetwork/evm?rev=a56d8af9787f0550cb4c4ab3955e81f1741d9e7c#a56d8af9787f0550cb4c4ab3955e81f1741d9e7c" +version = "0.35.0" +source = "git+https://github.com/rust-blockchain/evm?rev=0b686f8c2c83a52638917caa649dc23302fda80d#0b686f8c2c83a52638917caa649dc23302fda80d" dependencies = [ "auto_impl", "environmental", "evm-core", "primitive-types", - "sha3 0.8.2", + "sha3 0.10.1", ] [[package]] @@ -3459,12 +3458,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "funty" version = "2.0.0" @@ -12373,19 +12366,6 @@ dependencies = [ "digest 0.10.3", ] -[[package]] -name = "sha3" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf" -dependencies = [ - "block-buffer 0.7.3", - "byte-tools", - "digest 0.8.1", - "keccak", - "opaque-debug 0.2.3", -] - [[package]] name = "sha3" version = "0.9.1" diff --git a/modules/evm-utility/Cargo.toml b/modules/evm-utility/Cargo.toml index 1a282857ec..43eb317d44 100644 --- a/modules/evm-utility/Cargo.toml +++ b/modules/evm-utility/Cargo.toml @@ -9,9 +9,9 @@ sha3 = { version = "0.9.1", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -evm = { git = "https://github.com/AcalaNetwork/evm", rev = "a56d8af9787f0550cb4c4ab3955e81f1741d9e7c", default-features = false, features = ["with-codec"] } -evm-gasometer = { git = "https://github.com/AcalaNetwork/evm", rev = "a56d8af9787f0550cb4c4ab3955e81f1741d9e7c", default-features = false } -evm-runtime = { git = "https://github.com/AcalaNetwork/evm", rev = "a56d8af9787f0550cb4c4ab3955e81f1741d9e7c", default-features = false } +evm = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false, features = ["with-codec"] } +evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false } +evm-runtime = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false } ethereum = { git = "https://github.com/rust-blockchain/ethereum", rev = "755dffaa4903fbec1269f50cde9863cf86269a14", default-features = false, features = ["with-codec"] } scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } diff --git a/node/service/src/chain_spec/mandala.rs b/node/service/src/chain_spec/mandala.rs index d44390e8e4..0d9b9f513a 100644 --- a/node/service/src/chain_spec/mandala.rs +++ b/node/service/src/chain_spec/mandala.rs @@ -58,7 +58,7 @@ fn generate_evm_address(phrase: &str, index: u32) -> H160 { let derivation_path = coins_bip32::path::DerivationPath::from_str(&format!("{}{}", DEFAULT_DERIVATION_PATH_PREFIX, index)) .expect("should parse the default derivation path"); - let mnemonic = Mnemonic::::new_from_phrase(&phrase).unwrap(); + let mnemonic = Mnemonic::::new_from_phrase(phrase).unwrap(); let derived_priv_key = mnemonic.derive_key(&derivation_path, None).unwrap(); let key: &SigningKey = derived_priv_key.as_ref(); From 2def088cb36d30b757d976005f013062765c47d7 Mon Sep 17 00:00:00 2001 From: zqh Date: Sat, 2 Apr 2022 23:41:19 +0800 Subject: [PATCH 10/25] fix statemine fee --- node/e2e-tests/test-service/src/service.rs | 2 +- .../src/relaychain/statemine.rs | 174 +++++++----------- 2 files changed, 68 insertions(+), 108 deletions(-) diff --git a/node/e2e-tests/test-service/src/service.rs b/node/e2e-tests/test-service/src/service.rs index 890f847098..3f6dcbebda 100644 --- a/node/e2e-tests/test-service/src/service.rs +++ b/node/e2e-tests/test-service/src/service.rs @@ -398,7 +398,7 @@ async fn build_relay_chain_interface( relay_chain_full_node.client.clone(), relay_chain_full_node.backend.clone(), Arc::new(Mutex::new(Box::new(relay_chain_full_node.network.clone()))), - relay_chain_full_node.overseer_handle.clone(), + relay_chain_full_node.overseer_handle, )) as Arc<_>) } diff --git a/runtime/integration-tests/src/relaychain/statemine.rs b/runtime/integration-tests/src/relaychain/statemine.rs index 01f91e141a..8e4469cdf3 100644 --- a/runtime/integration-tests/src/relaychain/statemine.rs +++ b/runtime/integration-tests/src/relaychain/statemine.rs @@ -30,14 +30,10 @@ use xcm_emulator::TestExt; pub const UNIT: Balance = 1_000_000_000_000; pub const TEN: Balance = 10_000_000_000_000; -pub const FEE_STATEMINE: Balance = 4_000_000_000; +pub const FEE_WEIGHT: Balance = 4_000_000_000; +pub const FEE_STATEMINE: Balance = 10_666_664; pub const FEE_KUSAMA: Balance = 106_666_660; -// Statemine ED -pub const EXISTENTIAL_DEPOSIT: Balance = CENTS / 10; -pub const UNITS: Balance = 1_000_000_000_000; -pub const CENTS: Balance = UNITS / 30_000; - fn init_statemine_xcm_interface() { let xcm_operation = module_xcm_interface::XcmInterfaceOperation::ParachainFee(Box::new((1, Parachain(1000)).into())); @@ -61,7 +57,7 @@ fn statemine_min_xcm_fee_matched() { use frame_support::weights::{IdentityFee, WeightToFeePolynomial}; init_statemine_xcm_interface(); - let weight = FEE_STATEMINE as u64; + let weight = FEE_WEIGHT as u64; let fee: Balance = IdentityFee::calc(&weight); let statemine: MultiLocation = (1, Parachain(parachains::statemine::ID)).into(); @@ -76,114 +72,78 @@ fn statemine_min_xcm_fee_matched() { } #[test] -fn user_different_ksm_fee() { - let para_2000: AccountId = Sibling::from(2000).into_account(); - let child_2000: AccountId = ParaId::from(2000).into_account(); - let child_1000: AccountId = ParaId::from(1000).into_account(); - let user1_fees = vec![ - 2 * FEE_STATEMINE - 1, - 2 * FEE_STATEMINE, - 2 * FEE_STATEMINE + 1, - 2 * FEE_STATEMINE + FEE_KUSAMA, - ]; - let min_user_fee1 = 2 * FEE_STATEMINE; - let para_init_amount1 = UNIT; - - let user2_fees = vec![2 * FEE_STATEMINE + FEE_KUSAMA]; - let min_user_fee2 = 2 * FEE_STATEMINE + FEE_KUSAMA; - let para_init_amount2 = FEE_STATEMINE + EXISTENTIAL_DEPOSIT; - - let data1 = vec![ - (user1_fees, min_user_fee1, para_init_amount1), - (user2_fees, min_user_fee2, para_init_amount2), - ]; - - for (user_fees, min_user_fee, init_amount) in data1 { - for user_fee in user_fees { - TestNet::reset(); - - statemine_side(init_amount); - - KusamaNet::execute_with(|| { - let _ = kusama_runtime::Balances::make_free_balance_be(&child_2000, UNIT); - }); - - // User fee amount split into two parts: - // First part is `FEE_STATEMINE` sent to statemine. - // Second part `user_fee` sent to kusama then route to statemine. - karura_side(user_fee + FEE_STATEMINE); - - KusamaNet::execute_with(|| { - assert_eq!(UNIT - user_fee, kusama_runtime::Balances::free_balance(&child_2000)); - assert_eq!( - user_fee - FEE_KUSAMA, - kusama_runtime::Balances::free_balance(&child_1000) - ); - }); - - Statemine::execute_with(|| { - use statemine_runtime::*; - // Karura send back custom asset to Statemine, ensure recipient got custom asset - assert_eq!(UNIT, Assets::balance(0, &AccountId::from(BOB))); - // the recipient's ksm not changed - assert_eq!(UNIT, Balances::free_balance(&AccountId::from(BOB))); - // and withdraw sibling parachain sovereign account - assert_eq!(TEN - UNIT, Assets::balance(0, ¶_2000)); - - if user_fee < min_user_fee { - assert_eq!(UNIT - FEE_STATEMINE, Balances::free_balance(¶_2000)); - } else { - assert_eq!( - init_amount - FEE_STATEMINE + user_fee - (FEE_STATEMINE + FEE_KUSAMA), - Balances::free_balance(¶_2000) - ); +fn transfer_from_relay_chain() { + KusamaNet::execute_with(|| { + assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets( + kusama_runtime::Origin::signed(ALICE.into()), + Box::new(Parachain(1000).into().into()), + Box::new( + Junction::AccountId32 { + id: BOB, + network: NetworkId::Any } - }); - } - } + .into() + .into() + ), + Box::new((Here, dollar(KSM)).into()), + 0 + )); + }); + + Statemine::execute_with(|| { + assert_eq!( + dollar(KSM) - FEE_STATEMINE, + Balances::free_balance(&AccountId::from(BOB)) + ); + }); } #[test] fn user_large_fee_fund_to_sovereign_account_works() { + TestNet::reset(); let para_2000: AccountId = Sibling::from(2000).into_account(); let child_2000: AccountId = ParaId::from(2000).into_account(); let child_1000: AccountId = ParaId::from(1000).into_account(); - let assets: Vec<(u128, u128, u128, u128)> = vec![ - (9 * UNIT + FEE_STATEMINE, UNIT, 8_999_893_333_340, 9_991_893_333_340), - (UNIT, 9_004_000_000_000, 995_893_333_340, 1_987_893_333_340), - ]; - - for (asset, c_2000, c_1000, p_2000) in assets { - TestNet::reset(); - - statemine_side(UNIT); - - KusamaNet::execute_with(|| { - let _ = kusama_runtime::Balances::make_free_balance_be(&child_2000, TEN); - }); - - karura_side(asset); - - KusamaNet::execute_with(|| { - // first xcm send to relaychain with 9 KSM. 10 KSM - 9 KSM = 1 KSM - assert_eq!(c_2000, kusama_runtime::Balances::free_balance(&child_2000)); - // 9 KSM - fee on relaychain = 9 KSM - 106_666_660 - assert_eq!(c_1000, kusama_runtime::Balances::free_balance(&child_1000)); - }); - - Statemine::execute_with(|| { - use statemine_runtime::*; - // Karura send back custom asset to Statemine, ensure recipient got custom asset - assert_eq!(UNIT, Assets::balance(0, &AccountId::from(BOB))); - // the recipient's ksm not changed - assert_eq!(UNIT, Balances::free_balance(&AccountId::from(BOB))); - // and withdraw sibling parachain sovereign account - assert_eq!(9 * UNIT, Assets::balance(0, ¶_2000)); - - assert_eq!(p_2000, Balances::free_balance(¶_2000)); - }); - } + // minimum asset should be: FEE_WEIGHT+FEE_KUSAMA+max(KUSAMA_ED,STATEMINE_ED+FEE_STATEMINE). + // but due to current half fee, sender asset should at lease: FEE_WEIGHT + 2 * FEE_KUSAMA + let asset = FEE_WEIGHT + 2 * FEE_KUSAMA; + + statemine_side(UNIT); + + KusamaNet::execute_with(|| { + let _ = kusama_runtime::Balances::make_free_balance_be(&child_2000, TEN); + }); + + karura_side(asset); + + KusamaNet::execute_with(|| { + assert_eq!( + TEN - (asset - FEE_WEIGHT), + kusama_runtime::Balances::free_balance(&child_2000) + ); + assert_eq!( + asset - FEE_WEIGHT - FEE_KUSAMA, + kusama_runtime::Balances::free_balance(&child_1000) + ); + }); + + Statemine::execute_with(|| { + use statemine_runtime::*; + // Karura send back custom asset to Statemine, ensure recipient got custom asset + assert_eq!(UNIT, Assets::balance(0, &AccountId::from(BOB))); + // and withdraw sibling parachain sovereign account + assert_eq!(9 * UNIT, Assets::balance(0, ¶_2000)); + + assert_eq!( + UNIT + FEE_WEIGHT - FEE_STATEMINE, + Balances::free_balance(&AccountId::from(BOB)) + ); + assert_eq!( + UNIT + asset - FEE_WEIGHT - FEE_KUSAMA - FEE_STATEMINE - FEE_WEIGHT, + Balances::free_balance(¶_2000) + ); + }); } // transfer custom asset from Karura to Statemine @@ -215,7 +175,7 @@ fn karura_side(fee_amount: u128) { ) .into() ), - FEE_STATEMINE as u64 + FEE_WEIGHT as u64 )); assert_eq!( From 663114dd6d15ca395f2b5741c7a7e3eef7bcdbe5 Mon Sep 17 00:00:00 2001 From: zqh Date: Sun, 3 Apr 2022 00:51:31 +0800 Subject: [PATCH 11/25] update evm-tests --- evm-tests | 2 +- runtime/integration-tests/src/relaychain/statemine.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/evm-tests b/evm-tests index 2907f4cd1f..80498df909 160000 --- a/evm-tests +++ b/evm-tests @@ -1 +1 @@ -Subproject commit 2907f4cd1f08dd292377a7d1d2ba5b1497aabfad +Subproject commit 80498df90945486b4b9908c9e146557ed2a02aa7 diff --git a/runtime/integration-tests/src/relaychain/statemine.rs b/runtime/integration-tests/src/relaychain/statemine.rs index 8e4469cdf3..26c6970e06 100644 --- a/runtime/integration-tests/src/relaychain/statemine.rs +++ b/runtime/integration-tests/src/relaychain/statemine.rs @@ -99,7 +99,7 @@ fn transfer_from_relay_chain() { } #[test] -fn user_large_fee_fund_to_sovereign_account_works() { +fn karura_statemine_transfer_works() { TestNet::reset(); let para_2000: AccountId = Sibling::from(2000).into_account(); let child_2000: AccountId = ParaId::from(2000).into_account(); From bbc38b64f3a507d9b4930104fbc567604bb97b85 Mon Sep 17 00:00:00 2001 From: zqh Date: Sun, 3 Apr 2022 14:31:18 +0800 Subject: [PATCH 12/25] evm test --- evm-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evm-tests b/evm-tests index 80498df909..4b6ac97175 160000 --- a/evm-tests +++ b/evm-tests @@ -1 +1 @@ -Subproject commit 80498df90945486b4b9908c9e146557ed2a02aa7 +Subproject commit 4b6ac971751f99caa74c5098dfec87440893e666 From e0eff53731b5c31cc318eae9722e3945e74d36db Mon Sep 17 00:00:00 2001 From: zqh Date: Sun, 3 Apr 2022 19:02:16 +0800 Subject: [PATCH 13/25] update evm test --- Cargo.toml | 1 - evm-tests | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e7fb363e67..ef856ebcd8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,7 +116,6 @@ percent-encoding = { opt-level = 3 } primitive-types = { opt-level = 3 } ring = { opt-level = 3 } rustls = { opt-level = 3 } -secp256k1 = { opt-level = 3 } sha2 = { opt-level = 3 } sha3 = { opt-level = 3 } smallvec = { opt-level = 3 } diff --git a/evm-tests b/evm-tests index 4b6ac97175..74bc1551ea 160000 --- a/evm-tests +++ b/evm-tests @@ -1 +1 @@ -Subproject commit 4b6ac971751f99caa74c5098dfec87440893e666 +Subproject commit 74bc1551eaf32b922227092121cef46525c12b2f From b598464d43c58434e10b15854d4f8ddc0d5735d3 Mon Sep 17 00:00:00 2001 From: Ermal Kaleci Date: Sun, 3 Apr 2022 13:30:59 +0200 Subject: [PATCH 14/25] update deps (#2018) --- Cargo.lock | 76 +++++----------------------- evm-tests | 2 +- modules/evm-accounts/Cargo.toml | 2 +- runtime/acala/Cargo.toml | 2 +- runtime/integration-tests/Cargo.toml | 2 +- runtime/karura/Cargo.toml | 2 +- runtime/mandala/Cargo.toml | 2 +- 7 files changed, 20 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ad6cde3e4..993fca4e43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -136,7 +136,7 @@ dependencies = [ "frame-try-runtime", "hex", "hex-literal", - "libsecp256k1 0.6.0", + "libsecp256k1", "module-asset-registry", "module-auction-manager", "module-cdp-engine", @@ -4592,7 +4592,7 @@ dependencies = [ "frame-try-runtime", "hex", "hex-literal", - "libsecp256k1 0.6.0", + "libsecp256k1", "module-asset-registry", "module-auction-manager", "module-cdp-engine", @@ -4965,7 +4965,7 @@ dependencies = [ "futures-timer", "instant", "lazy_static", - "libsecp256k1 0.7.0", + "libsecp256k1", "log", "multiaddr", "multihash 0.14.0", @@ -5397,25 +5397,6 @@ dependencies = [ "tikv-jemalloc-sys", ] -[[package]] -name = "libsecp256k1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" -dependencies = [ - "arrayref", - "base64 0.12.3", - "digest 0.9.0", - "hmac-drbg", - "libsecp256k1-core 0.2.2", - "libsecp256k1-gen-ecmult 0.2.1", - "libsecp256k1-gen-genmult 0.2.1", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "typenum", -] - [[package]] name = "libsecp256k1" version = "0.7.0" @@ -5426,26 +5407,15 @@ dependencies = [ "base64 0.13.0", "digest 0.9.0", "hmac-drbg", - "libsecp256k1-core 0.3.0", - "libsecp256k1-gen-ecmult 0.3.0", - "libsecp256k1-gen-genmult 0.3.0", + "libsecp256k1-core", + "libsecp256k1-gen-ecmult", + "libsecp256k1-gen-genmult", "rand 0.8.5", "serde", "sha2 0.9.9", "typenum", ] -[[package]] -name = "libsecp256k1-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" -dependencies = [ - "crunchy", - "digest 0.9.0", - "subtle", -] - [[package]] name = "libsecp256k1-core" version = "0.3.0" @@ -5457,31 +5427,13 @@ dependencies = [ "subtle", ] -[[package]] -name = "libsecp256k1-gen-ecmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" -dependencies = [ - "libsecp256k1-core 0.2.2", -] - [[package]] name = "libsecp256k1-gen-ecmult" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809" dependencies = [ - "libsecp256k1-core 0.3.0", -] - -[[package]] -name = "libsecp256k1-gen-genmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" -dependencies = [ - "libsecp256k1-core 0.2.2", + "libsecp256k1-core", ] [[package]] @@ -5490,7 +5442,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c" dependencies = [ - "libsecp256k1-core 0.3.0", + "libsecp256k1-core", ] [[package]] @@ -5637,7 +5589,7 @@ dependencies = [ "frame-try-runtime", "hex", "hex-literal", - "libsecp256k1 0.6.0", + "libsecp256k1", "module-asset-registry", "module-auction-manager", "module-cdp-engine", @@ -6231,7 +6183,7 @@ dependencies = [ "acala-primitives", "frame-support", "frame-system", - "libsecp256k1 0.6.0", + "libsecp256k1", "module-evm-utility-macro", "module-support", "orml-currencies", @@ -9755,7 +9707,7 @@ dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", - "libsecp256k1 0.7.0", + "libsecp256k1", "log", "pallet-authorship", "pallet-babe", @@ -10841,7 +10793,7 @@ dependencies = [ "hex-literal", "karura-runtime", "kusama-runtime", - "libsecp256k1 0.6.0", + "libsecp256k1", "log", "mandala-runtime", "module-asset-registry", @@ -12753,7 +12705,7 @@ dependencies = [ "hex", "impl-serde", "lazy_static", - "libsecp256k1 0.7.0", + "libsecp256k1", "log", "merlin", "num-traits", @@ -12876,7 +12828,7 @@ source = "git+https://github.com/paritytech//substrate?rev=fc3fd073d3a0acf9933c3 dependencies = [ "futures 0.3.21", "hash-db", - "libsecp256k1 0.7.0", + "libsecp256k1", "log", "parity-scale-codec", "parking_lot 0.12.0", diff --git a/evm-tests b/evm-tests index 74bc1551ea..d6286a8dfd 160000 --- a/evm-tests +++ b/evm-tests @@ -1 +1 @@ -Subproject commit 74bc1551eaf32b922227092121cef46525c12b2f +Subproject commit d6286a8dfd208ab6adec6ebbb529118631703807 diff --git a/modules/evm-accounts/Cargo.toml b/modules/evm-accounts/Cargo.toml index 196349e4b1..32351a6f3b 100644 --- a/modules/evm-accounts/Cargo.toml +++ b/modules/evm-accounts/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -libsecp256k1 = { version = "0.6", default-features = false, features = ["hmac", "static-context"], optional = true } +libsecp256k1 = { version = "0.7", default-features = false, features = ["hmac", "static-context"], optional = true } scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml index 8ea1fd49d5..005b5a2da3 100644 --- a/runtime/acala/Cargo.toml +++ b/runtime/acala/Cargo.toml @@ -123,7 +123,7 @@ primitives = { package = "acala-primitives", path = "../../primitives", default- runtime-common = { path = "../common", default-features = false } # benchmarking deps -libsecp256k1 = { version = "0.6", default-features = false, optional = true } +libsecp256k1 = { version = "0.7", default-features = false, optional = true } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } [build-dependencies] diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index 13ed3bdf53..a80810f251 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -11,7 +11,7 @@ serde = { version = "1.0.136" } serde_json = "1.0.68" hex = { version = "0.4" } hex-literal = { version = "0.3.1" } -libsecp256k1 = { version = "0.6" } +libsecp256k1 = { version = "0.7" } # substrate frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/runtime/karura/Cargo.toml b/runtime/karura/Cargo.toml index dc08e4d8f8..9f4ec65593 100644 --- a/runtime/karura/Cargo.toml +++ b/runtime/karura/Cargo.toml @@ -124,7 +124,7 @@ primitives = { package = "acala-primitives", path = "../../primitives", default- runtime-common = { path = "../common", default-features = false } # benchmarking deps -libsecp256k1 = { version = "0.6", default-features = false, optional = true } +libsecp256k1 = { version = "0.7", default-features = false, optional = true } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } [build-dependencies] diff --git a/runtime/mandala/Cargo.toml b/runtime/mandala/Cargo.toml index 2fa895661c..dc060389be 100644 --- a/runtime/mandala/Cargo.toml +++ b/runtime/mandala/Cargo.toml @@ -13,7 +13,7 @@ serde_json = { version = "1.0.68", default-features = false, features = ["alloc" hex = { version = "0.4", default-features = false } hex-literal = { version = "0.3.1" } scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } -libsecp256k1 = { version = "0.6", default-features = false, optional = true } +libsecp256k1 = { version = "0.7", default-features = false, optional = true } # substrate frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } From f92506f11bbc90c54d2320b61bd01624fb8fce97 Mon Sep 17 00:00:00 2001 From: zqh Date: Sun, 3 Apr 2022 19:49:24 +0800 Subject: [PATCH 15/25] clean --- Cargo.lock | 1 - modules/evm-utility/Cargo.toml | 3 --- 2 files changed, 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ad6cde3e4..bad7c427bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6293,7 +6293,6 @@ dependencies = [ "evm", "evm-gasometer", "evm-runtime", - "scale-info", "sha3 0.9.1", "sp-std", ] diff --git a/modules/evm-utility/Cargo.toml b/modules/evm-utility/Cargo.toml index 43eb317d44..c297833e6c 100644 --- a/modules/evm-utility/Cargo.toml +++ b/modules/evm-utility/Cargo.toml @@ -14,14 +14,11 @@ evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8 evm-runtime = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false } ethereum = { git = "https://github.com/rust-blockchain/ethereum", rev = "755dffaa4903fbec1269f50cde9863cf86269a14", default-features = false, features = ["with-codec"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } - [features] default = ["std"] std = [ "sha3/std", "sp-std/std", - "scale-info/std", "evm/std", "evm/with-serde", "evm-runtime/std", From 4aad061300a5b18d90bcacfdc8c82101b801785b Mon Sep 17 00:00:00 2001 From: zqh Date: Sun, 3 Apr 2022 20:25:44 +0800 Subject: [PATCH 16/25] update WeightInfo --- node/service/src/chain_spec/mandala.rs | 16 ++++++++-------- node/service/src/lib.rs | 23 +++++++++++------------ runtime/acala/src/xcm_config.rs | 2 +- runtime/karura/src/xcm_config.rs | 2 +- runtime/mandala/src/xcm_config.rs | 2 +- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/node/service/src/chain_spec/mandala.rs b/node/service/src/chain_spec/mandala.rs index 0d9b9f513a..01f17cb722 100644 --- a/node/service/src/chain_spec/mandala.rs +++ b/node/service/src/chain_spec/mandala.rs @@ -16,9 +16,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -use crate::chain_spec::{get_account_id_from_seed, get_authority_keys_from_seed, Extensions, TELEMETRY_URL}; use acala_primitives::{AccountId, Balance, TokenSymbol}; +use coins_bip39::{English, Mnemonic, Wordlist}; +use elliptic_curve::sec1::ToEncodedPoint; use hex_literal::hex; +use k256::{ + ecdsa::{SigningKey, VerifyingKey}, + EncodedPoint as K256PublicKey, +}; use runtime_common::evm_genesis; use sc_chain_spec::ChainType; use sc_telemetry::TelemetryEndpoints; @@ -28,15 +33,10 @@ use sp_core::{crypto::UncheckedInto, sr25519, H160}; use sp_finality_grandpa::AuthorityId as GrandpaId; use sp_runtime::{traits::Zero, FixedPointNumber, FixedU128}; use sp_std::{collections::btree_map::BTreeMap, str::FromStr}; - -use coins_bip39::{English, Mnemonic, Wordlist}; -use elliptic_curve::sec1::ToEncodedPoint; -use k256::{ - ecdsa::{SigningKey, VerifyingKey}, - EncodedPoint as K256PublicKey, -}; use tiny_keccak::{Hasher, Keccak}; +use crate::chain_spec::{get_account_id_from_seed, get_authority_keys_from_seed, Extensions, TELEMETRY_URL}; + pub type ChainSpec = sc_service::GenericChainSpec; pub const PARA_ID: u32 = 2000; diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index bb30b8aec9..df3ea70db8 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -20,6 +20,8 @@ #![allow(clippy::type_complexity)] //! Acala service. Specialized wrapper over substrate service. + +use acala_primitives::{Block, Hash}; use cumulus_client_cli::CollatorOptions; use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; use cumulus_client_consensus_common::ParachainConsensus; @@ -28,36 +30,33 @@ use cumulus_client_service::{ prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, }; use cumulus_primitives_core::ParaId; +use cumulus_primitives_parachain_inherent::{MockValidationDataInherentDataProvider, MockXcmConfig}; +use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult}; use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface; - -use acala_primitives::{Block, Hash}; -use cumulus_primitives_parachain_inherent::{MockValidationDataInherentDataProvider, MockXcmConfig}; use sc_client_api::ExecutorProvider; use sc_consensus::LongestChain; use sc_consensus_aura::ImportQueueParams; use sc_executor::NativeElseWasmExecutor; use sc_network::NetworkService; +pub use sc_service::{ + config::{DatabaseSource, PrometheusConfig}, + ChainSpec, +}; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, Role, TFullBackend, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; +pub use sp_api::ConstructRuntimeApi; +use sp_blockchain::HeaderBackend; use sp_consensus_aura::sr25519::{AuthorityId as AuraId, AuthorityPair as AuraPair}; use sp_keystore::SyncCryptoStorePtr; use sp_runtime::traits::BlakeTwo256; use sp_trie::PrefixedMemoryDB; -use substrate_prometheus_endpoint::Registry; - -use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; use std::{sync::Arc, time::Duration}; +use substrate_prometheus_endpoint::Registry; pub use client::*; use polkadot_service::CollatorPair; -pub use sc_service::{ - config::{DatabaseSource, PrometheusConfig}, - ChainSpec, -}; -pub use sp_api::ConstructRuntimeApi; -use sp_blockchain::HeaderBackend; pub mod chain_spec; mod client; diff --git a/runtime/acala/src/xcm_config.rs b/runtime/acala/src/xcm_config.rs index 495749d88a..7c43b2857b 100644 --- a/runtime/acala/src/xcm_config.rs +++ b/runtime/acala/src/xcm_config.rs @@ -211,7 +211,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ExecuteOverweightOrigin = EnsureRootOrHalfGeneralCouncil; type ControllerOrigin = EnsureRootOrHalfGeneralCouncil; type ControllerOriginConverter = XcmOriginToCallOrigin; - type WeightInfo = (); + type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight; } impl cumulus_pallet_dmp_queue::Config for Runtime { diff --git a/runtime/karura/src/xcm_config.rs b/runtime/karura/src/xcm_config.rs index 747c3310d0..b7d76a5197 100644 --- a/runtime/karura/src/xcm_config.rs +++ b/runtime/karura/src/xcm_config.rs @@ -273,7 +273,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ExecuteOverweightOrigin = EnsureRootOrHalfGeneralCouncil; type ControllerOrigin = EnsureRootOrHalfGeneralCouncil; type ControllerOriginConverter = XcmOriginToCallOrigin; - type WeightInfo = (); + type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight; } impl cumulus_pallet_dmp_queue::Config for Runtime { diff --git a/runtime/mandala/src/xcm_config.rs b/runtime/mandala/src/xcm_config.rs index e1932db093..36ea9babc5 100644 --- a/runtime/mandala/src/xcm_config.rs +++ b/runtime/mandala/src/xcm_config.rs @@ -204,7 +204,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ExecuteOverweightOrigin = EnsureRootOrHalfGeneralCouncil; type ControllerOrigin = EnsureRootOrHalfGeneralCouncil; type ControllerOriginConverter = XcmOriginToCallOrigin; - type WeightInfo = (); + type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight; } impl cumulus_pallet_dmp_queue::Config for Runtime { From 4b28061b2d792ea538c057db73ee3ddc6ec8eca8 Mon Sep 17 00:00:00 2001 From: Ermal Kaleci Date: Sun, 3 Apr 2022 18:19:29 +0200 Subject: [PATCH 17/25] fix evm-bench (#2019) --- Cargo.lock | 1 + runtime/common/Cargo.toml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f01dd388b..c667aa3e06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10751,6 +10751,7 @@ dependencies = [ "pallet-scheduler", "pallet-timestamp", "pallet-utility", + "pallet-xcm", "parity-scale-codec", "scale-info", "serde", diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index a31a0381cc..bcf1953fff 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -14,7 +14,7 @@ hex-literal = "0.3.1" static_assertions = "1.1.0" num_enum = { version = "0.5.1", default-features = false } serde = { version = "1.0.136", optional = true, default-features = false } -serde_json = { version = "1.0.68", default-features = false } +serde_json = { version = "1.0.68", default-features = false, features = ["alloc"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } ethabi = { version = "17.0.0", default-features = false } scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } @@ -62,6 +62,7 @@ module-evm-bridge = { path = "../../modules/evm-bridge", default-features = fals pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false, optional = true } [features] default = ["std"] @@ -124,6 +125,7 @@ bench = [ "pallet-timestamp/runtime-benchmarks", "pallet-proxy/runtime-benchmarks", "pallet-utility/runtime-benchmarks", + "pallet-xcm/runtime-benchmarks", "sp-runtime/runtime-benchmarks", @@ -137,6 +139,5 @@ bench = [ "module-evm-accounts", "xcm/runtime-benchmarks", - "xcm-executor/runtime-benchmarks", "xcm-builder/runtime-benchmarks", ] From d5a1ceafa782f4eeecf9079e47159404bea24950 Mon Sep 17 00:00:00 2001 From: zqh Date: Mon, 4 Apr 2022 09:36:17 +0800 Subject: [PATCH 18/25] update lock --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index c667aa3e06..44238a6be1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14998,7 +14998,7 @@ dependencies = [ [[package]] name = "xcm-emulator" version = "0.1.0" -source = "git+https://github.com/zqhxuyuan/xcm-simulator?rev=0e4574b0de910521962337b7539ace359fa1afed#0e4574b0de910521962337b7539ace359fa1afed" +source = "git+https://github.com/shaunxw/xcm-simulator?rev=22d94e7754b7d8b956b20855b51891928ed0a2f5#22d94e7754b7d8b956b20855b51891928ed0a2f5" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", From 1412d296ef70ed05df1ae04edb37270d8a3092f7 Mon Sep 17 00:00:00 2001 From: zqh Date: Mon, 4 Apr 2022 17:08:22 +0800 Subject: [PATCH 19/25] use wasm only --- Cargo.lock | 1 + node/service/Cargo.toml | 1 + node/service/src/client.rs | 6 +-- node/service/src/lib.rs | 84 +++++++++++++++++--------------------- 4 files changed, 43 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 44238a6be1..f2a5354bbc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -302,6 +302,7 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-inherents", + "sp-io", "sp-keystore", "sp-offchain", "sp-runtime", diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index acd380d236..04dc7a6ead 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -22,6 +22,7 @@ k256 = { version = "0.10.4", default-features = false, features = ["keccak256", tiny-keccak = { version = "2.0", features = ["keccak"] } sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } diff --git a/node/service/src/client.rs b/node/service/src/client.rs index 00f22f5e49..ac2c241028 100644 --- a/node/service/src/client.rs +++ b/node/service/src/client.rs @@ -147,11 +147,11 @@ pub trait ClientHandle { #[derive(Clone)] pub enum Client { #[cfg(feature = "with-mandala-runtime")] - Mandala(Arc>), + Mandala(Arc>), #[cfg(feature = "with-karura-runtime")] - Karura(Arc>), + Karura(Arc>), #[cfg(feature = "with-acala-runtime")] - Acala(Arc>), + Acala(Arc>), } impl ClientHandle for Client { diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index df3ea70db8..a437bbf122 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -34,16 +34,17 @@ use cumulus_primitives_parachain_inherent::{MockValidationDataInherentDataProvid use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult}; use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface; -use sc_client_api::ExecutorProvider; use sc_consensus::LongestChain; use sc_consensus_aura::ImportQueueParams; -use sc_executor::NativeElseWasmExecutor; +use sc_executor::WasmExecutor; use sc_network::NetworkService; pub use sc_service::{ config::{DatabaseSource, PrometheusConfig}, ChainSpec, }; -use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, Role, TFullBackend, TaskManager}; +use sc_service::{ + error::Error as ServiceError, Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager, +}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; pub use sp_api::ConstructRuntimeApi; use sp_blockchain::HeaderBackend; @@ -63,16 +64,14 @@ mod client; #[cfg(feature = "with-mandala-runtime")] mod instant_finalize; -pub fn default_mock_parachain_inherent_data_provider() -> MockValidationDataInherentDataProvider { - MockValidationDataInherentDataProvider { - current_para_block: 0, - relay_offset: 1000, - relay_blocks_per_para_block: 2, - xcm_config: Default::default(), - raw_downward_messages: vec![], - raw_horizontal_messages: vec![], - } -} +#[cfg(not(feature = "runtime-benchmarks"))] +type HostFunctions = sp_io::SubstrateHostFunctions; + +#[cfg(feature = "runtime-benchmarks")] +type HostFunctions = ( + sp_io::SubstrateHostFunctions, + frame_benchmarking::benchmarking::HostFunctions, +); #[cfg(feature = "with-mandala-runtime")] mod mandala_executor { @@ -182,32 +181,30 @@ impl IdentifyVariant for Box { type FullBackend = TFullBackend; /// Acala's full client. -type FullClient = - sc_service::TFullClient>; +type FullClient = TFullClient>; /// Maybe Mandala Dev full select chain. type MaybeFullSelectChain = Option>; -pub fn new_partial( +pub fn new_partial( config: &Configuration, dev: bool, instant_sealing: bool, ) -> Result< PartialComponents< - FullClient, + FullClient, FullBackend, MaybeFullSelectChain, sc_consensus::import_queue::BasicQueue>, - sc_transaction_pool::FullPool>, + sc_transaction_pool::FullPool>, (Option, Option), >, sc_service::Error, > where - RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, RuntimeApi::RuntimeApi: RuntimeApiCollection>, RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, - Executor: sc_executor::NativeExecutionDispatch + 'static, { let telemetry = config .telemetry_endpoints @@ -220,19 +217,19 @@ where }) .transpose()?; - let executor = NativeElseWasmExecutor::::new( + let executor = WasmExecutor::::new( config.wasm_method, config.default_heap_pages, config.max_runtime_instances, + None, config.runtime_cache_size, ); - let (client, backend, keystore_container, task_manager) = - sc_service::new_full_parts::>( - config, - telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), - executor, - )?; + let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::( + config, + telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), + executor, + )?; let client = Arc::new(client); let telemetry_worker_handle = telemetry.as_ref().map(|(worker, _)| worker.handle()); @@ -309,7 +306,7 @@ where }, spawner: &task_manager.spawn_essential_handle(), registry, - can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), + can_author_with: sp_consensus::AlwaysCanAuthor, check_for_equivocation: Default::default(), telemetry: telemetry.as_ref().map(|x| x.handle()), })? @@ -332,7 +329,7 @@ where Ok((time, slot)) }, registry, - can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), + can_author_with: sp_consensus::AlwaysCanAuthor, spawner: &task_manager.spawn_essential_handle(), telemetry: telemetry.as_ref().map(|telemetry| telemetry.handle()), }, @@ -373,31 +370,28 @@ async fn build_relay_chain_interface( /// This is the actual implementation that is abstract over the executor and the /// runtime api. #[sc_tracing::logging::prefix_logs_with("Parachain")] -async fn start_node_impl( +async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, collator_options: CollatorOptions, id: ParaId, _rpc_ext_builder: RB, build_consensus: BIC, -) -> sc_service::error::Result<(TaskManager, Arc>)> +) -> sc_service::error::Result<(TaskManager, Arc>)> where - RB: Fn( - Arc>, - ) -> Result, sc_service::Error> + RB: Fn(Arc>) -> Result, sc_service::Error> + Send + 'static, - RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, RuntimeApi::RuntimeApi: RuntimeApiCollection>, RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, - Executor: sc_executor::NativeExecutionDispatch + 'static, BIC: FnOnce( - Arc>, + Arc>, Option<&Registry>, Option, &TaskManager, Arc, - Arc>>, + Arc>>, Arc>, SyncCryptoStorePtr, bool, @@ -546,12 +540,11 @@ pub async fn start_node( polkadot_config: Configuration, collator_options: CollatorOptions, id: ParaId, -) -> sc_service::error::Result<(TaskManager, Arc>)> +) -> sc_service::error::Result<(TaskManager, Arc>)> where - RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, RuntimeApi::RuntimeApi: RuntimeApiCollection>, RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, - Executor: sc_executor::NativeExecutionDispatch + 'static, { start_node_impl( parachain_config, @@ -674,7 +667,7 @@ pub fn new_chain_ops( import_queue, task_manager, .. - } = new_partial::(config, false, false)?; + } = new_partial::(config, false, false)?; Ok((Arc::new(Client::Karura(client)), backend, import_queue, task_manager)) } #[cfg(not(feature = "with-karura-runtime"))] @@ -688,7 +681,7 @@ pub fn new_chain_ops( import_queue, task_manager, .. - } = new_partial::(config, false, false)?; + } = new_partial::(config, false, false)?; Ok((Arc::new(Client::Acala(client)), backend, import_queue, task_manager)) } #[cfg(not(feature = "with-acala-runtime"))] @@ -707,7 +700,7 @@ fn inner_mandala_dev(config: Configuration, instant_sealing: bool) -> Result(&config, true, instant_sealing)?; + } = new_partial::(&config, true, instant_sealing)?; let (network, system_rpc_tx, network_starter) = sc_service::build_network(sc_service::BuildNetworkParams { config: &config, @@ -817,7 +810,6 @@ fn inner_mandala_dev(config: Configuration, instant_sealing: bool) -> Result Result Date: Mon, 4 Apr 2022 17:23:31 +0800 Subject: [PATCH 20/25] cleam start_node --- node/cli/src/command.rs | 2 +- node/service/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs index e4277edbf8..1be84c7034 100644 --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -498,7 +498,7 @@ pub fn run() -> sc_cli::Result<()> { with_runtime_or_err!(config.chain_spec, { { - service::start_node::(config, polkadot_config, collator_options, id) + service::start_node::(config, polkadot_config, collator_options, id) .await .map(|r| r.0) .map_err(Into::into) diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index a437bbf122..b9a6ad5cd9 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -535,7 +535,7 @@ where } /// Start a normal parachain node. -pub async fn start_node( +pub async fn start_node( parachain_config: Configuration, polkadot_config: Configuration, collator_options: CollatorOptions, From bd129b843a202823f4b0cd4746d41783eaf4709e Mon Sep 17 00:00:00 2001 From: zqh Date: Mon, 4 Apr 2022 23:10:48 +0800 Subject: [PATCH 21/25] try remove ethereum as evm already has it --- Cargo.lock | 21 +-------------------- modules/earning/Cargo.toml | 2 +- modules/evm-utility/Cargo.toml | 2 -- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f2a5354bbc..7441a6a34e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2892,24 +2892,6 @@ dependencies = [ "triehash", ] -[[package]] -name = "ethereum" -version = "0.12.0" -source = "git+https://github.com/rust-blockchain/ethereum?rev=755dffaa4903fbec1269f50cde9863cf86269a14#755dffaa4903fbec1269f50cde9863cf86269a14" -dependencies = [ - "bytes 1.1.0", - "ethereum-types", - "hash-db", - "hash256-std-hasher", - "parity-scale-codec", - "rlp", - "rlp-derive", - "scale-info", - "serde", - "sha3 0.10.1", - "triehash", -] - [[package]] name = "ethereum-types" version = "0.13.1" @@ -2939,7 +2921,7 @@ source = "git+https://github.com/rust-blockchain/evm?rev=0b686f8c2c83a52638917ca dependencies = [ "auto_impl", "environmental", - "ethereum 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ethereum", "evm-core", "evm-gasometer", "evm-runtime", @@ -6242,7 +6224,6 @@ dependencies = [ name = "module-evm-utility" version = "2.4.2" dependencies = [ - "ethereum 0.12.0 (git+https://github.com/rust-blockchain/ethereum?rev=755dffaa4903fbec1269f50cde9863cf86269a14)", "evm", "evm-gasometer", "evm-runtime", diff --git a/modules/earning/Cargo.toml b/modules/earning/Cargo.toml index 4a07ea4526..81026b7fb5 100644 --- a/modules/earning/Cargo.toml +++ b/modules/earning/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -scale-info = { version = "2.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } diff --git a/modules/evm-utility/Cargo.toml b/modules/evm-utility/Cargo.toml index c297833e6c..dec3ef73b1 100644 --- a/modules/evm-utility/Cargo.toml +++ b/modules/evm-utility/Cargo.toml @@ -12,7 +12,6 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v evm = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false, features = ["with-codec"] } evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false } evm-runtime = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false } -ethereum = { git = "https://github.com/rust-blockchain/ethereum", rev = "755dffaa4903fbec1269f50cde9863cf86269a14", default-features = false, features = ["with-codec"] } [features] default = ["std"] @@ -23,7 +22,6 @@ std = [ "evm/with-serde", "evm-runtime/std", "evm-gasometer/std", - "ethereum/with-serde", ] tracing = [ "evm/tracing", From ec88d1ec0afa93b76a844f19c8cac4c9462b5ae7 Mon Sep 17 00:00:00 2001 From: zqh Date: Mon, 4 Apr 2022 23:21:45 +0800 Subject: [PATCH 22/25] update ethereum --- Cargo.lock | 1 + modules/evm-utility/Cargo.toml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 7441a6a34e..5d3e0d31af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6224,6 +6224,7 @@ dependencies = [ name = "module-evm-utility" version = "2.4.2" dependencies = [ + "ethereum", "evm", "evm-gasometer", "evm-runtime", diff --git a/modules/evm-utility/Cargo.toml b/modules/evm-utility/Cargo.toml index dec3ef73b1..d7513e0b00 100644 --- a/modules/evm-utility/Cargo.toml +++ b/modules/evm-utility/Cargo.toml @@ -12,6 +12,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v evm = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false, features = ["with-codec"] } evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false } evm-runtime = { git = "https://github.com/rust-blockchain/evm", rev = "0b686f8c2c83a52638917caa649dc23302fda80d", default-features = false } +ethereum = { version = "0.12.0", default-features = false, features = ["with-codec"] } [features] default = ["std"] @@ -22,6 +23,7 @@ std = [ "evm/with-serde", "evm-runtime/std", "evm-gasometer/std", + "ethereum/with-serde", ] tracing = [ "evm/tracing", From a2d2fc4895698e26af2f8c5cd5a648101497f77a Mon Sep 17 00:00:00 2001 From: zqh Date: Tue, 5 Apr 2022 09:35:49 +0800 Subject: [PATCH 23/25] evm test add skip_wasm_build --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0283b3b4ac..05913c78f2 100644 --- a/Makefile +++ b/Makefile @@ -126,7 +126,7 @@ test-eth: githooks test-evm .PHONY: test-evm test-evm: githooks - cargo test --manifest-path evm-tests/jsontests/Cargo.toml + SKIP_WASM_BUILD= cargo test --manifest-path evm-tests/jsontests/Cargo.toml .PHONY: test-runtimes test-runtimes: From 682b5c673525f7f30e730e41bb0bba1798ad4731 Mon Sep 17 00:00:00 2001 From: zqh Date: Tue, 5 Apr 2022 11:10:07 +0800 Subject: [PATCH 24/25] update evm-test --- evm-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evm-tests b/evm-tests index d6286a8dfd..e16c64abef 160000 --- a/evm-tests +++ b/evm-tests @@ -1 +1 @@ -Subproject commit d6286a8dfd208ab6adec6ebbb529118631703807 +Subproject commit e16c64abefac7201204f6fbf070c5d746fc501bf From 2fe33e356fe51d186257af72a05a5b477d8079ac Mon Sep 17 00:00:00 2001 From: Ermal Kaleci Date: Tue, 5 Apr 2022 15:08:25 +0200 Subject: [PATCH 25/25] update evm-bench --- evm-bench | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evm-bench b/evm-bench index 1d32bc1f0a..046d2e953d 160000 --- a/evm-bench +++ b/evm-bench @@ -1 +1 @@ -Subproject commit 1d32bc1f0a40107fd64ec2d2212475514878b3d5 +Subproject commit 046d2e953da22ee6560c890cdebaa029450eb605