From 4caa04cc1973faa7109c637d330c6dddc3b12f11 Mon Sep 17 00:00:00 2001 From: Guantong <04637@163.com> Date: Mon, 23 May 2022 14:51:16 +0800 Subject: [PATCH] Companion for darwinia-bridges-substrate#1581f60cd5951a3fa4f9fd534798568c67bb7223 --- Cargo.lock | 938 ++++++++++++++++++-------------------- Cargo.toml | 12 + runtime/common/src/lib.rs | 29 +- 3 files changed, 476 insertions(+), 503 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 532196da..f99168f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -457,7 +457,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", @@ -490,7 +490,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", @@ -510,8 +510,8 @@ name = "beefy-primitives" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-core", @@ -559,28 +559,16 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ - "funty 2.0.0", - "radium 0.7.0", + "funty", + "radium", "tap", - "wyz 0.5.0", + "wyz", ] [[package]] @@ -736,14 +724,13 @@ dependencies = [ [[package]] name = "bp-darwinia-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "frame-support", "frame-system", - "parity-scale-codec 2.3.1", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -752,13 +739,12 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "finality-grandpa 0.14.4", + "bp-runtime 0.1.0", + "finality-grandpa", "frame-support", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-finality-grandpa", @@ -771,10 +757,10 @@ name = "bp-header-chain" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "finality-grandpa 0.15.0", + "finality-grandpa", "frame-support", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-finality-grandpa", @@ -785,12 +771,11 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-runtime 0.1.0", "frame-support", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-std", ] @@ -801,23 +786,22 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-std", ] [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec 1.0.0", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bitvec", + "bp-runtime 0.1.0", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-std", @@ -828,13 +812,13 @@ name = "bp-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-std", ] @@ -842,11 +826,10 @@ dependencies = [ [[package]] name = "bp-pangolin" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-darwinia-core", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "frame-support", "sp-api", "sp-runtime", @@ -857,11 +840,10 @@ dependencies = [ [[package]] name = "bp-pangolin-parachain" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "bp-darwinia-core", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "frame-support", "sp-api", "sp-runtime", @@ -872,14 +854,15 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "parity-util-mem", + "scale-info", + "serde", "sp-api", "sp-core", "sp-runtime", @@ -896,8 +879,8 @@ dependencies = [ "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-core", "sp-runtime", @@ -914,7 +897,7 @@ dependencies = [ "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "smallvec", "sp-api", "sp-runtime", @@ -925,13 +908,12 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -948,8 +930,8 @@ dependencies = [ "frame-support", "hash-db", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -961,12 +943,11 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-header-chain 0.1.0", "ed25519-dalek", - "finality-grandpa 0.14.4", - "parity-scale-codec 3.1.2", + "finality-grandpa", + "parity-scale-codec", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -980,8 +961,8 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "ed25519-dalek", - "finality-grandpa 0.15.0", - "parity-scale-codec 3.1.2", + "finality-grandpa", + "parity-scale-codec", "sp-application-crypto", "sp-finality-grandpa", "sp-runtime", @@ -997,7 +978,7 @@ dependencies = [ "bp-polkadot-core 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-rococo", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-runtime", "sp-std", @@ -1006,22 +987,22 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-message-dispatch 0.1.0", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "ed25519-dalek", "frame-support", "frame-system", "hash-db", "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-dispatch 0.1.0", + "pallet-bridge-grandpa 0.1.0", + "pallet-bridge-messages 0.1.0", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", + "sp-api", "sp-core", "sp-runtime", "sp-state-machine", @@ -1044,8 +1025,8 @@ dependencies = [ "pallet-bridge-grandpa 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "pallet-bridge-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-state-machine", @@ -1426,9 +1407,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "smallvec", "sp-api", "sp-block-builder", @@ -1698,7 +1679,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", @@ -1721,7 +1702,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", @@ -1750,7 +1731,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", @@ -1796,7 +1777,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", @@ -1820,7 +1801,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", @@ -1846,7 +1827,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", @@ -1874,8 +1855,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-aura", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-application-crypto", "sp-consensus-aura", @@ -1892,8 +1873,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -1915,9 +1896,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-balances", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "serde", "sp-core", "sp-externalities", @@ -1950,8 +1931,8 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -1969,9 +1950,9 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.3.1", - "scale-info 2.1.1", + "scale-info", "sp-runtime", "sp-std", "xcm", @@ -1984,7 +1965,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2003,9 +1984,9 @@ 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 2.1.1", + "scale-info", "sp-api", "sp-core", "sp-inherents", @@ -2024,7 +2005,7 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e9 dependencies = [ "cumulus-primitives-core", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-inherents", "sp-std", "sp-timestamp", @@ -2037,7 +2018,7 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e9 dependencies = [ "cumulus-primitives-core", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", @@ -2085,7 +2066,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", @@ -2111,7 +2092,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", @@ -2131,7 +2112,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.18#b1e91afb7421309b203d7627b736d9bcf58260eb" dependencies = [ "cumulus-primitives-core", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sp-runtime", "sp-state-machine", @@ -2193,7 +2174,7 @@ dependencies = [ "log", "pallet-transaction-payment-rpc", "pangolin-parachain-runtime", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-cli", "polkadot-parachain", "polkadot-primitives", @@ -2269,9 +2250,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "smallvec", "sp-api", "sp-block-builder", @@ -2320,13 +2301,13 @@ dependencies = [ name = "dc-common-runtime" version = "5.2.0-rc1" dependencies = [ - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-messages 0.1.0", + "bridge-runtime-common 0.1.0", "dc-primitives", "frame-support", "frame-system", "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-dispatch 0.1.0", "pallet-collator-selection", "pallet-fee-market", "pallet-transaction-payment", @@ -2652,6 +2633,33 @@ dependencies = [ "libc", ] +[[package]] +name = "ethbloom" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef" +dependencies = [ + "crunchy", + "fixed-hash", + "impl-rlp", + "impl-serde", + "tiny-keccak", +] + +[[package]] +name = "ethereum-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6" +dependencies = [ + "ethbloom", + "fixed-hash", + "impl-rlp", + "impl-serde", + "primitive-types", + "uint", +] + [[package]] name = "event-listener" version = "2.5.2" @@ -2766,22 +2774,6 @@ dependencies = [ "log", ] -[[package]] -name = "finality-grandpa" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" -dependencies = [ - "either", - "futures 0.3.21", - "futures-timer", - "log", - "num-traits", - "parity-scale-codec 2.3.1", - "parking_lot 0.11.2", - "scale-info 1.0.0", -] - [[package]] name = "finality-grandpa" version = "0.15.0" @@ -2793,9 +2785,9 @@ dependencies = [ "futures-timer", "log", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.11.2", - "scale-info 2.1.1", + "scale-info", ] [[package]] @@ -2840,7 +2832,7 @@ name = "fork-tree" version = "3.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", ] [[package]] @@ -2862,9 +2854,9 @@ dependencies = [ "frame-system", "linregress", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", - "scale-info 2.1.1", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -2893,7 +2885,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", @@ -2923,8 +2915,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-npos-elections", "sp-std", @@ -2937,8 +2929,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -2953,8 +2945,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", ] @@ -2969,9 +2961,9 @@ dependencies = [ "impl-trait-for-tuples", "log", "once_cell", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", - "scale-info 2.1.1", + "scale-info", "serde", "smallvec", "sp-arithmetic", @@ -3028,8 +3020,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -3046,8 +3038,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -3058,7 +3050,7 @@ name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", ] @@ -3123,12 +3115,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" @@ -3610,7 +3596,7 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.20.5", + "rustls 0.20.6", "rustls-native-certs 0.6.2", "tokio", "tokio-rustls 0.23.4", @@ -3682,7 +3668,16 @@ 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]] +name = "impl-rlp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" +dependencies = [ + "rlp", ] [[package]] @@ -4245,7 +4240,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -4295,12 +4290,12 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -5637,8 +5632,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-timestamp", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-consensus-aura", "sp-runtime", @@ -5653,8 +5648,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-authority-discovery", "sp-runtime", @@ -5669,8 +5664,8 @@ dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-authorship", "sp-runtime", "sp-std", @@ -5688,8 +5683,8 @@ dependencies = [ "pallet-authorship", "pallet-session", "pallet-timestamp", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", @@ -5711,8 +5706,8 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -5729,8 +5724,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -5744,8 +5739,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-session", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -5767,8 +5762,8 @@ dependencies = [ "pallet-mmr", "pallet-mmr-primitives", "pallet-session", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -5786,8 +5781,8 @@ dependencies = [ "frame-system", "log", "pallet-treasury", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -5797,15 +5792,14 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-message-dispatch 0.1.0", + "bp-runtime 0.1.0", "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -5821,8 +5815,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -5831,19 +5825,18 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bp-header-chain 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-test-utils 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "finality-grandpa 0.14.4", + "bp-header-chain 0.1.0", + "bp-runtime 0.1.0", + "bp-test-utils 0.1.0", + "finality-grandpa", "frame-benchmarking", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-finality-grandpa", "sp-runtime", @@ -5859,13 +5852,13 @@ dependencies = [ "bp-header-chain 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-test-utils 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", - "finality-grandpa 0.15.0", + "finality-grandpa", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-finality-grandpa", "sp-runtime", @@ -5876,19 +5869,18 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec 1.0.0", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bitvec", + "bp-message-dispatch 0.1.0", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "frame-benchmarking", "frame-support", "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -5900,7 +5892,7 @@ name = "pallet-bridge-messages" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "bp-message-dispatch 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-messages 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", "bp-runtime 0.1.0 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.18)", @@ -5908,8 +5900,8 @@ dependencies = [ "frame-system", "log", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -5927,9 +5919,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.8.5", - "scale-info 2.1.1", + "scale-info", "serde", "sp-runtime", "sp-staking", @@ -5945,8 +5937,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -5961,8 +5953,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-io", "sp-runtime", @@ -5979,9 +5971,9 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.7.3", - "scale-info 2.1.1", + "scale-info", "sp-arithmetic", "sp-core", "sp-io", @@ -6001,8 +5993,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-npos-elections", @@ -6013,18 +6005,17 @@ dependencies = [ [[package]] name = "pallet-fee-market" version = "0.1.0" -source = "git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18#c1adcf18d2333e0c9a58bd56606672c7fda3c4c0" dependencies = [ - "bitvec 1.0.0", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bitvec", + "bp-messages 0.1.0", + "bp-runtime 0.1.0", "frame-benchmarking", "frame-support", "frame-system", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-messages 0.1.0", "pallet-timestamp", - "parity-scale-codec 2.3.1", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6039,8 +6030,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-runtime", "sp-std", @@ -6057,8 +6048,8 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-core", "sp-finality-grandpa", @@ -6078,8 +6069,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6095,8 +6086,8 @@ dependencies = [ "frame-system", "log", "pallet-authorship", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-core", "sp-io", @@ -6113,8 +6104,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-keyring", @@ -6131,8 +6122,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6149,8 +6140,8 @@ dependencies = [ "frame-support", "frame-system", "pallet-mmr-primitives", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6165,7 +6156,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "sp-api", "sp-core", @@ -6182,7 +6173,7 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "pallet-mmr-primitives", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "sp-api", "sp-blockchain", @@ -6198,8 +6189,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6212,8 +6203,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6228,8 +6219,8 @@ dependencies = [ "frame-system", "log", "pallet-balances", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-staking", @@ -6252,8 +6243,8 @@ dependencies = [ "pallet-offences", "pallet-session", "pallet-staking", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-staking", "sp-std", @@ -6267,8 +6258,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6283,8 +6274,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6297,8 +6288,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6313,8 +6304,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6330,8 +6321,8 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-timestamp", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6364,9 +6355,9 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.2.2", - "scale-info 2.1.1", + "scale-info", "sp-runtime", "sp-std", ] @@ -6383,9 +6374,9 @@ dependencies = [ "log", "pallet-authorship", "pallet-session", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand_chacha 0.2.2", - "scale-info 2.1.1", + "scale-info", "serde", "sp-application-crypto", "sp-io", @@ -6421,8 +6412,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -6437,8 +6428,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-inherents", "sp-io", "sp-runtime", @@ -6456,8 +6447,8 @@ dependencies = [ "frame-system", "log", "pallet-treasury", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -6472,8 +6463,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "smallvec", "sp-core", @@ -6491,7 +6482,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", @@ -6505,7 +6496,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "pallet-transaction-payment", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-runtime", ] @@ -6520,8 +6511,8 @@ dependencies = [ "frame-system", "impl-trait-for-tuples", "pallet-balances", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-runtime", "sp-std", @@ -6535,8 +6526,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -6552,8 +6543,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -6566,8 +6557,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -6585,8 +6576,8 @@ dependencies = [ "frame-support", "frame-system", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", "xcm", @@ -6598,13 +6589,13 @@ name = "pangolin-parachain-runtime" version = "5.2.0-rc1" dependencies = [ "array-bytes", - "bp-message-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-message-dispatch 0.1.0", + "bp-messages 0.1.0", "bp-pangolin", "bp-pangolin-parachain", - "bp-polkadot-core 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bp-runtime 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "bridge-runtime-common 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "bp-polkadot-core 0.1.0", + "bp-runtime 0.1.0", + "bridge-runtime-common 0.1.0", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -6624,9 +6615,9 @@ dependencies = [ "pallet-aura", "pallet-authorship", "pallet-balances", - "pallet-bridge-dispatch 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "pallet-bridge-grandpa 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", - "pallet-bridge-messages 0.1.0 (git+https://github.com/darwinia-network/darwinia-bridges-substrate?branch=polkadot-v0.9.18)", + "pallet-bridge-dispatch 0.1.0", + "pallet-bridge-grandpa 0.1.0", + "pallet-bridge-messages 0.1.0", "pallet-collator-selection", "pallet-fee-market", "pallet-multisig", @@ -6641,9 +6632,9 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parachain-info", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "smallvec", "sp-api", "sp-block-builder", @@ -6670,8 +6661,8 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", ] @@ -6694,20 +6685,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" @@ -6715,25 +6692,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" dependencies = [ "arrayvec 0.7.2", - "bitvec 1.0.0", + "bitvec", "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" @@ -6773,8 +6738,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", + "ethereum-types", "hashbrown 0.12.1", "impl-trait-for-tuples", + "lru 0.7.5", "parity-util-mem-derive", "parking_lot 0.12.0", "primitive-types", @@ -7092,7 +7059,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7114,7 +7081,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7207,9 +7174,9 @@ name = "polkadot-core-primitives" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", - "scale-info 2.1.1", + "scale-info", "sp-core", "sp-runtime", "sp-std", @@ -7224,7 +7191,7 @@ dependencies = [ "fatality", "futures 0.3.21", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7243,7 +7210,7 @@ name = "polkadot-erasure-coding" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", @@ -7279,7 +7246,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 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", @@ -7297,7 +7264,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7314,14 +7281,14 @@ name = "polkadot-node-core-approval-voting" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "derive_more", "futures 0.3.21", "futures-timer", "kvdb", "lru 0.7.5", "merlin", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7342,11 +7309,11 @@ name = "polkadot-node-core-av-store" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "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", @@ -7362,7 +7329,7 @@ name = "polkadot-node-core-backing" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7397,7 +7364,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 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", @@ -7431,7 +7398,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", @@ -7449,7 +7416,7 @@ dependencies = [ "futures 0.3.21", "kvdb", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7481,7 +7448,7 @@ name = "polkadot-node-core-provisioner" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -7504,7 +7471,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", @@ -7566,7 +7533,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", @@ -7585,7 +7552,7 @@ dependencies = [ "futures-timer", "log", "metered-channel", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sc-cli", "sc-service", @@ -7602,7 +7569,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", @@ -7619,7 +7586,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "bounded-vec", "futures 0.3.21", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "schnorrkel", @@ -7677,7 +7644,7 @@ dependencies = [ "lru 0.7.5", "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", @@ -7753,10 +7720,10 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0 dependencies = [ "derive_more", "frame-support", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", - "scale-info 2.1.1", + "scale-info", "serde", "sp-core", "sp-runtime", @@ -7783,14 +7750,14 @@ name = "polkadot-primitives" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "bitvec 1.0.0", + "bitvec", "frame-system", "hex-literal", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -7845,7 +7812,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -7891,13 +7858,13 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -7929,7 +7896,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7949,11 +7916,11 @@ dependencies = [ "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "slot-range-helper", @@ -7988,7 +7955,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bs58", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sp-std", "sp-tracing", @@ -8000,7 +7967,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "bitflags", - "bitvec 1.0.0", + "bitvec", "derive_more", "frame-benchmarking", "frame-support", @@ -8014,13 +7981,13 @@ 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", "rand_chacha 0.3.1", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "sp-api", "sp-core", @@ -8147,7 +8114,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", @@ -8164,7 +8131,7 @@ name = "polkadot-statement-table" version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-primitives", "sp-core", ] @@ -8219,8 +8186,9 @@ checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", "impl-codec", + "impl-rlp", "impl-serde", - "scale-info 2.1.1", + "scale-info", "uint", ] @@ -8378,12 +8346,6 @@ dependencies = [ "proc-macro2", ] -[[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" @@ -8621,7 +8583,7 @@ dependencies = [ "env_logger", "jsonrpsee 0.8.0", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "serde", "serde_json", "sp-core", @@ -8670,6 +8632,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "rlp" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" +dependencies = [ + "bytes 1.1.0", + "rustc-hex", +] + [[package]] name = "rocksdb" version = "0.18.0" @@ -8725,13 +8697,13 @@ 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", "polkadot-runtime-parachains", "rococo-runtime-constants", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -8842,9 +8814,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.5" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024a432ae760ab3bff924ad91ce1cfa52cb57ed16e1ef32d0d249cfee1a6c13" +checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log", "ring", @@ -8948,7 +8920,7 @@ dependencies = [ "ip_network", "libp2p", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "prost", "prost-build", "rand 0.7.3", @@ -8972,7 +8944,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", @@ -8992,7 +8964,7 @@ name = "sc-block-builder" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sp-api", "sp-block-builder", @@ -9010,7 +8982,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc 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", @@ -9044,7 +9016,7 @@ dependencies = [ "libp2p", "log", "names", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "rand 0.7.3", "regex", "rpassword", @@ -9078,7 +9050,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", @@ -9109,7 +9081,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", @@ -9154,7 +9126,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", @@ -9188,7 +9160,7 @@ dependencies = [ "num-bigint", "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", @@ -9248,7 +9220,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "fork-tree", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-blockchain", @@ -9264,7 +9236,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", @@ -9298,7 +9270,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc 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", @@ -9324,7 +9296,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-allocator", "sp-core", "sp-maybe-compressed-blob", @@ -9341,7 +9313,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-allocator", "sc-executor-common", "scoped-tls", @@ -9359,7 +9331,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", @@ -9377,13 +9349,13 @@ dependencies = [ "ahash", "async-trait", "dyn-clone", - "finality-grandpa 0.15.0", + "finality-grandpa", "fork-tree", "futures 0.3.21", "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", @@ -9414,14 +9386,14 @@ name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "finality-grandpa 0.15.0", + "finality-grandpa", "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-pubsub", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sc-client-api", "sc-finality-grandpa", "sc-rpc", @@ -9487,7 +9459,7 @@ dependencies = [ "linked_hash_set", "log", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "pin-project 1.0.10", "prost", @@ -9545,7 +9517,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", @@ -9591,7 +9563,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", @@ -9623,7 +9595,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", @@ -9668,7 +9640,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", @@ -9724,7 +9696,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", "parking_lot 0.12.0", @@ -9740,7 +9712,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", @@ -9822,7 +9794,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", @@ -9866,45 +9838,20 @@ 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.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" dependencies = [ - "bitvec 1.0.0", + "bitvec", "cfg-if 1.0.0", "derive_more", - "parity-scale-codec 3.1.2", - "scale-info-derive 2.1.1", + "parity-scale-codec", + "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.1.1" @@ -10272,7 +10219,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "enumn", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "paste", "sp-runtime", "sp-std", @@ -10361,7 +10308,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "hash-db", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api-proc-macro", "sp-core", "sp-runtime", @@ -10388,8 +10335,8 @@ name = "sp-application-crypto" version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-core", "sp-io", @@ -10403,8 +10350,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "integer-sqrt", "num-traits", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-debug-derive", "sp-std", @@ -10416,8 +10363,8 @@ name = "sp-authority-discovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-runtime", @@ -10430,7 +10377,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-inherents", "sp-runtime", "sp-std", @@ -10441,7 +10388,7 @@ name = "sp-block-builder" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -10456,7 +10403,7 @@ dependencies = [ "futures 0.3.21", "log", "lru 0.7.5", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "sp-api", "sp-consensus", @@ -10475,7 +10422,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-core", "sp-inherents", "sp-runtime", @@ -10491,8 +10438,8 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "async-trait", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-consensus", @@ -10510,8 +10457,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "async-trait", "merlin", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -10531,8 +10478,8 @@ name = "sp-consensus-slots" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-arithmetic", "sp-runtime", @@ -10545,7 +10492,7 @@ name = "sp-consensus-vrf" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "schnorrkel", "sp-core", "sp-runtime", @@ -10573,13 +10520,13 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.0", "primitive-types", "rand 0.7.3", "regex", - "scale-info 2.1.1", + "scale-info", "schnorrkel", "secp256k1", "secrecy", @@ -10648,7 +10595,7 @@ version = "0.12.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "environmental", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-std", "sp-storage", ] @@ -10658,10 +10605,10 @@ name = "sp-finality-grandpa" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "finality-grandpa 0.15.0", + "finality-grandpa", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-application-crypto", @@ -10678,7 +10625,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "async-trait", "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-core", "sp-runtime", "sp-std", @@ -10694,7 +10641,7 @@ dependencies = [ "hash-db", "libsecp256k1", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parking_lot 0.12.0", "secp256k1", "sp-core", @@ -10729,7 +10676,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", @@ -10752,8 +10699,8 @@ name = "sp-npos-elections" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "serde", "sp-arithmetic", "sp-core", @@ -10812,11 +10759,11 @@ 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", - "scale-info 2.1.1", + "scale-info", "serde", "sp-application-crypto", "sp-arithmetic", @@ -10831,7 +10778,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "primitive-types", "sp-externalities", "sp-runtime-interface-proc-macro", @@ -10868,8 +10815,8 @@ name = "sp-session" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-api", "sp-core", "sp-runtime", @@ -10882,8 +10829,8 @@ name = "sp-staking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -10896,7 +10843,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", @@ -10922,7 +10869,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "ref-cast", "serde", "sp-debug-derive", @@ -10950,7 +10897,7 @@ dependencies = [ "async-trait", "futures-timer", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -10963,7 +10910,7 @@ name = "sp-tracing" version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-std", "tracing", "tracing-core", @@ -10986,8 +10933,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "async-trait", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-inherents", "sp-runtime", @@ -11002,8 +10949,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "hash-db", "memory-db", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "sp-core", "sp-std", "thiserror", @@ -11017,9 +10964,9 @@ version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ "impl-serde", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "parity-wasm 0.42.2", - "scale-info 2.1.1", + "scale-info", "serde", "sp-core-hashing-proc-macro", "sp-runtime", @@ -11033,7 +10980,7 @@ name = "sp-version-proc-macro" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc3fd073d3a0acf9933c3994b660ebd7b5833f65" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", "proc-macro2", "quote", "syn", @@ -11046,7 +10993,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.18#fc dependencies = [ "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-std", "wasmi", "wasmtime", @@ -11215,7 +11162,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", @@ -11417,6 +11364,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -11480,7 +11436,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.5", + "rustls 0.20.6", "tokio", "webpki 0.22.0", ] @@ -11706,7 +11662,7 @@ dependencies = [ "clap", "jsonrpsee 0.4.1", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "remote-externalities", "sc-chain-spec", "sc-cli", @@ -12302,7 +12258,7 @@ version = "0.9.18" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.18#9ed0c98204d25eaad8a6b40248daee8e6a40d111" dependencies = [ "beefy-primitives", - "bitvec 1.0.0", + "bitvec", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -12350,13 +12306,13 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "pallet-xcm-benchmarks", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", - "scale-info 2.1.1", + "scale-info", "serde", "serde_derive", "smallvec", @@ -12516,12 +12472,6 @@ dependencies = [ "winapi-build", ] -[[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" @@ -12550,8 +12500,8 @@ dependencies = [ "derivative", "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", - "scale-info 2.1.1", + "parity-scale-codec", + "scale-info", "xcm-procedural", ] @@ -12564,9 +12514,9 @@ dependencies = [ "frame-system", "log", "pallet-transaction-payment", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "polkadot-parachain", - "scale-info 2.1.1", + "scale-info", "sp-arithmetic", "sp-io", "sp-runtime", @@ -12584,7 +12534,7 @@ dependencies = [ "frame-support", "impl-trait-for-tuples", "log", - "parity-scale-codec 3.1.2", + "parity-scale-codec", "sp-arithmetic", "sp-core", "sp-io", diff --git a/Cargo.toml b/Cargo.toml index 4bf1ca21..2868fabc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,3 +118,15 @@ members = [ "rpc", "runtime/*", ] +[patch."https://github.com/darwinia-network/darwinia-bridges-substrate"] +bp-message-dispatch = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/message-dispatch" } +bp-messages = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/messages" } +bp-pangolin = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/chain-pangolin" } +bp-pangolin-parachain = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/chain-pangolin-parachain" } +bp-polkadot-core = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/polkadot-core" } +bp-runtime = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/primitives/runtime" } +bridge-runtime-common = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/bin/runtime-common" } +pallet-bridge-dispatch = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/modules/dispatch" } +pallet-bridge-grandpa = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/modules/grandpa" } +pallet-bridge-messages = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/modules/messages" } +pallet-fee-market = { path = "/home/workspace/darwinia-git/darwinia-bridges-substrate/modules/fee-market" } diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 2aef8ff3..64f0f375 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -21,10 +21,7 @@ // --- core --- use core::marker::PhantomData; // --- paritytech --- -use bp_messages::{ - source_chain::{LaneMessageVerifier, Sender}, - LaneId, OutboundLaneData, -}; +use bp_messages::{source_chain::LaneMessageVerifier, LaneId, OutboundLaneData}; use bridge_runtime_common::messages::{source::*, *}; use frame_support::{ traits::{Currency, Imbalance, OnUnbalanced}, @@ -133,6 +130,7 @@ where pub struct FromThisChainMessageVerifier(PhantomData<(B, R, I)>); impl LaneMessageVerifier< + OriginOf>, AccountIdOf>, FromThisChainMessagePayload, BalanceOf>, @@ -147,15 +145,15 @@ where type Error = &'static str; fn verify_message( - submitter: &Sender>>, + submitter: &OriginOf>, delivery_and_dispatch_fee: &BalanceOf>, lane: &LaneId, lane_outbound_data: &OutboundLaneData, payload: &FromThisChainMessagePayload, ) -> Result<(), Self::Error> { // reject message if lane is blocked - if !ThisChain::::is_outbound_lane_enabled(lane) { - return Err(OUTBOUND_LANE_DISABLED); + if !ThisChain::::is_message_accepted(submitter, lane) { + return Err(MESSAGE_REJECTED_BY_OUTBOUND_LANE); } // reject message if there are too many pending messages at this lane @@ -169,8 +167,21 @@ where // Do the dispatch-specific check. We assume that the target chain uses // `Dispatch`, so we verify the message accordingly. - pallet_bridge_dispatch::verify_message_origin(submitter, payload) - .map_err(|_| BAD_ORIGIN)?; + let raw_origin_or_err: Result< + frame_system::RawOrigin>>, + OriginOf>, + > = submitter.clone().into(); + if let Ok(raw_origin) = raw_origin_or_err { + pallet_bridge_dispatch::verify_message_origin(&raw_origin, payload) + .map(drop) + .map_err(|_| BAD_ORIGIN)?; + } else { + // so what it means that we've failed to convert origin to the + // `frame_system::RawOrigin`? now it means that the custom pallet origin has + // been used to send the message. Do we need to verify it? The answer is no, + // because pallet may craft any origin (e.g. root) && we can't verify whether it + // is valid, or not. + }; // Do the delivery_and_dispatch_fee. We assume that the delivery and dispatch fee always // greater than the fee market provided fee.