diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85145bb064..eb20f361f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ env: SCCACHE_VERSION: v0.2.15 SCCACHE_DIR: /home/runner/.cache/sccache NODE_VERSION: 10 - GITHUB_CACHE_VERSION: 0 + GITHUB_CACHE_VERSION: 1 jobs: basic-checks: diff --git a/Cargo.lock b/Cargo.lock index 67a9f457bb..bd54187867 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -712,7 +712,7 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bsc-primitives" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "ethbloom", @@ -977,7 +977,7 @@ dependencies = [ [[package]] name = "common-runtime" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-balances", "darwinia-support", @@ -1370,7 +1370,7 @@ dependencies = [ [[package]] name = "darwinia-balances" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-balances-rpc-runtime-api", "darwinia-support", @@ -1388,7 +1388,7 @@ dependencies = [ [[package]] name = "darwinia-balances-rpc" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-balances-rpc-runtime-api", "jsonrpc-core", @@ -1402,7 +1402,7 @@ dependencies = [ [[package]] name = "darwinia-balances-rpc-runtime-api" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1413,7 +1413,7 @@ dependencies = [ [[package]] name = "darwinia-bridge-bsc" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "bsc-primitives", @@ -1434,7 +1434,7 @@ dependencies = [ [[package]] name = "darwinia-bridge-ethereum" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "blake2-rfc", @@ -1460,7 +1460,7 @@ dependencies = [ [[package]] name = "darwinia-claims" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "darwinia-balances", @@ -1481,7 +1481,7 @@ dependencies = [ [[package]] name = "darwinia-democracy" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-balances", "darwinia-support", @@ -1502,7 +1502,7 @@ dependencies = [ [[package]] name = "darwinia-elections-phragmen" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-balances", "darwinia-support", @@ -1522,7 +1522,7 @@ dependencies = [ [[package]] name = "darwinia-evm" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "darwinia-balances", @@ -1563,7 +1563,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-bridge-ethereum" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-evm", "darwinia-evm-precompile-utils", @@ -1578,7 +1578,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-bridge-s2s" -version = "2.7.2" +version = "2.8.0" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -1600,7 +1600,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-dispatch" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-evm", "darwinia-support", @@ -1614,7 +1614,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-transfer" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "darwinia-evm", @@ -1634,7 +1634,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-utils" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-evm-precompile-utils-macro", "darwinia-support", @@ -1643,7 +1643,7 @@ dependencies = [ [[package]] name = "darwinia-evm-precompile-utils-macro" -version = "2.7.2" +version = "2.8.0" dependencies = [ "evm", "proc-macro2", @@ -1655,7 +1655,7 @@ dependencies = [ [[package]] name = "darwinia-fee-market" -version = "2.7.2" +version = "2.8.0" dependencies = [ "bitvec", "bp-messages", @@ -1678,7 +1678,7 @@ dependencies = [ [[package]] name = "darwinia-fee-market-rpc" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-fee-market-rpc-runtime-api", "jsonrpc-core", @@ -1692,7 +1692,7 @@ dependencies = [ [[package]] name = "darwinia-fee-market-rpc-runtime-api" -version = "2.7.2" +version = "2.8.0" dependencies = [ "bp-messages", "parity-scale-codec", @@ -1704,7 +1704,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "ckb-merkle-mountain-range", @@ -1726,7 +1726,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr-rpc" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-header-mmr-rpc-runtime-api", "jsonrpc-core", @@ -1740,7 +1740,7 @@ dependencies = [ [[package]] name = "darwinia-header-mmr-rpc-runtime-api" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1752,7 +1752,7 @@ dependencies = [ [[package]] name = "darwinia-relay-authorities" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "darwinia-balances", @@ -1772,7 +1772,7 @@ dependencies = [ [[package]] name = "darwinia-relay-primitives" -version = "2.7.2" +version = "2.8.0" dependencies = [ "frame-support", "parity-scale-codec", @@ -1783,7 +1783,7 @@ dependencies = [ [[package]] name = "darwinia-relayer-game" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-balances", "darwinia-relay-primitives", @@ -1804,7 +1804,7 @@ dependencies = [ [[package]] name = "darwinia-staking" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-balances", "darwinia-staking-rpc-runtime-api", @@ -1835,7 +1835,7 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-staking-rpc-runtime-api", "jsonrpc-core", @@ -1849,7 +1849,7 @@ dependencies = [ [[package]] name = "darwinia-staking-rpc-runtime-api" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-support", "parity-scale-codec", @@ -1860,7 +1860,7 @@ dependencies = [ [[package]] name = "darwinia-support" -version = "2.7.2" +version = "2.8.0" dependencies = [ "bp-messages", "bp-runtime", @@ -1880,7 +1880,7 @@ dependencies = [ [[package]] name = "darwinia-vesting" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-balances", "darwinia-support", @@ -1924,7 +1924,7 @@ dependencies = [ [[package]] name = "dc-db" -version = "2.7.2" +version = "2.8.0" dependencies = [ "dvm-ethereum", "fp-evm", @@ -1940,7 +1940,7 @@ dependencies = [ [[package]] name = "dc-mapping-sync" -version = "2.7.2" +version = "2.8.0" dependencies = [ "dc-db", "dp-consensus", @@ -1956,7 +1956,7 @@ dependencies = [ [[package]] name = "dc-rpc" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "dc-db", @@ -2004,7 +2004,7 @@ dependencies = [ [[package]] name = "dc-tracer" -version = "2.7.2" +version = "2.8.0" dependencies = [ "dp-evm-trace-apis", "dp-evm-trace-events", @@ -2107,7 +2107,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dp-asset" -version = "2.7.2" +version = "2.8.0" dependencies = [ "ethereum-types", "parity-scale-codec", @@ -2118,7 +2118,7 @@ dependencies = [ [[package]] name = "dp-consensus" -version = "2.7.2" +version = "2.8.0" dependencies = [ "ethereum", "parity-scale-codec", @@ -2131,7 +2131,7 @@ dependencies = [ [[package]] name = "dp-contract" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "bp-messages", @@ -2144,7 +2144,7 @@ dependencies = [ [[package]] name = "dp-evm-trace-apis" -version = "2.7.2" +version = "2.8.0" dependencies = [ "environmental", "ethereum", @@ -2162,7 +2162,7 @@ dependencies = [ [[package]] name = "dp-evm-trace-events" -version = "2.7.2" +version = "2.8.0" dependencies = [ "environmental", "ethereum", @@ -2176,7 +2176,7 @@ dependencies = [ [[package]] name = "dp-evm-trace-ext" -version = "2.7.2" +version = "2.8.0" dependencies = [ "dp-evm-trace-events", "ethereum-types", @@ -2188,7 +2188,7 @@ dependencies = [ [[package]] name = "dp-evm-trace-rpc" -version = "2.7.2" +version = "2.8.0" dependencies = [ "ethereum-types", "serde", @@ -2196,7 +2196,7 @@ dependencies = [ [[package]] name = "dp-evm-tracer" -version = "2.7.2" +version = "2.8.0" dependencies = [ "dp-evm-trace-events", "dp-evm-trace-ext", @@ -2213,7 +2213,7 @@ dependencies = [ [[package]] name = "dp-fee" -version = "2.7.2" +version = "2.8.0" dependencies = [ "bp-messages", "frame-support", @@ -2225,7 +2225,7 @@ dependencies = [ [[package]] name = "dp-s2s" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "bp-message-dispatch", @@ -2240,7 +2240,7 @@ dependencies = [ [[package]] name = "drml" -version = "2.7.2" +version = "2.8.0" dependencies = [ "bsc-primitives", "dp-consensus", @@ -2258,7 +2258,7 @@ dependencies = [ [[package]] name = "drml-bridge-primitives" -version = "2.7.2" +version = "2.8.0" dependencies = [ "bp-messages", "bp-runtime", @@ -2276,7 +2276,7 @@ dependencies = [ [[package]] name = "drml-common-primitives" -version = "2.7.2" +version = "2.8.0" dependencies = [ "sp-core", "sp-runtime", @@ -2284,7 +2284,7 @@ dependencies = [ [[package]] name = "drml-rpc" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-balances-rpc", "darwinia-fee-market-rpc", @@ -2327,7 +2327,7 @@ dependencies = [ [[package]] name = "drml-service" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "async-trait", @@ -2402,7 +2402,7 @@ dependencies = [ [[package]] name = "dvm-ethereum" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "darwinia-balances", @@ -2436,7 +2436,7 @@ dependencies = [ [[package]] name = "dvm-rpc-core" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-evm", "dc-tracer", @@ -2460,7 +2460,7 @@ dependencies = [ [[package]] name = "dvm-rpc-runtime-api" -version = "2.7.2" +version = "2.8.0" dependencies = [ "ethereum", "ethereum-types", @@ -2687,7 +2687,7 @@ dependencies = [ [[package]] name = "ethereum-primitives" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "ethash", @@ -3139,7 +3139,7 @@ dependencies = [ [[package]] name = "from-ethereum-issuing" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "darwinia-bridge-ethereum", @@ -3162,7 +3162,7 @@ dependencies = [ [[package]] name = "from-substrate-issuing" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "bp-message-dispatch", @@ -4967,7 +4967,7 @@ checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" [[package]] name = "merkle-patricia-trie" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "criterion", @@ -5096,7 +5096,7 @@ dependencies = [ [[package]] name = "module-transaction-pause" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-balances", "darwinia-support", @@ -5835,20 +5835,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-randomness-collective-flip" -version = "4.0.0-dev" -source = "git+https://github.com/darwinia-network/substrate?branch=darwinia-v0.12.0#3d4179829374772b3e38d0b2cb2e7d1faaca56fd" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "safe-mix", - "scale-info", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-recovery" version = "4.0.0-dev" @@ -6041,7 +6027,7 @@ dependencies = [ [[package]] name = "pangolin-runtime" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "bp-message-dispatch", @@ -6116,7 +6102,6 @@ dependencies = [ "pallet-multisig", "pallet-offences", "pallet-proxy", - "pallet-randomness-collective-flip", "pallet-recovery", "pallet-scheduler", "pallet-session", @@ -6158,7 +6143,7 @@ dependencies = [ [[package]] name = "pangoro-runtime" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "bp-header-chain", @@ -6198,7 +6183,6 @@ dependencies = [ "pallet-grandpa", "pallet-im-online", "pallet-offences", - "pallet-randomness-collective-flip", "pallet-scheduler", "pallet-session", "pallet-sudo", @@ -7198,15 +7182,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.3.3" @@ -7267,15 +7242,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" -[[package]] -name = "safe-mix" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c" -dependencies = [ - "rustc_version 0.2.3", -] - [[package]] name = "salsa20" version = "0.8.1" @@ -8419,15 +8385,6 @@ dependencies = [ "semver-parser 0.7.0", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser 0.7.0", -] - [[package]] name = "semver" version = "0.11.0" @@ -9664,7 +9621,7 @@ dependencies = [ [[package]] name = "template-runtime" -version = "2.7.2" +version = "2.8.0" dependencies = [ "common-runtime", "darwinia-balances", @@ -9686,7 +9643,6 @@ dependencies = [ "pallet-evm-precompile-sha3fips", "pallet-evm-precompile-simple", "pallet-grandpa", - "pallet-randomness-collective-flip", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", @@ -9833,7 +9789,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "to-ethereum-backing" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "darwinia-balances", @@ -9863,7 +9819,7 @@ dependencies = [ [[package]] name = "to-substrate-backing" -version = "2.7.2" +version = "2.8.0" dependencies = [ "array-bytes", "bp-message-dispatch", @@ -9891,7 +9847,7 @@ dependencies = [ [[package]] name = "to-tron-backing" -version = "2.7.2" +version = "2.8.0" dependencies = [ "darwinia-support", "frame-support", diff --git a/client/dvm/db/Cargo.toml b/client/dvm/db/Cargo.toml index 68e8c74c21..9b17293fa5 100644 --- a/client/dvm/db/Cargo.toml +++ b/client/dvm/db/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dc-db" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/client/dvm/mapping-sync/Cargo.toml b/client/dvm/mapping-sync/Cargo.toml index 710756366c..98781e24aa 100644 --- a/client/dvm/mapping-sync/Cargo.toml +++ b/client/dvm/mapping-sync/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dc-mapping-sync" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/client/dvm/rpc/Cargo.toml b/client/dvm/rpc/Cargo.toml index 7e31c9d706..f660ab0591 100644 --- a/client/dvm/rpc/Cargo.toml +++ b/client/dvm/rpc/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dc-rpc" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io @@ -22,8 +22,8 @@ jsonrpc-core-client = { version = "18.0" } jsonrpc-derive = { version = "18.0" } jsonrpc-pubsub = { version = "18.0" } libsecp256k1 = { version = "0.3" } -lru = { version = "0.6.6" } log = { version = "0.4" } +lru = { version = "0.6.6" } parking_lot = { version = "0.11.1" } rand = { version = "0.8" } rlp = { version = "0.5" } diff --git a/client/dvm/tracer/Cargo.toml b/client/dvm/tracer/Cargo.toml index 0f7b6c40c7..e5a52a939b 100644 --- a/client/dvm/tracer/Cargo.toml +++ b/client/dvm/tracer/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dc-tracer" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common/" -version = "2.7.2" +version = "2.8.0" [dependencies] diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml index 3c11442869..bc2459c271 100644 --- a/frame/balances/Cargo.toml +++ b/frame/balances/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-balances" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/balances/rpc/Cargo.toml b/frame/balances/rpc/Cargo.toml index f3dcb99a88..6f6c75a597 100644 --- a/frame/balances/rpc/Cargo.toml +++ b/frame/balances/rpc/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-balances-rpc" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/balances/rpc/runtime-api/Cargo.toml b/frame/balances/rpc/runtime-api/Cargo.toml index 1c43ef0bcf..844d163cad 100644 --- a/frame/balances/rpc/runtime-api/Cargo.toml +++ b/frame/balances/rpc/runtime-api/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-balances-rpc-runtime-api" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/bridge/bsc/Cargo.toml b/frame/bridge/bsc/Cargo.toml index bd1a98788a..d0b8e0d72c 100644 --- a/frame/bridge/bsc/Cargo.toml +++ b/frame/bridge/bsc/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-bridge-bsc" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/bridge/ethereum/Cargo.toml b/frame/bridge/ethereum/Cargo.toml index 3efe00b2e4..b7173d7056 100644 --- a/frame/bridge/ethereum/Cargo.toml +++ b/frame/bridge/ethereum/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "darwinia-bridge-ethereum" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/bridge/relay-authorities/Cargo.toml b/frame/bridge/relay-authorities/Cargo.toml index ca3d104cfd..baba016f31 100644 --- a/frame/bridge/relay-authorities/Cargo.toml +++ b/frame/bridge/relay-authorities/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-relay-authorities" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/bridge/relayer-game/Cargo.toml b/frame/bridge/relayer-game/Cargo.toml index fc24f91539..e438374382 100644 --- a/frame/bridge/relayer-game/Cargo.toml +++ b/frame/bridge/relayer-game/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-relayer-game" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/claims/Cargo.toml b/frame/claims/Cargo.toml index b966aac758..9f182c2914 100644 --- a/frame/claims/Cargo.toml +++ b/frame/claims/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-claims" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/democracy/Cargo.toml b/frame/democracy/Cargo.toml index e5f3fed289..48e71f2603 100644 --- a/frame/democracy/Cargo.toml +++ b/frame/democracy/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-democracy" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/dvm/Cargo.toml b/frame/dvm/Cargo.toml index 4808be36d3..8cd74447cc 100644 --- a/frame/dvm/Cargo.toml +++ b/frame/dvm/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dvm-ethereum" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/dvm/rpc/Cargo.toml b/frame/dvm/rpc/Cargo.toml index 98386f02eb..14ace75095 100644 --- a/frame/dvm/rpc/Cargo.toml +++ b/frame/dvm/rpc/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dvm-rpc-core" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/dvm/rpc/runtime-api/Cargo.toml b/frame/dvm/rpc/runtime-api/Cargo.toml index caee8a4507..88924e38ec 100644 --- a/frame/dvm/rpc/runtime-api/Cargo.toml +++ b/frame/dvm/rpc/runtime-api/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dvm-rpc-runtime-api" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/elections-phragmen/Cargo.toml b/frame/elections-phragmen/Cargo.toml index 3674b36686..80efa5085e 100644 --- a/frame/elections-phragmen/Cargo.toml +++ b/frame/elections-phragmen/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-elections-phragmen" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/evm/Cargo.toml b/frame/evm/Cargo.toml index 2233efee87..efc27dff04 100644 --- a/frame/evm/Cargo.toml +++ b/frame/evm/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-evm" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/evm/precompile/contracts/bridge/ethereum/Cargo.toml b/frame/evm/precompile/contracts/bridge/ethereum/Cargo.toml index 7230edf308..7818d10882 100644 --- a/frame/evm/precompile/contracts/bridge/ethereum/Cargo.toml +++ b/frame/evm/precompile/contracts/bridge/ethereum/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-evm-precompile-bridge-ethereum" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] @@ -23,7 +23,7 @@ sp-core = { default-features = false, git = "https://github.com/darwinia-network sp-io = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } # frontier -fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.12.0" } +fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.12.0" } [features] default = ["std"] diff --git a/frame/evm/precompile/contracts/bridge/s2s/Cargo.toml b/frame/evm/precompile/contracts/bridge/s2s/Cargo.toml index f106d69ca2..60efde9329 100644 --- a/frame/evm/precompile/contracts/bridge/s2s/Cargo.toml +++ b/frame/evm/precompile/contracts/bridge/s2s/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-evm-precompile-bridge-s2s" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/evm/precompile/contracts/dispatch/Cargo.toml b/frame/evm/precompile/contracts/dispatch/Cargo.toml index 683b16bb4c..758546d708 100644 --- a/frame/evm/precompile/contracts/dispatch/Cargo.toml +++ b/frame/evm/precompile/contracts/dispatch/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-evm-precompile-dispatch" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] diff --git a/frame/evm/precompile/contracts/transfer/Cargo.toml b/frame/evm/precompile/contracts/transfer/Cargo.toml index 4d60e8f311..23dd9f1f08 100644 --- a/frame/evm/precompile/contracts/transfer/Cargo.toml +++ b/frame/evm/precompile/contracts/transfer/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-evm-precompile-transfer" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io @@ -22,12 +22,12 @@ sha3 = { version = "0.9", default-features = false } darwinia-evm = { default-features = false, path = "../../../" } darwinia-support = { default-features = false, path = "../../../../support" } # paritytech -frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } -frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } -sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } -sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } +frame-support = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } +frame-system = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } +sp-core = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } +sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } # frontier -fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.12.0" } +fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.12.0" } [features] default = ["std"] diff --git a/frame/evm/precompile/contracts/utils/Cargo.toml b/frame/evm/precompile/contracts/utils/Cargo.toml index 605824c05b..dbaa2f5639 100644 --- a/frame/evm/precompile/contracts/utils/Cargo.toml +++ b/frame/evm/precompile/contracts/utils/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-evm-precompile-utils" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/evm/precompile/contracts/utils/macro/Cargo.toml b/frame/evm/precompile/contracts/utils/macro/Cargo.toml index c22b8b66e7..880d2c9bdc 100644 --- a/frame/evm/precompile/contracts/utils/macro/Cargo.toml +++ b/frame/evm/precompile/contracts/utils/macro/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-evm-precompile-utils-macro" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [lib] proc-macro = true diff --git a/frame/fee-market/Cargo.toml b/frame/fee-market/Cargo.toml index a8443e1057..fbbf86ec8e 100644 --- a/frame/fee-market/Cargo.toml +++ b/frame/fee-market/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-fee-market" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/fee-market/rpc/Cargo.toml b/frame/fee-market/rpc/Cargo.toml index 1902e158d5..4a3619fc62 100644 --- a/frame/fee-market/rpc/Cargo.toml +++ b/frame/fee-market/rpc/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-fee-market-rpc" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/fee-market/rpc/runtime-api/Cargo.toml b/frame/fee-market/rpc/runtime-api/Cargo.toml index 4ad69bca18..8ac3f0a7ca 100644 --- a/frame/fee-market/rpc/runtime-api/Cargo.toml +++ b/frame/fee-market/rpc/runtime-api/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-fee-market-rpc-runtime-api" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/header-mmr/Cargo.toml b/frame/header-mmr/Cargo.toml index 5654bc2323..64acc5576d 100644 --- a/frame/header-mmr/Cargo.toml +++ b/frame/header-mmr/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-header-mmr" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/header-mmr/rpc/Cargo.toml b/frame/header-mmr/rpc/Cargo.toml index b2a65ee1e1..406c2ded22 100644 --- a/frame/header-mmr/rpc/Cargo.toml +++ b/frame/header-mmr/rpc/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-header-mmr-rpc" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/header-mmr/rpc/runtime-api/Cargo.toml b/frame/header-mmr/rpc/runtime-api/Cargo.toml index 558e969221..2cb4e4ef3f 100644 --- a/frame/header-mmr/rpc/runtime-api/Cargo.toml +++ b/frame/header-mmr/rpc/runtime-api/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-header-mmr-rpc-runtime-api" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml index 7b12a0f09c..bd7e188014 100644 --- a/frame/staking/Cargo.toml +++ b/frame/staking/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-staking" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/staking/rpc/Cargo.toml b/frame/staking/rpc/Cargo.toml index f411e8ddab..ed33f2ae3c 100644 --- a/frame/staking/rpc/Cargo.toml +++ b/frame/staking/rpc/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-staking-rpc" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/staking/rpc/runtime-api/Cargo.toml b/frame/staking/rpc/runtime-api/Cargo.toml index 9c8d07437b..2afeb2d326 100644 --- a/frame/staking/rpc/runtime-api/Cargo.toml +++ b/frame/staking/rpc/runtime-api/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-staking-rpc-runtime-api" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/support/Cargo.toml b/frame/support/Cargo.toml index f73bfd20eb..7847d49369 100644 --- a/frame/support/Cargo.toml +++ b/frame/support/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-support" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/transaction-pause/Cargo.toml b/frame/transaction-pause/Cargo.toml index 39205a26a4..0660ec7d24 100644 --- a/frame/transaction-pause/Cargo.toml +++ b/frame/transaction-pause/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Acala Developers"] edition = "2021" name = "module-transaction-pause" -version = "2.7.2" +version = "2.8.0" [dependencies] codec = { package = "parity-scale-codec", version = "2.2", default-features = false } diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml index 0589955fd3..0c5c0cb7bf 100644 --- a/frame/vesting/Cargo.toml +++ b/frame/vesting/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-vesting" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/wormhole/backing/ethereum/Cargo.toml b/frame/wormhole/backing/ethereum/Cargo.toml index 2fccf610da..3e809364e6 100644 --- a/frame/wormhole/backing/ethereum/Cargo.toml +++ b/frame/wormhole/backing/ethereum/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "to-ethereum-backing" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/wormhole/backing/s2s/Cargo.toml b/frame/wormhole/backing/s2s/Cargo.toml index adf91dfaae..b4b0e69fba 100644 --- a/frame/wormhole/backing/s2s/Cargo.toml +++ b/frame/wormhole/backing/s2s/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "to-substrate-backing" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/wormhole/backing/tron/Cargo.toml b/frame/wormhole/backing/tron/Cargo.toml index 353e7c57e5..b7261ad833 100644 --- a/frame/wormhole/backing/tron/Cargo.toml +++ b/frame/wormhole/backing/tron/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "to-tron-backing" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/frame/wormhole/issuing/ethereum/Cargo.toml b/frame/wormhole/issuing/ethereum/Cargo.toml index 540c45e0f5..7e30af811f 100644 --- a/frame/wormhole/issuing/ethereum/Cargo.toml +++ b/frame/wormhole/issuing/ethereum/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "from-ethereum-issuing" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io @@ -30,7 +30,7 @@ frame-system = { default-features = false, git = "https://github.com/darwi sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } # frontier -fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.12.0" } +fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.12.0" } [features] default = ["std"] diff --git a/frame/wormhole/issuing/s2s/Cargo.toml b/frame/wormhole/issuing/s2s/Cargo.toml index 155df3ff3c..39076d4bdb 100644 --- a/frame/wormhole/issuing/s2s/Cargo.toml +++ b/frame/wormhole/issuing/s2s/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "from-substrate-issuing" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io @@ -37,7 +37,7 @@ sp-io = { default-features = false, git = "https://github.com/darw sp-runtime = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } sp-std = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } # frontier -fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.12.0" } +fp-evm = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "darwinia-v0.12.0" } [dev-dependencies] # crates.io diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 4c19fb7627..6f18cd5c32 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" name = "drml" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" # TODO: Consider rename this repo to darwinia-runtime-module-library [[bin]] diff --git a/node/primitives/bridge/Cargo.toml b/node/primitives/bridge/Cargo.toml index f9e9e07db9..daa4d721de 100644 --- a/node/primitives/bridge/Cargo.toml +++ b/node/primitives/bridge/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "drml-bridge-primitives" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # darwinia-network diff --git a/node/primitives/common/Cargo.toml b/node/primitives/common/Cargo.toml index 44d3c9b755..03169ec1a7 100644 --- a/node/primitives/common/Cargo.toml +++ b/node/primitives/common/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "drml-common-primitives" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # paritytech diff --git a/node/rpc/Cargo.toml b/node/rpc/Cargo.toml index 227f7f2a10..801a5ea595 100644 --- a/node/rpc/Cargo.toml +++ b/node/rpc/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "drml-rpc" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/node/runtime/common/Cargo.toml b/node/runtime/common/Cargo.toml index 32fa56dd11..2f4e882e6a 100644 --- a/node/runtime/common/Cargo.toml +++ b/node/runtime/common/Cargo.toml @@ -6,7 +6,7 @@ homepage = "https://darwinia.network" license = "GPL-3.0" name = "common-runtime" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/node/runtime/pangolin/Cargo.toml b/node/runtime/pangolin/Cargo.toml index 1898d903a0..8b8bde0ee1 100644 --- a/node/runtime/pangolin/Cargo.toml +++ b/node/runtime/pangolin/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "pangolin-runtime" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io @@ -94,7 +94,6 @@ pallet-membership = { default-features = false, git = " pallet-multisig = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-offences = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-proxy = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } -pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-recovery = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-scheduler = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-session = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } @@ -208,7 +207,6 @@ std = [ "pallet-multisig/std", "pallet-offences/std", "pallet-proxy/std", - "pallet-randomness-collective-flip/std", "pallet-recovery/std", "pallet-scheduler/std", "pallet-session/std", diff --git a/node/runtime/pangolin/src/lib.rs b/node/runtime/pangolin/src/lib.rs index 08bf3657a8..4f4a5ad829 100644 --- a/node/runtime/pangolin/src/lib.rs +++ b/node/runtime/pangolin/src/lib.rs @@ -168,7 +168,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: sp_runtime::create_runtime_str!("Pangolin"), impl_name: sp_runtime::create_runtime_str!("Pangolin"), authoring_version: 0, - spec_version: 2_7_02_0, + spec_version: 2_8_00_0, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 0, @@ -198,7 +198,6 @@ frame_support::construct_runtime! { { // Basic stuff; balances is uncallable initially. System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 1, // Must be before session. Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 2, @@ -932,6 +931,15 @@ fn migrate() -> Weight { TECHNICAL_COMMITTEE_OLD_PREFIX, ); + migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b""); + + // Migrate the version to new style. + // But this will also update the version. + // To bypass the check `if on_chain_storage_version < 4 {`, put this to the last one. + frame_support::migrations::migrate_from_pallet_version_to_storage_version::( + &RocksDbWeight::get(), + ); + // 0 RuntimeBlockWeights::get().max_block } @@ -941,32 +949,33 @@ impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade { #[cfg(feature = "try-runtime")] fn pre_upgrade() -> Result<(), &'static str> { // --- paritytech --- - // use frame_support::traits::PalletInfo; - - // I have no idea with this - // I don't know why the `pre_migrate` failed - // And the log below doesn't print anything under the new prefix - - for v in frame_support::storage::KeyPrefixIterator::new( - b"Tips".to_vec(), - b"Tips".to_vec(), - |key| Ok(key.to_vec()), - ) { - frame_support::log::error!("{:?}", v); + use frame_support::traits::{PalletInfo, StorageVersion}; + + { + // Presume we have already migrated the version to the new style. + frame_support::migrations::migrate_from_pallet_version_to_storage_version::< + AllPalletsWithSystem, + >(&RocksDbWeight::get()); + + // Revert the version. + StorageVersion::new(3).put::(); + StorageVersion::new(3).put::(); + StorageVersion::new(3).put::(); + StorageVersion::new(3).put::(); } - // let name = ::PalletInfo::name::() - // .expect("TechnicalMembership is part of runtime, so it has a name; qed"); + let name = ::PalletInfo::name::() + .expect("TechnicalMembership is part of runtime, so it has a name; qed"); - // pallet_membership::migrations::v4::pre_migrate::( - // TECHNICAL_MEMBERSHIP_OLD_PREFIX, - // name, - // ); - // pallet_tips::migrations::v4::pre_migrate::(TIPS_OLD_PREFIX); - // pallet_collective::migrations::v4::pre_migrate::(COUNCIL_OLD_PREFIX); - // pallet_collective::migrations::v4::pre_migrate::( - // TECHNICAL_COMMITTEE_OLD_PREFIX, - // ); + pallet_membership::migrations::v4::pre_migrate::( + TECHNICAL_MEMBERSHIP_OLD_PREFIX, + name, + ); + pallet_tips::migrations::v4::pre_migrate::(TIPS_OLD_PREFIX); + pallet_collective::migrations::v4::pre_migrate::(COUNCIL_OLD_PREFIX); + pallet_collective::migrations::v4::pre_migrate::( + TECHNICAL_COMMITTEE_OLD_PREFIX, + ); Ok(()) } diff --git a/node/runtime/pangolin/src/pallets/mod.rs b/node/runtime/pangolin/src/pallets/mod.rs index 1e790b160d..7f66ee9675 100644 --- a/node/runtime/pangolin/src/pallets/mod.rs +++ b/node/runtime/pangolin/src/pallets/mod.rs @@ -1,9 +1,6 @@ pub mod system; pub use system::*; -pub mod randomness_collective_flip; -pub use randomness_collective_flip::*; - pub mod babe; pub use babe::*; diff --git a/node/runtime/pangolin/src/pallets/randomness_collective_flip.rs b/node/runtime/pangolin/src/pallets/randomness_collective_flip.rs deleted file mode 100644 index 22f76de98b..0000000000 --- a/node/runtime/pangolin/src/pallets/randomness_collective_flip.rs +++ /dev/null @@ -1,6 +0,0 @@ -// --- paritytech --- -use pallet_randomness_collective_flip::Config; -// --- darwinia-network --- -use crate::*; - -impl Config for Runtime {} diff --git a/node/runtime/pangolin/src/pallets/society.rs b/node/runtime/pangolin/src/pallets/society.rs index f1e0705192..0db03a257d 100644 --- a/node/runtime/pangolin/src/pallets/society.rs +++ b/node/runtime/pangolin/src/pallets/society.rs @@ -1,5 +1,6 @@ // --- paritytech --- use frame_support::PalletId; +use pallet_babe::RandomnessFromOneEpochAgo; use pallet_society::{Config, EnsureFounder}; // --- darwinia-network --- use crate::*; @@ -20,7 +21,7 @@ impl Config for Runtime { type Event = Event; type PalletId = SocietyPalletId; type Currency = Ring; - type Randomness = RandomnessCollectiveFlip; + type Randomness = RandomnessFromOneEpochAgo; type CandidateDeposit = CandidateDeposit; type WrongSideDeduction = WrongSideDeduction; type MaxStrikes = MaxStrikes; @@ -29,7 +30,7 @@ impl Config for Runtime { type RotationPeriod = RotationPeriod; type MaxLockDuration = MaxLockDuration; type FounderSetOrigin = EnsureRootOrMoreThanHalfCouncil; - type SuspensionJudgementOrigin = EnsureFounder; + type SuspensionJudgementOrigin = EnsureFounder; type ChallengePeriod = ChallengePeriod; type MaxCandidateIntake = MaxCandidateIntake; } diff --git a/node/runtime/pangoro/Cargo.toml b/node/runtime/pangoro/Cargo.toml index b091b2c487..5e91ac0719 100644 --- a/node/runtime/pangoro/Cargo.toml +++ b/node/runtime/pangoro/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "pangoro-runtime" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io @@ -56,7 +56,6 @@ pallet-election-provider-multi-phase = { default-features = false, git = " pallet-grandpa = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-im-online = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-offences = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } -pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-scheduler = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-session = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-sudo = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } @@ -132,7 +131,6 @@ std = [ "pallet-grandpa/std", "pallet-im-online/std", "pallet-offences/std", - "pallet-randomness-collective-flip/std", "pallet-scheduler/std", "pallet-session/std", "pallet-sudo/std", diff --git a/node/runtime/pangoro/src/lib.rs b/node/runtime/pangoro/src/lib.rs index 4bf93260cf..54cbf21d29 100644 --- a/node/runtime/pangoro/src/lib.rs +++ b/node/runtime/pangoro/src/lib.rs @@ -132,7 +132,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: sp_runtime::create_runtime_str!("Pangoro"), impl_name: sp_runtime::create_runtime_str!("Pangoro"), authoring_version: 0, - spec_version: 2_7_02_0, + spec_version: 2_8_00_0, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 0, @@ -159,7 +159,6 @@ frame_support::construct_runtime!( UncheckedExtrinsic = UncheckedExtrinsic { System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 1, Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 2, @@ -572,8 +571,13 @@ sp_api::impl_runtime_apis! { } fn migrate() -> Weight { - 0 - // RuntimeBlockWeights::get().max_block + frame_support::migrations::migrate_from_pallet_version_to_storage_version::( + &RocksDbWeight::get(), + ); + migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b""); + + // 0 + RuntimeBlockWeights::get().max_block } pub struct CustomOnRuntimeUpgrade; diff --git a/node/runtime/pangoro/src/pallets/mod.rs b/node/runtime/pangoro/src/pallets/mod.rs index 366b99b19f..aa54a2505c 100644 --- a/node/runtime/pangoro/src/pallets/mod.rs +++ b/node/runtime/pangoro/src/pallets/mod.rs @@ -1,9 +1,6 @@ pub mod system; pub use system::*; -pub mod randomness_collective_flip; -pub use randomness_collective_flip::*; - pub mod babe; pub use babe::*; diff --git a/node/runtime/pangoro/src/pallets/randomness_collective_flip.rs b/node/runtime/pangoro/src/pallets/randomness_collective_flip.rs deleted file mode 100644 index 22f76de98b..0000000000 --- a/node/runtime/pangoro/src/pallets/randomness_collective_flip.rs +++ /dev/null @@ -1,6 +0,0 @@ -// --- paritytech --- -use pallet_randomness_collective_flip::Config; -// --- darwinia-network --- -use crate::*; - -impl Config for Runtime {} diff --git a/node/runtime/template/Cargo.toml b/node/runtime/template/Cargo.toml index 28ecd8bdb1..66db928c1f 100644 --- a/node/runtime/template/Cargo.toml +++ b/node/runtime/template/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "template-runtime" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io @@ -36,7 +36,6 @@ frame-system = { default-features = false, git = " frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-aura = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-grandpa = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } -pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-sudo = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-timestamp = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } pallet-transaction-payment = { default-features = false, git = "https://github.com/darwinia-network/substrate", branch = "darwinia-v0.12.0" } @@ -91,7 +90,6 @@ std = [ "frame-system-rpc-runtime-api/std", "pallet-aura/std", "pallet-grandpa/std", - "pallet-randomness-collective-flip/std", "pallet-sudo/std", "pallet-timestamp/std", "pallet-transaction-payment/std", diff --git a/node/runtime/template/src/lib.rs b/node/runtime/template/src/lib.rs index 3e167078af..5888c67ab2 100644 --- a/node/runtime/template/src/lib.rs +++ b/node/runtime/template/src/lib.rs @@ -122,7 +122,6 @@ frame_support::construct_runtime!( UncheckedExtrinsic = UncheckedExtrinsic { System: frame_system::{Pallet, Call, Config, Storage, Event}, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, Balances: darwinia_balances::::{Pallet, Call, Storage, Config, Event}, diff --git a/node/runtime/template/src/pallets/mod.rs b/node/runtime/template/src/pallets/mod.rs index 3203a51d9e..83e0e2dbd0 100644 --- a/node/runtime/template/src/pallets/mod.rs +++ b/node/runtime/template/src/pallets/mod.rs @@ -1,9 +1,6 @@ pub mod system; pub use system::*; -pub mod randomness_collective_flip; -pub use randomness_collective_flip::*; - pub mod timestamp; pub use timestamp::*; diff --git a/node/runtime/template/src/pallets/randomness_collective_flip.rs b/node/runtime/template/src/pallets/randomness_collective_flip.rs deleted file mode 100644 index 22f76de98b..0000000000 --- a/node/runtime/template/src/pallets/randomness_collective_flip.rs +++ /dev/null @@ -1,6 +0,0 @@ -// --- paritytech --- -use pallet_randomness_collective_flip::Config; -// --- darwinia-network --- -use crate::*; - -impl Config for Runtime {} diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 50a3e86388..c9778ac66b 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "drml-service" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/primitives/asset/Cargo.toml b/primitives/asset/Cargo.toml index 089b9b1a09..2d972f230f 100644 --- a/primitives/asset/Cargo.toml +++ b/primitives/asset/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dp-asset" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/primitives/bsc/Cargo.toml b/primitives/bsc/Cargo.toml index 0777258379..fd64481366 100644 --- a/primitives/bsc/Cargo.toml +++ b/primitives/bsc/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "bsc-primitives" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/primitives/consensus/Cargo.toml b/primitives/consensus/Cargo.toml index 314c74a03b..63e24d78b6 100644 --- a/primitives/consensus/Cargo.toml +++ b/primitives/consensus/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" name = "dp-consensus" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/primitives/contract/Cargo.toml b/primitives/contract/Cargo.toml index 1b1dddbafd..09e64df80c 100644 --- a/primitives/contract/Cargo.toml +++ b/primitives/contract/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dp-contract" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/primitives/ethereum/Cargo.toml b/primitives/ethereum/Cargo.toml index d69a73b2a4..299907c552 100644 --- a/primitives/ethereum/Cargo.toml +++ b/primitives/ethereum/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "ethereum-primitives" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/primitives/evm-trace/apis/Cargo.toml b/primitives/evm-trace/apis/Cargo.toml index c179f5075b..9cc8ccba4f 100644 --- a/primitives/evm-trace/apis/Cargo.toml +++ b/primitives/evm-trace/apis/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dp-evm-trace-apis" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common/" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/primitives/evm-trace/events/Cargo.toml b/primitives/evm-trace/events/Cargo.toml index b0d75053a2..928d1eb321 100644 --- a/primitives/evm-trace/events/Cargo.toml +++ b/primitives/evm-trace/events/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" name = "dp-evm-trace-events" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common/" -version = "2.7.2" +version = "2.8.0" [dependencies] diff --git a/primitives/evm-trace/ext/Cargo.toml b/primitives/evm-trace/ext/Cargo.toml index 619d5adab4..9c5eabb8bc 100644 --- a/primitives/evm-trace/ext/Cargo.toml +++ b/primitives/evm-trace/ext/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dp-evm-trace-ext" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common/" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/primitives/evm-trace/rpc/Cargo.toml b/primitives/evm-trace/rpc/Cargo.toml index 325e37b822..9d8d26405c 100644 --- a/primitives/evm-trace/rpc/Cargo.toml +++ b/primitives/evm-trace/rpc/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dp-evm-trace-rpc" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/primitives/evm-trace/tracer/Cargo.toml b/primitives/evm-trace/tracer/Cargo.toml index 97c7fee52e..dc09263b9f 100644 --- a/primitives/evm-trace/tracer/Cargo.toml +++ b/primitives/evm-trace/tracer/Cargo.toml @@ -6,7 +6,7 @@ homepage = "https://darwinia.network" license = "GPL-3.0" name = "dp-evm-tracer" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/primitives/fee-market/Cargo.toml b/primitives/fee-market/Cargo.toml index 1e2d93b3ee..e68e4340a3 100644 --- a/primitives/fee-market/Cargo.toml +++ b/primitives/fee-market/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dp-fee" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/primitives/merkle-patricia-trie/Cargo.toml b/primitives/merkle-patricia-trie/Cargo.toml index 64a5271578..2a9d356f35 100644 --- a/primitives/merkle-patricia-trie/Cargo.toml +++ b/primitives/merkle-patricia-trie/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "merkle-patricia-trie" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [[bench]] harness = false diff --git a/primitives/relay/Cargo.toml b/primitives/relay/Cargo.toml index a767a508ff..3798eb046c 100644 --- a/primitives/relay/Cargo.toml +++ b/primitives/relay/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "darwinia-relay-primitives" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/primitives/s2s/Cargo.toml b/primitives/s2s/Cargo.toml index 8233513c5b..a6c77e6f94 100644 --- a/primitives/s2s/Cargo.toml +++ b/primitives/s2s/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" name = "dp-s2s" readme = "README.md" repository = "https://github.com/darwinia-network/darwinia-common" -version = "2.7.2" +version = "2.8.0" [dependencies] # crates.io diff --git a/rust-toolchain.toml b/rust-toolchain.toml index e399a8ae45..be373b0176 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly" +channel = "nightly-2021-11-07" components = ["cargo", "clippy", "rustc", "rustfmt", "rust-src"] profile = "minimal" targets = ["wasm32-unknown-unknown"]