From 6cb6594132a7b654da91d360578e06647578937e Mon Sep 17 00:00:00 2001 From: Nuno Alexandre Date: Thu, 16 Jun 2022 07:41:30 +0200 Subject: [PATCH] Update to Polkadot v0.9.24 (#833) * Revert "Additional RPC-Methods and Runtime-Apis (#796)" This reverts commit 7cb6dbab1b2cb4e6e5d01210d17da5bc6660d09f. * wip: Update to v0.9.22 * wip * make rpc_ext_builder compile with todo * wip: Migrate api.rs to jsonrpsee * Migrate api.rs/AnchorApi to jsonrpsee Some new dark magic. * docker: bump polkadot images to v0.9.22 * Update to polkadot v0.9.23 * Update to polkadot-v0.9.24 * Bump docker images to 0.9.24 * fmt * Update rust toolchain to 1.62.0 / nightly-2022-05-09 * various fixes Co-authored-by: Miguel Hervas --- .github/workflows/build-matrix.json | 6 +- .github/workflows/build.yml | 2 +- .github/workflows/docker.yml | 2 +- .github/workflows/tests.yml | 2 +- Cargo.lock | 5130 ++++++++--------- Cargo.toml | 151 +- ci/script.sh | 4 +- docker-compose-local-relay.yml | 4 +- libs/common-traits/Cargo.toml | 6 +- libs/common-types/Cargo.toml | 8 +- libs/proofs/Cargo.toml | 4 +- pallets/anchors/Cargo.toml | 22 +- pallets/anchors/src/lib.rs | 6 +- pallets/bridge-mapping/Cargo.toml | 20 +- pallets/bridge/Cargo.toml | 26 +- pallets/bridge/src/lib.rs | 2 +- pallets/claims/Cargo.toml | 22 +- pallets/claims/src/lib.rs | 2 +- pallets/claims/src/migration.rs | 12 +- pallets/collator-allowlist/Cargo.toml | 16 +- pallets/crowdloan-claim/Cargo.toml | 22 +- pallets/crowdloan-claim/src/lib.rs | 2 +- pallets/crowdloan-reward/Cargo.toml | 22 +- pallets/crowdloan-reward/src/lib.rs | 2 +- pallets/fees/Cargo.toml | 18 +- pallets/loans/Cargo.toml | 36 +- pallets/loans/src/benchmarking.rs | 14 +- pallets/loans/src/functions.rs | 8 +- pallets/loans/src/lib.rs | 4 +- pallets/loans/src/mock.rs | 25 +- pallets/loans/src/test_utils.rs | 14 +- pallets/loans/src/tests.rs | 34 +- pallets/loans/src/types.rs | 23 +- pallets/migration/Cargo.toml | 22 +- pallets/nft-sales/Cargo.toml | 30 +- pallets/nft-sales/src/benchmarking.rs | 62 +- pallets/nft-sales/src/lib.rs | 68 +- pallets/nft-sales/src/mock.rs | 25 +- pallets/nft-sales/src/tests.rs | 128 +- pallets/nft/Cargo.toml | 30 +- pallets/permissions/Cargo.toml | 10 +- pallets/permissions/src/mock.rs | 6 +- pallets/pools/Cargo.toml | 24 +- pallets/pools/src/benchmarking.rs | 2 +- pallets/pools/src/lib.rs | 17 +- pallets/pools/src/mock.rs | 2 + pallets/pools/src/solution.rs | 18 +- pallets/pools/src/tranche.rs | 9 +- pallets/restricted-tokens/Cargo.toml | 24 +- .../restricted-tokens/src/impl_fungible.rs | 4 +- .../restricted-tokens/src/impl_fungibles.rs | 5 +- pallets/restricted-tokens/src/mock.rs | 2 + pallets/restricted-tokens/src/tests.rs | 6 +- runtime/altair/Cargo.toml | 150 +- runtime/altair/src/lib.rs | 23 +- runtime/altair/src/weights/pallet_treasury.rs | 5 + runtime/altair/src/weights/pallet_uniques.rs | 15 +- runtime/altair/src/weights/pallet_utility.rs | 5 + runtime/altair/src/xcm.rs | 4 +- runtime/centrifuge/Cargo.toml | 140 +- runtime/centrifuge/src/lib.rs | 2 +- .../centrifuge/src/weights/pallet_treasury.rs | 5 + .../centrifuge/src/weights/pallet_utility.rs | 5 + runtime/common/Cargo.toml | 24 +- runtime/common/src/apis/anchors.rs | 28 - runtime/common/src/apis/mod.rs | 18 - runtime/common/src/apis/pools.rs | 44 - runtime/common/src/impls.rs | 4 +- runtime/common/src/lib.rs | 22 +- runtime/development/Cargo.toml | 152 +- runtime/development/src/lib.rs | 93 +- runtime/development/src/xcm.rs | 4 +- runtime/integration-tests/Cargo.toml | 82 +- runtime/integration-tests/src/xcm/setup.rs | 2 +- runtime/integration-tests/src/xcm/test_net.rs | 7 +- src/api.rs | 58 + src/command.rs | 11 +- src/main.rs | 1 + src/{rpc/mod.rs => rpc.rs} | 40 +- src/rpc/anchor.rs | 58 - src/rpc/pools.rs | 197 - src/service.rs | 52 +- 82 files changed, 3329 insertions(+), 4087 deletions(-) delete mode 100644 runtime/common/src/apis/anchors.rs delete mode 100644 runtime/common/src/apis/mod.rs delete mode 100644 runtime/common/src/apis/pools.rs create mode 100644 src/api.rs rename src/{rpc/mod.rs => rpc.rs} (71%) delete mode 100644 src/rpc/anchor.rs delete mode 100644 src/rpc/pools.rs diff --git a/.github/workflows/build-matrix.json b/.github/workflows/build-matrix.json index 72c1a1748c..510dfcc63f 100644 --- a/.github/workflows/build-matrix.json +++ b/.github/workflows/build-matrix.json @@ -3,7 +3,7 @@ "os": "ubuntu-latest", "target": "build-node", "run_on_event": "any", - "rust_toolchain": "nightly-2021-11-07" + "rust_toolchain": "nightly-2022-05-09" }, { @@ -11,7 +11,7 @@ "target": "build-runtime", "package": "altair-runtime", "run_on_event": "push", - "rust_toolchain": "1.57.0" + "rust_toolchain": "1.62.0" }, { @@ -19,6 +19,6 @@ "target": "build-runtime", "package": "centrifuge-runtime", "run_on_event": "push", - "rust_toolchain": "1.57.0" + "rust_toolchain": "1.62.0" } ] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5dfc193367..5a444d7c2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: name: ${{ matrix.target }} runs-on: ${{ matrix.os }} env: - RUST_TOOLCHAIN: "nightly-2021-09-28" + RUST_TOOLCHAIN: "nightly-2022-05-09" steps: - name: Free space on Ubuntu if: ${{ matrix.os }} == 'ubuntu-latest' diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 479bf630c1..1fa34a51bb 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,7 +9,7 @@ on: required: true default: '' env: - RUST_TOOLCHAIN: "nightly-2021-11-07" + RUST_TOOLCHAIN: "nightly-2022-05-09" jobs: docker: runs-on: ubuntu-latest diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3f8b1ae130..9b006b1e35 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: target: [tests, lint, integration] runs-on: ${{ matrix.os }} env: - RUST_TOOLCHAIN: "nightly-2021-11-07" + RUST_TOOLCHAIN: "nightly-2022-05-09" steps: - name: Free space on Ubuntu if: ${{ matrix.os }} == 'ubuntu-latest' diff --git a/Cargo.lock b/Cargo.lock index 43c6d4a29a..d28c247407 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,7 +44,7 @@ checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if 1.0.0", "cipher", - "cpufeatures 0.2.2", + "cpufeatures", "opaque-debug 0.3.0", ] @@ -68,7 +68,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.7", "once_cell", "version_check 0.9.4", ] @@ -98,7 +98,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", @@ -162,19 +162,19 @@ dependencies = [ "serde", "smallvec 1.8.0", "sp-api", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-aura", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-staking", + "sp-std", "sp-transaction-pool", "sp-version", "static_assertions", @@ -290,25 +290,24 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c290043c9a95b05d45e952fb6383c67bcb61471f60cfa21e890dba6654234f43" +checksum = "fd8b508d585e01084059b60f06ade4cb7415cd2e4084b71dd1cb44e7d3fb9880" dependencies = [ "async-channel", "async-executor", "async-io", - "async-mutex", + "async-lock", "blocking", "futures-lite", - "num_cpus", "once_cell", ] [[package]] name = "async-io" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" +checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07" dependencies = [ "concurrent-queue", "futures-lite", @@ -318,7 +317,7 @@ dependencies = [ "parking", "polling", "slab", - "socket2 0.4.4", + "socket2", "waker-fn", "winapi 0.3.9", ] @@ -332,15 +331,6 @@ dependencies = [ "event-listener", ] -[[package]] -name = "async-mutex" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -dependencies = [ - "event-listener", -] - [[package]] name = "async-process" version = "1.4.0" @@ -369,6 +359,7 @@ dependencies = [ "async-global-executor", "async-io", "async-lock", + "async-process", "crossbeam-utils 0.8.8", "futures-channel", "futures-core", @@ -388,15 +379,16 @@ dependencies = [ [[package]] name = "async-std-resolver" -version = "0.20.4" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf3e776afdf3a2477ef4854b85ba0dff3bd85792f685fb3c68948b4d304e4f0" +checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8" dependencies = [ "async-std", "async-trait", "futures-io", "futures-util", "pin-utils", + "socket2", "trust-dns-resolver", ] @@ -408,28 +400,15 @@ checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "asynchronous-codec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4401f0a3622dad2e0763fa79e0eb328bc70fb7dccfdd645341f00d671247d6" -dependencies = [ - "bytes 1.1.0", - "futures-sink", - "futures-util", - "memchr", - "pin-project-lite 0.2.9", -] - [[package]] name = "asynchronous-codec" version = "0.6.0" @@ -443,15 +422,6 @@ dependencies = [ "pin-project-lite 0.2.9", ] -[[package]] -name = "atomic" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" -dependencies = [ - "autocfg 1.1.0", -] - [[package]] name = "atomic-waker" version = "1.0.0" @@ -542,17 +512,11 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -[[package]] -name = "base64ct" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179" - [[package]] name = "beef" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" dependencies = [ "serde", ] @@ -560,7 +524,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "beefy-primitives", "fnv", @@ -569,7 +533,7 @@ dependencies = [ "hex", "log 0.4.17", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-chain-spec", "sc-client-api", "sc-finality-grandpa", @@ -578,14 +542,14 @@ dependencies = [ "sc-network-gossip", "sc-utils", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-keystore", "sp-mmr-primitives", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "wasm-timer", @@ -594,43 +558,40 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "beefy-gadget", "beefy-primitives", "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-pubsub", + "jsonrpsee", "log 0.4.17", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-rpc", "sc-utils", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", "thiserror", ] [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -685,17 +646,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "blake2" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" -dependencies = [ - "crypto-mac 0.8.0", - "digest 0.9.0", - "opaque-debug 0.3.0", -] - [[package]] name = "blake2" version = "0.10.4" @@ -717,39 +667,24 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.7.2", "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq", -] - -[[package]] -name = "blake3" -version = "0.3.8" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" +checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" dependencies = [ "arrayref", - "arrayvec 0.5.2", - "cc", - "cfg-if 0.1.10", + "arrayvec 0.7.2", "constant_time_eq", - "crypto-mac 0.8.0", - "digest 0.9.0", ] [[package]] @@ -828,9 +763,9 @@ dependencies = [ [[package]] name = "bounded-vec" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47cca82fca99417fe405f09d93bb8fff90bdd03d13c631f18096ee123b4281c" +checksum = "3372be4090bf9d4da36bd8ba7ce6ca1669503d0cf6e667236c6df7f053153eb6" dependencies = [ "thiserror", ] @@ -838,121 +773,121 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bp-runtime", "finality-grandpa", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-finality-grandpa", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "parity-scale-codec", "scale-info", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-std", ] [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bitvec", "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-std", ] [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bp-messages", "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-std", "sp-version", ] [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bp-messages", "bp-polkadot-core", "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "parity-scale-codec", "smallvec 1.8.0", "sp-api", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", "sp-version", ] [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "hash-db", "num-traits", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", ] [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bp-header-chain", "ed25519-dalek", "finality-grandpa", "parity-scale-codec", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-finality-grandpa", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -960,19 +895,19 @@ dependencies = [ "bp-runtime", "parity-scale-codec", "sp-api", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bp-message-dispatch", "bp-messages", "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "hash-db", "pallet-bridge-dispatch", @@ -982,11 +917,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", ] [[package]] @@ -1001,10 +936,7 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ - "lazy_static", "memchr", - "regex-automata", - "serde", ] [[package]] @@ -1018,9 +950,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.9.1" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" +checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" [[package]] name = "byte-slice-cast" @@ -1099,7 +1031,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.9", + "semver 1.0.10", "serde", "serde_json", ] @@ -1140,13 +1072,12 @@ dependencies = [ "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-pubsub", + "jsonrpsee", "log 0.4.17", "node-inspect", "node-primitives", "pallet-anchors", "pallet-im-online", - "pallet-loans", - "pallet-pools", "pallet-transaction-payment", "pallet-transaction-payment-rpc", "parity-scale-codec", @@ -1189,24 +1120,24 @@ dependencies = [ "sp-consensus", "sp-consensus-aura", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-finality-grandpa", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-inherents", + "sp-io", "sp-keyring", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-keystore", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-runtime-interface", "sp-session", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", "sp-timestamp", "sp-transaction-pool", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-trie", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", "tempfile", + "tracing-core", "try-runtime-cli", "url 2.2.2", "vergen", @@ -1227,7 +1158,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", @@ -1284,19 +1215,19 @@ dependencies = [ "serde", "smallvec 1.8.0", "sp-api", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-aura", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-staking", + "sp-std", "sp-transaction-pool", "sp-version", "static_assertions", @@ -1335,21 +1266,21 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chacha20" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412" +checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" dependencies = [ "cfg-if 1.0.0", "cipher", - "cpufeatures 0.1.5", + "cpufeatures", "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1580317203210c517b6d44794abfbe600698276db18127e37ad3e69bf5e848e5" +checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a" dependencies = [ "aead", "chacha20", @@ -1361,19 +1292,19 @@ dependencies = [ [[package]] name = "chainbridge" version = "0.0.2" -source = "git+https://github.com/centrifuge/chainbridge-substrate.git?branch=polkadot-v0.9.20#aaf1f7ebba3b80eba9e0a832baaa44093eef3ee3" +source = "git+https://github.com/centrifuge/chainbridge-substrate.git?branch=polkadot-v0.9.24#06016868a97d28563c4fe97fa4a10d5ff741f6d0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "substrate-wasm-builder-runner", ] @@ -1392,13 +1323,15 @@ dependencies = [ [[package]] name = "cid" -version = "0.6.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff0e3bc0b6446b3f9663c1a6aba6ef06c5aeaa1bc92bd18077be337198ab9768" +checksum = "fc949bff6704880faf064c42a4854032ab07bfcf3a4fcb82a57470acededb69c" dependencies = [ + "core2", "multibase", - "multihash 0.13.2", - "unsigned-varint 0.5.1", + "multihash", + "serde", + "unsigned-varint", ] [[package]] @@ -1421,9 +1354,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6b561dcf059c85bbe388e0a7b0a1469acb3934cc0cfa148613a830629e3049" +checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b" dependencies = [ "glob", "libc", @@ -1432,16 +1365,16 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.18" +version = "3.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" +checksum = "d53da17d37dba964b9b3ecb5c5a1f193a2762c700e6829201e645b9381c99dc7" dependencies = [ "atty", "bitflags", "clap_derive", "clap_lex", "indexmap", - "lazy_static", + "once_cell", "strsim", "termcolor", "textwrap", @@ -1449,9 +1382,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.18" +version = "3.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" +checksum = "c11d40217d16aee8508cc8e5fde8b4ff24639758608e5374e731b53f85749fb9" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -1462,9 +1395,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613" dependencies = [ "os_str_bytes", ] @@ -1478,6 +1411,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "cmake" +version = "0.1.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +dependencies = [ + "cc", +] + [[package]] name = "coarsetime" version = "0.1.22" @@ -1490,17 +1432,28 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "comfy-table" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b103d85ca6e209388771bfb7aa6b68a7aeec4afbf6f0a0264bfbf50360e5212e" +dependencies = [ + "strum 0.23.0", + "strum_macros 0.23.1", + "unicode-width", +] + [[package]] name = "common-traits" version = "0.1.0" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] @@ -1509,12 +1462,12 @@ version = "2.0.0" dependencies = [ "bitflags", "common-traits", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] @@ -1561,21 +1514,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] -name = "cpp_demangle" -version = "0.3.5" +name = "core2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" dependencies = [ - "cfg-if 1.0.0", + "memchr", ] [[package]] -name = "cpufeatures" -version = "0.1.5" +name = "cpp_demangle" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" dependencies = [ - "libc", + "cfg-if 1.0.0", ] [[package]] @@ -1799,37 +1752,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "csv" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" -dependencies = [ - "bstr", - "csv-core", - "itoa 0.4.8", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct 0.6.1", -] - [[package]] name = "ctor" version = "0.1.22" @@ -1863,7 +1785,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "clap", "sc-cli", @@ -1874,7 +1796,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1882,7 +1804,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures 0.3.21", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1890,15 +1812,15 @@ dependencies = [ "sc-client-api", "sp-api", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", "tracing", ] [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1911,15 +1833,15 @@ dependencies = [ "sc-consensus-slots", "sc-telemetry", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] @@ -1927,7 +1849,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1940,31 +1862,31 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-trie", "tracing", ] [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-client-api", "sc-consensus", "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] @@ -1972,7 +1894,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1980,7 +1902,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-node-primitives", "polkadot-parachain", "polkadot-primitives", @@ -1988,16 +1910,16 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-state-machine", "tracing", ] [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -2014,14 +1936,14 @@ dependencies = [ "sp-api", "sp-consensus", "sp-maybe-compressed-blob", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "tracing", ] [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -2030,7 +1952,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-overseer", "polkadot-primitives", "sc-chain-spec", @@ -2043,43 +1965,43 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", "tracing", ] [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-aura", "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-consensus-aura", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -2087,13 +2009,13 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "environmental", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "impl-trait-for-tuples", "log 0.4.17", @@ -2102,14 +2024,14 @@ dependencies = [ "polkadot-parachain", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-externalities", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", "sp-version", "xcm", ] @@ -2117,7 +2039,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -2128,34 +2050,34 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", "xcm", ] [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "rand_chacha 0.3.1", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -2163,23 +2085,23 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", "sp-api", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", + "sp-trie", ] [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2189,78 +2111,81 @@ dependencies = [ "sc-client-api", "scale-info", "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-storage", + "sp-trie", "tracing", ] [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "cumulus-primitives-core", "futures 0.3.21", "parity-scale-codec", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-inherents", + "sp-std", "sp-timestamp", ] [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", + "sp-trie", "xcm", ] [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "parking_lot 0.12.0", + "parking_lot 0.12.1", + "polkadot-cli", "polkadot-client", "polkadot-service", + "sc-cli", "sc-client-api", "sc-consensus-babe", "sc-network", "sc-service", + "sc-sysinfo", "sc-telemetry", "sc-tracing", "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-state-machine", "tracing", ] [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2268,30 +2193,30 @@ dependencies = [ "futures 0.3.21", "jsonrpsee-core", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-overseer", "polkadot-service", "sc-client-api", "sc-service", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-state-machine", "thiserror", ] [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", "polkadot-primitives", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-state-machine", + "sp-std", ] [[package]] @@ -2320,6 +2245,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.6.3", + "subtle", + "zeroize", +] + [[package]] name = "curve25519-dalek-ng" version = "4.1.1" @@ -2409,7 +2347,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", @@ -2478,19 +2416,19 @@ dependencies = [ "serde", "smallvec 1.8.0", "sp-api", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-aura", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-staking", + "sp-std", "sp-transaction-pool", "sp-version", "static_assertions", @@ -2548,17 +2486,6 @@ dependencies = [ "dirs-sys-next", ] -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users 0.3.5", - "winapi 0.3.9", -] - [[package]] name = "dirs-sys" version = "0.3.7" @@ -2566,7 +2493,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "redox_users 0.4.3", + "redox_users", "winapi 0.3.9", ] @@ -2577,7 +2504,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.3", + "redox_users", "winapi 0.3.9", ] @@ -2599,9 +2526,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "0.4.8" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6" [[package]] name = "dyn-clonable" @@ -2689,17 +2616,11 @@ dependencies = [ "zeroize", ] -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - [[package]] name = "enum-as-inner" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4" +checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -2799,7 +2720,7 @@ version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a718c0675c555c5f976fff4ea9e2c150fa06cefa201cadef87cfbf9324075881" dependencies = [ - "blake3 1.3.1", + "blake3", "fs-err", "proc-macro2", "quote", @@ -2811,7 +2732,7 @@ version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3774182a5df13c3d1690311ad32fbe913feef26baba609fa2dd5f72042bd2ab6" dependencies = [ - "blake2 0.10.4", + "blake2", "fs-err", "proc-macro2", "quote", @@ -2929,13 +2850,11 @@ checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" [[package]] name = "flate2" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" dependencies = [ - "cfg-if 1.0.0", "crc32fast", - "libc", "libz-sys", "miniz_oxide", ] @@ -2964,7 +2883,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "parity-scale-codec", ] @@ -2982,9 +2901,9 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "linregress", "log 0.4.17", @@ -2993,35 +2912,36 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "sp-storage", ] [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "Inflector", "chrono", "clap", + "comfy-table", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "handlebars", "hash-db", "hex", "itertools", "kvdb", + "lazy_static", "linked-hash-map", "log 0.4.17", "memory-db", "parity-scale-codec", - "prettytable-rs", "rand 0.8.5", "rand_pcg 0.3.1", "sc-block-builder", @@ -3036,23 +2956,24 @@ dependencies = [ "serde_nanos", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-database", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-externalities", + "sp-inherents", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "sp-trie", "tempfile", + "thiserror", "thousands", ] [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -3063,33 +2984,33 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-election-provider-solution-type", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", ] [[package]] @@ -3107,11 +3028,11 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "bitflags", "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", + "frame-support-procedural", "impl-trait-for-tuples", "k256", "log 0.4.17", @@ -3121,79 +3042,26 @@ dependencies = [ "scale-info", "serde", "smallvec 1.8.0", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "tt-call", -] - -[[package]] -name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" -dependencies = [ - "bitflags", - "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "impl-trait-for-tuples", - "log 0.4.17", - "once_cell", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "smallvec 1.8.0", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", + "sp-core", + "sp-core-hashing-proc-macro", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-state-machine", + "sp-std", + "sp-tracing", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "Inflector", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "Inflector", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "proc-macro-crate 1.1.3", + "frame-support-procedural-tools", "proc-macro2", "quote", "syn", @@ -3202,9 +3070,9 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.3", "proc-macro2", "quote", @@ -3214,17 +3082,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "proc-macro2", "quote", @@ -3234,39 +3092,39 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "log 0.4.17", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "sp-version", ] [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "parity-scale-codec", "sp-api", @@ -3275,12 +3133,12 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "sp-api", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] @@ -3340,107 +3198,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] -name = "fudge" -version = "0.0.7" -source = "git+https://github.com/centrifuge/fudge?branch=v0.9.20#380a093bdc9519b9d34e7208c5cf6687c674bc3a" -dependencies = [ - "fudge-companion", - "fudge-core", - "polkadot-parachain", - "sc-executor", - "sc-service", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", -] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] -name = "fudge-companion" -version = "0.0.7" -source = "git+https://github.com/centrifuge/fudge?branch=v0.9.20#380a093bdc9519b9d34e7208c5cf6687c674bc3a" +name = "futures" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "fudge-core" -version = "0.0.7" -source = "git+https://github.com/centrifuge/fudge?branch=v0.9.20#380a093bdc9519b9d34e7208c5cf6687c674bc3a" -dependencies = [ - "async-trait", - "cumulus-primitives-parachain-inherent", - "cumulus-relay-chain-inprocess-interface", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "frame-system", - "fudge-companion", - "futures 0.3.21", - "lazy_static", - "node-primitives", - "pallet-babe", - "parity-scale-codec", - "parking_lot 0.12.0", - "polkadot-core-primitives", - "polkadot-parachain", - "polkadot-primitives", - "polkadot-runtime-parachains", - "sc-basic-authorship", - "sc-block-builder", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-consensus-uncles", - "sc-executor", - "sc-offchain", - "sc-service", - "sc-transaction-pool", - "sc-transaction-pool-api", - "sp-api", - "sp-authorship", - "sp-block-builder", - "sp-consensus", - "sp-consensus-aura", - "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-database", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-timestamp", - "sp-transaction-pool", - "tracing", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - -[[package]] -name = "futures" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", ] [[package]] @@ -3505,13 +3286,13 @@ dependencies = [ [[package]] name = "futures-rustls" -version = "0.21.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" +checksum = "e01fe9932a224b72b45336d96040aa86386d674a31d0af27d800ea7bc8ca97fe" dependencies = [ "futures-io", - "rustls 0.19.1", - "webpki 0.21.4", + "rustls", + "webpki", ] [[package]] @@ -3585,13 +3366,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -3623,9 +3404,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "globset" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" +checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" dependencies = [ "aho-corasick", "bstr", @@ -3672,15 +3453,15 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.2", + "tokio-util", "tracing", ] [[package]] name = "handlebars" -version = "4.3.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d113a9853e5accd30f43003560b5563ffbb007e3f325e8b103fa0d0029c6e6df" +checksum = "b66d0c1b6e3abfd1e72818798925e16e02ed77e1b47f6c25a95a23b377ee4299" dependencies = [ "log 0.4.17", "pest", @@ -3828,9 +3609,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes 1.1.0", "fnv", @@ -3887,9 +3668,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.18" +version = "0.14.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" +checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" dependencies = [ "bytes 1.1.0", "futures-channel", @@ -3902,7 +3683,7 @@ dependencies = [ "httpdate", "itoa 1.0.2", "pin-project-lite 0.2.9", - "socket2 0.4.4", + "socket2", "tokio", "tower-service", "tracing", @@ -3911,19 +3692,17 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" +checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" dependencies = [ - "ct-logs", - "futures-util", - "hyper 0.14.18", + "http", + "hyper 0.14.19", "log 0.4.17", - "rustls 0.19.1", - "rustls-native-certs 0.5.0", + "rustls", + "rustls-native-certs", "tokio", - "tokio-rustls 0.22.0", - "webpki 0.21.4", + "tokio-rustls", ] [[package]] @@ -3950,39 +3729,30 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.6.7" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2273e421f7c4f0fc99e1934fe4776f59d8df2972f4199d703fc0da9f2a9f73de" +checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" dependencies = [ - "if-addrs-sys", "libc", "winapi 0.3.9", ] -[[package]] -name = "if-addrs-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "if-watch" -version = "0.2.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179" +checksum = "ae8f4a3c3d4c89351ca83e120c1c00b27df945d38e05695668c9d4b4f7bc52f3" dependencies = [ "async-io", + "core-foundation", + "fnv", "futures 0.3.21", - "futures-lite", "if-addrs", "ipnet", - "libc", "log 0.4.17", - "winapi 0.3.9", + "rtnetlink", + "system-configuration", + "windows", ] [[package]] @@ -4016,9 +3786,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" dependencies = [ "autocfg 1.1.0", "hashbrown 0.11.2", @@ -4072,11 +3842,11 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" [[package]] name = "ipconfig" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" +checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98" dependencies = [ - "socket2 0.3.19", + "socket2", "widestring", "winapi 0.3.9", "winreg", @@ -4120,9 +3890,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.57" +version = "0.3.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" +checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27" dependencies = [ "wasm-bindgen", ] @@ -4135,7 +3905,7 @@ checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" dependencies = [ "derive_more", "futures 0.3.21", - "hyper 0.14.18", + "hyper 0.14.19", "jsonrpc-core", "jsonrpc-pubsub", "log 0.4.17", @@ -4183,37 +3953,6 @@ dependencies = [ "syn", ] -[[package]] -name = "jsonrpc-http-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" -dependencies = [ - "futures 0.3.21", - "hyper 0.14.18", - "jsonrpc-core", - "jsonrpc-server-utils", - "log 0.4.17", - "net2", - "parking_lot 0.11.2", - "unicase 2.6.0", -] - -[[package]] -name = "jsonrpc-ipc-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845" -dependencies = [ - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-server-utils", - "log 0.4.17", - "parity-tokio-ipc", - "parking_lot 0.11.2", - "tower-service", -] - [[package]] name = "jsonrpc-pubsub" version = "18.0.0" @@ -4229,86 +3968,60 @@ dependencies = [ "serde", ] -[[package]] -name = "jsonrpc-server-utils" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" -dependencies = [ - "bytes 1.1.0", - "futures 0.3.21", - "globset", - "jsonrpc-core", - "lazy_static", - "log 0.4.17", - "tokio", - "tokio-stream", - "tokio-util 0.6.10", - "unicase 2.6.0", -] - -[[package]] -name = "jsonrpc-ws-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946" -dependencies = [ - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-server-utils", - "log 0.4.17", - "parity-ws", - "parking_lot 0.11.2", - "slab", -] - [[package]] name = "jsonrpsee" -version = "0.10.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91dc760c341fa81173f9a434931aaf32baad5552b0230cc6c93e8fb7eaad4c19" +checksum = "a1f2ab5a60e558e74ea93bcf5164ebc47939a7fff8938fa9b5233bbc63e16061" dependencies = [ "jsonrpsee-core", + "jsonrpsee-http-server", "jsonrpsee-proc-macros", "jsonrpsee-types", "jsonrpsee-ws-client", + "jsonrpsee-ws-server", + "tracing", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.10.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765f7a36d5087f74e3b3b47805c2188fef8eb54afcb587b078d9f8ebfe9c7220" +checksum = "26d682f4a55081a2be3e639280c640523070e4aeb8ee2fd8dd9168fdae57a9db" dependencies = [ - "futures 0.3.21", + "futures-util", "http", "jsonrpsee-core", "jsonrpsee-types", "pin-project 1.0.10", - "rustls-native-certs 0.6.2", + "rustls-native-certs", "soketto", "thiserror", "tokio", - "tokio-rustls 0.23.4", - "tokio-util 0.7.2", + "tokio-rustls", + "tokio-util", "tracing", - "webpki-roots 0.22.3", + "webpki-roots", ] [[package]] name = "jsonrpsee-core" -version = "0.10.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82ef77ecd20c2254d54f5da8c0738eacca61e6b6511268a8f2753e3148c6c706" +checksum = "6e27462b21279edf9a6a91f46ffbe125e9cdc58b901d2e08bf59b31a47d7d0ab" dependencies = [ "anyhow", "arrayvec 0.7.2", + "async-lock", "async-trait", "beef", "futures-channel", + "futures-timer", "futures-util", - "hyper 0.14.18", + "hyper 0.14.19", "jsonrpsee-types", + "parking_lot 0.12.1", + "rand 0.8.5", "rustc-hash", "serde", "serde_json", @@ -4318,11 +4031,30 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-http-server" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7178f16eabd7154c094e24d295b9ee355ec1e5f24c328759c56255ff7bbd4548" +dependencies = [ + "futures-channel", + "futures-util", + "globset", + "hyper 0.14.19", + "jsonrpsee-core", + "jsonrpsee-types", + "lazy_static", + "serde_json", + "tokio", + "tracing", + "unicase 2.6.0", +] + [[package]] name = "jsonrpsee-proc-macros" -version = "0.10.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7291c72805bc7d413b457e50d8ef3e87aa554da65ecbbc278abb7dfc283e7f0" +checksum = "8b8d7f449cab3b747f12c3efc27f5cad537f3b597c6a3838b0fac628f4bf730a" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -4332,9 +4064,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.10.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b6aa52f322cbf20c762407629b8300f39bcc0cf0619840d9252a2f65fd2dd9" +checksum = "8fd11763134104122ddeb0f97e4bbe393058017dfb077db63fbf44b4dd0dd86e" dependencies = [ "anyhow", "beef", @@ -4346,15 +4078,32 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.10.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd66d18bab78d956df24dd0d2e41e4c00afbb818fda94a98264bdd12ce8506ac" +checksum = "76f15180afb3761c7a3a32c0a8b680788176dcfdfe725b24c1758c90b1d1595b" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", ] +[[package]] +name = "jsonrpsee-ws-server" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb6c21556c551582b56e4e8e6e6249b0bbdb69bb7fa39efe9b9a6b54af9f206" +dependencies = [ + "futures-channel", + "futures-util", + "jsonrpsee-core", + "jsonrpsee-types", + "serde_json", + "soketto", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "k256" version = "0.10.4" @@ -4369,9 +4118,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "kernel32-sys" @@ -4385,14 +4134,14 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "beefy-primitives", "bitvec", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -4417,6 +4166,7 @@ dependencies = [ "pallet-membership", "pallet-multisig", "pallet-nicks", + "pallet-nomination-pools", "pallet-offences", "pallet-preimage", "pallet-proxy", @@ -4444,20 +4194,20 @@ dependencies = [ "serde_derive", "smallvec 1.8.0", "sp-api", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-io", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-staking", + "sp-std", "sp-transaction-pool", "sp-version", "static_assertions", @@ -4469,14 +4219,14 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.8.0", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", ] [[package]] @@ -4506,7 +4256,7 @@ checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.12.0", + "parking_lot 0.12.1", ] [[package]] @@ -4521,7 +4271,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "regex", "rocksdb", "smallvec 1.8.0", @@ -4579,15 +4329,18 @@ checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" [[package]] name = "libp2p" -version = "0.40.0" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bec54343492ba5940a6c555e512c6721139835d28c59bc22febece72dfd0d9d" +checksum = "41726ee8f662563fafba2d2d484b14037cc8ecb8c953fbfc8439d4ce3a0a9029" dependencies = [ - "atomic", "bytes 1.1.0", "futures 0.3.21", + "futures-timer", + "getrandom 0.2.7", + "instant", "lazy_static", - "libp2p-core", + "libp2p-autonat", + "libp2p-core 0.33.0", "libp2p-deflate", "libp2p-dns", "libp2p-floodsub", @@ -4612,17 +4365,70 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multiaddr", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "pin-project 1.0.10", + "rand 0.7.3", "smallvec 1.8.0", - "wasm-timer", +] + +[[package]] +name = "libp2p-autonat" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50de7c1d5c3f040fccb469e8a2d189e068b7627d760dd74ef914071c16bbe905" +dependencies = [ + "async-trait", + "futures 0.3.21", + "futures-timer", + "instant", + "libp2p-core 0.33.0", + "libp2p-request-response", + "libp2p-swarm", + "log 0.4.17", + "prost 0.10.4", + "prost-build 0.10.4", + "rand 0.8.5", ] [[package]] name = "libp2p-core" -version = "0.30.2" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86aad7d54df283db817becded03e611137698a6509d4237a96881976a162340c" +checksum = "db5b02602099fb75cb2d16f9ea860a320d6eb82ce41e95ab680912c454805cd5" +dependencies = [ + "asn1_der", + "bs58", + "ed25519-dalek", + "either", + "fnv", + "futures 0.3.21", + "futures-timer", + "instant", + "lazy_static", + "log 0.4.17", + "multiaddr", + "multihash", + "multistream-select", + "parking_lot 0.12.1", + "pin-project 1.0.10", + "prost 0.9.0", + "prost-build 0.9.0", + "rand 0.8.5", + "ring", + "rw-stream-sink 0.2.1", + "sha2 0.10.2", + "smallvec 1.8.0", + "thiserror", + "unsigned-varint", + "void", + "zeroize", +] + +[[package]] +name = "libp2p-core" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d46fca305dee6757022e2f5a4f6c023315084d0ed7441c3ab244e76666d979" dependencies = [ "asn1_der", "bs58", @@ -4636,140 +4442,149 @@ dependencies = [ "libsecp256k1", "log 0.4.17", "multiaddr", - "multihash 0.14.0", + "multihash", "multistream-select", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "pin-project 1.0.10", - "prost", - "prost-build", + "prost 0.10.4", + "prost-build 0.10.4", "rand 0.8.5", "ring", - "rw-stream-sink", - "sha2 0.9.9", + "rw-stream-sink 0.3.0", + "sha2 0.10.2", "smallvec 1.8.0", "thiserror", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", "zeroize", ] [[package]] name = "libp2p-deflate" -version = "0.30.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51a800adb195f33de63f4b17b63fe64cfc23bf2c6a0d3d0d5321328664e65197" +checksum = "86adefc55ea4ed8201149f052fb441210727481dff1fb0b8318460206a79f5fb" dependencies = [ "flate2", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.33.0", ] [[package]] name = "libp2p-dns" -version = "0.30.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb8f89d15cb6e3c5bc22afff7513b11bab7856f2872d3cfba86f7f63a06bc498" +checksum = "fbb462ec3a51fab457b4b44ac295e8b0a4b04dc175127e615cf996b1f0f1a268" dependencies = [ "async-std-resolver", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.33.0", "log 0.4.17", + "parking_lot 0.12.1", "smallvec 1.8.0", "trust-dns-resolver", ] [[package]] name = "libp2p-floodsub" -version = "0.31.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab3d7210901ea51b7bae2b581aa34521797af8c4ec738c980bda4a06434067f" +checksum = "a505d0c6f851cbf2919535150198e530825def8bd3757477f13dc3a57f46cbcc" dependencies = [ "cuckoofilter", "fnv", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.33.0", "libp2p-swarm", "log 0.4.17", - "prost", - "prost-build", + "prost 0.10.4", + "prost-build 0.10.4", "rand 0.7.3", "smallvec 1.8.0", ] [[package]] name = "libp2p-gossipsub" -version = "0.33.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeead619eb5dac46e65acc78c535a60aaec803d1428cca6407c3a4fc74d698d" +checksum = "43e064ba4d7832e01c738626c6b274ae100baba05f5ffcc7b265c2a3ed398108" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "base64 0.13.0", "byteorder", "bytes 1.1.0", "fnv", "futures 0.3.21", "hex_fmt", - "libp2p-core", + "instant", + "libp2p-core 0.33.0", "libp2p-swarm", "log 0.4.17", - "prost", - "prost-build", + "prometheus-client", + "prost 0.10.4", + "prost-build 0.10.4", "rand 0.7.3", "regex", - "sha2 0.9.9", + "sha2 0.10.2", "smallvec 1.8.0", - "unsigned-varint 0.7.1", + "unsigned-varint", "wasm-timer", ] [[package]] name = "libp2p-identify" -version = "0.31.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca1275574183f288ff8b72d535d5ffa5ea9292ef7829af8b47dcb197c7b0dcd" +checksum = "b84b53490442d086db1fa5375670c9666e79143dccadef3f7c74a4346899a984" dependencies = [ + "asynchronous-codec", "futures 0.3.21", - "libp2p-core", + "futures-timer", + "libp2p-core 0.33.0", "libp2p-swarm", "log 0.4.17", - "lru 0.6.6", - "prost", - "prost-build", + "lru 0.7.7", + "prost 0.10.4", + "prost-build 0.10.4", + "prost-codec", "smallvec 1.8.0", - "wasm-timer", + "thiserror", + "void", ] [[package]] name = "libp2p-kad" -version = "0.32.0" +version = "0.37.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2297dc0ca285f3a09d1368bde02449e539b46f94d32d53233f53f6625bcd3ba" +checksum = "5f6b5d4de90fcd35feb65ea6223fd78f3b747a64ca4b65e0813fbe66a27d56aa" dependencies = [ - "arrayvec 0.5.2", - "asynchronous-codec 0.6.0", + "arrayvec 0.7.2", + "asynchronous-codec", "bytes 1.1.0", "either", "fnv", "futures 0.3.21", - "libp2p-core", + "futures-timer", + "instant", + "libp2p-core 0.33.0", "libp2p-swarm", "log 0.4.17", - "prost", - "prost-build", + "prost 0.10.4", + "prost-build 0.10.4", "rand 0.7.3", - "sha2 0.9.9", + "sha2 0.10.2", "smallvec 1.8.0", + "thiserror", "uint", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-mdns" -version = "0.32.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c864b64bdc8a84ff3910a0df88e6535f256191a450870f1e7e10cbf8e64d45" +checksum = "4783f8cf00c7b6c1ff0f1870b4fcf50b042b45533d2e13b6fb464caf447a6951" dependencies = [ "async-io", "data-encoding", @@ -4777,63 +4592,65 @@ dependencies = [ "futures 0.3.21", "if-watch", "lazy_static", - "libp2p-core", + "libp2p-core 0.33.0", "libp2p-swarm", "log 0.4.17", "rand 0.8.5", "smallvec 1.8.0", - "socket2 0.4.4", + "socket2", "void", ] [[package]] name = "libp2p-metrics" -version = "0.1.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af432fcdd2f8ba4579b846489f8f0812cfd738ced2c0af39df9b1c48bbb6ab2" +checksum = "adc4357140141ba9739eee71b20aa735351c0fc642635b2bffc7f57a6b5c1090" dependencies = [ - "libp2p-core", + "libp2p-core 0.33.0", + "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-ping", + "libp2p-relay", "libp2p-swarm", - "open-metrics-client", + "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.30.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2cd64ef597f40e14bfce0497f50ecb63dd6d201c61796daeb4227078834fbf" +checksum = "5ff9c893f2367631a711301d703c47432af898c9bb8253bea0e2c051a13f7640" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "bytes 1.1.0", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.33.0", "log 0.4.17", "nohash-hasher", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "rand 0.7.3", "smallvec 1.8.0", - "unsigned-varint 0.7.1", + "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8772c7a99088221bb7ca9c5c0574bf55046a7ab4c319f3619b275f28c8fb87a" +checksum = "cf2cee1dad1c83325bbd182a8e94555778699cec8a9da00086efb7522c4c15ad" dependencies = [ "bytes 1.1.0", "curve25519-dalek 3.2.0", "futures 0.3.21", "lazy_static", - "libp2p-core", + "libp2p-core 0.33.0", "log 0.4.17", - "prost", - "prost-build", + "prost 0.10.4", + "prost-build 0.10.4", "rand 0.8.5", - "sha2 0.9.9", + "sha2 0.10.2", "snow", "static_assertions", "x25519-dalek", @@ -4842,33 +4659,34 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.31.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ef7b0ec5cf06530d9eb6cf59ae49d46a2c45663bde31c25a12f682664adbcf" +checksum = "d41516c82fe8dd148ec925eead0c5ec08a0628f7913597e93e126e4dfb4e0787" dependencies = [ "futures 0.3.21", - "libp2p-core", + "futures-timer", + "instant", + "libp2p-core 0.33.0", "libp2p-swarm", "log 0.4.17", "rand 0.7.3", "void", - "wasm-timer", ] [[package]] name = "libp2p-plaintext" -version = "0.30.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba1a6ff33e4a274c89a3b1d78b9f34f32af13265cc5c46c16938262d4e945a" +checksum = "db007e737adc5d28b2e03223b0210164928ad742591127130796a72aa8eaf54f" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "bytes 1.1.0", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.33.0", "log 0.4.17", - "prost", - "prost-build", - "unsigned-varint 0.7.1", + "prost 0.10.4", + "prost-build 0.10.4", + "unsigned-varint", "void", ] @@ -4888,89 +4706,96 @@ dependencies = [ [[package]] name = "libp2p-relay" -version = "0.4.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2852b61c90fa8ce3c8fcc2aba76e6cefc20d648f9df29157d6b3a916278ef3e3" +checksum = "624ead3406f64437a0d4567c31bd128a9a0b8226d5f16c074038f5d0fc32f650" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "bytes 1.1.0", + "either", "futures 0.3.21", "futures-timer", - "libp2p-core", + "instant", + "libp2p-core 0.33.0", "libp2p-swarm", "log 0.4.17", "pin-project 1.0.10", - "prost", - "prost-build", - "rand 0.7.3", + "prost 0.10.4", + "prost-build 0.10.4", + "prost-codec", + "rand 0.8.5", "smallvec 1.8.0", - "unsigned-varint 0.7.1", + "static_assertions", + "thiserror", "void", - "wasm-timer", ] [[package]] name = "libp2p-rendezvous" -version = "0.1.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a6d2b9e7677eff61dc3d2854876aaf3976d84a01ef6664b610c77a0c9407c5" +checksum = "c59967ea2db2c7560f641aa58ac05982d42131863fcd3dd6dcf0dd1daf81c60c" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "bimap", "futures 0.3.21", - "libp2p-core", + "futures-timer", + "instant", + "libp2p-core 0.33.0", "libp2p-swarm", "log 0.4.17", - "prost", - "prost-build", + "prost 0.10.4", + "prost-build 0.10.4", "rand 0.8.5", - "sha2 0.9.9", + "sha2 0.10.2", "thiserror", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-request-response" -version = "0.13.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a877a4ced6d46bf84677e1974e8cf61fb434af73b2e96fb48d6cb6223a4634d8" +checksum = "b02e0acb725e5a757d77c96b95298fd73a7394fe82ba7b8bbeea510719cbe441" dependencies = [ "async-trait", "bytes 1.1.0", "futures 0.3.21", - "libp2p-core", + "instant", + "libp2p-core 0.33.0", "libp2p-swarm", "log 0.4.17", - "lru 0.7.5", "rand 0.7.3", "smallvec 1.8.0", - "unsigned-varint 0.7.1", - "wasm-timer", + "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.31.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5184a508f223bc100a12665517773fb8730e9f36fc09eefb670bf01b107ae9" +checksum = "8f4bb21c5abadbf00360c734f16bf87f1712ed4f23cd46148f625d2ddb867346" dependencies = [ "either", + "fnv", "futures 0.3.21", - "libp2p-core", + "futures-timer", + "instant", + "libp2p-core 0.33.0", "log 0.4.17", + "pin-project 1.0.10", "rand 0.7.3", "smallvec 1.8.0", + "thiserror", "void", - "wasm-timer", ] [[package]] name = "libp2p-swarm-derive" -version = "0.25.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072c290f727d39bdc4e9d6d1c847978693d25a673bd757813681e33e5f6c00c2" +checksum = "4f693c8c68213034d472cbb93a379c63f4f307d97c06f1c41e4985de481687a5" dependencies = [ "quote", "syn", @@ -4978,9 +4803,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.30.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b" +checksum = "4f4933e38ef21b50698aefc87799c24f2a365c9d3f6cf50471f3f6a0bc410892" dependencies = [ "async-io", "futures 0.3.21", @@ -4988,32 +4813,32 @@ dependencies = [ "if-watch", "ipnet", "libc", - "libp2p-core", + "libp2p-core 0.33.0", "log 0.4.17", - "socket2 0.4.4", + "socket2", ] [[package]] name = "libp2p-uds" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b7563e46218165dfd60f64b96f7ce84590d75f53ecbdc74a7dd01450dc5973" +checksum = "24bdab114f7f2701757d6541266e1131b429bbae382008f207f2114ee4222dcb" dependencies = [ "async-std", "futures 0.3.21", - "libp2p-core", + "libp2p-core 0.32.1", "log 0.4.17", ] [[package]] name = "libp2p-wasm-ext" -version = "0.30.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1008a302b73c5020251f9708c653f5ed08368e530e247cc9cd2f109ff30042cf" +checksum = "f066f2b8b1a1d64793f05da2256e6842ecd0293d6735ca2e9bda89831a1bdc06" dependencies = [ "futures 0.3.21", "js-sys", - "libp2p-core", + "libp2p-core 0.33.0", "parity-send-wrapper", "wasm-bindgen", "wasm-bindgen-futures", @@ -5021,31 +4846,32 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e12df82d1ed64969371a9e65ea92b91064658604cc2576c2757f18ead9a1cf" +checksum = "39d398fbb29f432c4128fabdaac2ed155c3bcaf1b9bd40eeeb10a471eefacbf5" dependencies = [ "either", "futures 0.3.21", "futures-rustls", - "libp2p-core", + "libp2p-core 0.33.0", "log 0.4.17", + "parking_lot 0.12.1", "quicksink", - "rw-stream-sink", + "rw-stream-sink 0.3.0", "soketto", "url 2.2.2", - "webpki-roots 0.21.1", + "webpki-roots", ] [[package]] name = "libp2p-yamux" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af" +checksum = "8fe653639ad74877c759720febb0cbcbf4caa221adde4eed2d3126ce5c6f381f" dependencies = [ "futures 0.3.21", - "libp2p-core", - "parking_lot 0.11.2", + "libp2p-core 0.33.0", + "parking_lot 0.12.1", "thiserror", "yamux", ] @@ -5115,9 +4941,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.6" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e7e15d7610cce1d9752e137625f14e61a28cd45929b6e12e47b50fe154ee2e" +checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" dependencies = [ "cc", "pkg-config", @@ -5204,9 +5030,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889" +checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a" dependencies = [ "hashbrown 0.11.2", ] @@ -5297,6 +5123,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memfd" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a" +dependencies = [ + "libc", +] + [[package]] name = "memmap2" version = "0.2.3" @@ -5308,9 +5143,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f" +checksum = "d5172b50c23043ff43dd53e51392f36519d9b35a8f3a410d30ece5d1aedd58ae" dependencies = [ "libc", ] @@ -5374,21 +5209,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "metered-channel" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" -dependencies = [ - "coarsetime", - "crossbeam-queue", - "derive_more", - "futures 0.3.21", - "futures-timer", - "nanorand", - "thiserror", - "tracing-gum", -] - [[package]] name = "mick-jaeger" version = "0.1.8" @@ -5417,9 +5237,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" dependencies = [ "adler", ] @@ -5455,18 +5275,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log 0.4.17", - "mio 0.6.23", - "slab", -] - [[package]] name = "miow" version = "0.2.2" @@ -5487,27 +5295,27 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "multiaddr" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ee4ea82141951ac6379f964f71b20876d43712bea8faf6dd1a375e08a46499" +checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" dependencies = [ "arrayref", "bs58", "byteorder", "data-encoding", - "multihash 0.14.0", + "multihash", "percent-encoding 2.1.0", "serde", "static_assertions", - "unsigned-varint 0.7.1", + "unsigned-varint", "url 2.2.2", ] [[package]] name = "multibase" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b78c60039650ff12e140ae867ef5299a58e19dded4d334c849dc7177083667e2" +checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" dependencies = [ "base-x", "data-encoding", @@ -5516,39 +5324,26 @@ dependencies = [ [[package]] name = "multihash" -version = "0.13.2" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab" +checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689" dependencies = [ "blake2b_simd", "blake2s_simd", - "blake3 0.3.8", - "digest 0.9.0", - "generic-array 0.14.5", - "multihash-derive", - "sha2 0.9.9", - "sha3 0.9.1", - "unsigned-varint 0.5.1", -] - -[[package]] -name = "multihash" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8" -dependencies = [ - "digest 0.9.0", - "generic-array 0.14.5", + "blake3", + "core2", + "digest 0.10.3", "multihash-derive", - "sha2 0.9.9", - "unsigned-varint 0.7.1", + "sha2 0.10.2", + "sha3 0.10.1", + "unsigned-varint", ] [[package]] name = "multihash-derive" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" +checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro-error", @@ -5566,16 +5361,16 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a336acba8bc87c8876f6425407dbbe6c417bf478b22015f8fb0994ef3bc0ab" +checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" dependencies = [ "bytes 1.1.0", "futures 0.3.21", "log 0.4.17", "pin-project 1.0.10", "smallvec 1.8.0", - "unsigned-varint 0.7.1", + "unsigned-varint", ] [[package]] @@ -5651,10 +5446,88 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "netlink-packet-core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297" +dependencies = [ + "anyhow", + "byteorder", + "libc", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-route" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733ea73609acfd7fa7ddadfb7bf709b0471668c456ad9513685af543a06342b2" +dependencies = [ + "anyhow", + "bitflags", + "byteorder", + "libc", + "netlink-packet-core", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-utils" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +dependencies = [ + "anyhow", + "byteorder", + "paste", + "thiserror", +] + +[[package]] +name = "netlink-proto" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8785b8141e8432aa45fceb922a7e876d7da3fad37fa7e7ec702ace3aa0826b" +dependencies = [ + "bytes 1.1.0", + "futures 0.3.21", + "log 0.4.17", + "netlink-packet-core", + "netlink-sys", + "tokio", +] + +[[package]] +name = "netlink-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4c9f9547a08241bee7b6558b9b98e1f290d187de8b7cfca2bbb4937bcaa8f8" +dependencies = [ + "async-io", + "bytes 1.1.0", + "futures 0.3.21", + "libc", + "log 0.4.17", +] + +[[package]] +name = "nix" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", + "memoffset", +] + [[package]] name = "node-inspect" version = "0.9.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "clap", "parity-scale-codec", @@ -5663,22 +5536,22 @@ dependencies = [ "sc-executor", "sc-service", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", "thiserror", ] [[package]] name = "node-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-core", + "sp-runtime", ] [[package]] @@ -5824,29 +5697,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "open-metrics-client" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7337d80c23c2d8b1349563981bc4fb531220733743ba8115454a67b181173f0d" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "open-metrics-client-derive-text-encode", - "owning_ref", -] - -[[package]] -name = "open-metrics-client-derive-text-encode" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c83b586f00268c619c1cb3340ec1a6f59dd9ba1d9833a273a68e6d5cd8ffc" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "openssl" version = "0.10.40" @@ -5881,9 +5731,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.73" +version = "0.9.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0" +checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1" dependencies = [ "autocfg 1.1.0", "cc", @@ -5892,6 +5742,35 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "orchestra" +version = "0.0.1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" +dependencies = [ + "async-trait", + "dyn-clonable", + "futures 0.3.21", + "futures-timer", + "orchestra-proc-macro", + "pin-project 1.0.10", + "prioritized-metered-channel", + "thiserror", + "tracing", +] + +[[package]] +name = "orchestra-proc-macro" +version = "0.0.1" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" +dependencies = [ + "expander 0.0.6", + "petgraph", + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "ordered-float" version = "1.1.1" @@ -5904,60 +5783,60 @@ dependencies = [ [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#78f2d4521856e100d625336692befcc10819e856" +source = "git+https://github.com/NunoAlexandre/open-runtime-module-library?branch=polkadot-v0.9.24#29442c0a2f8ec8d76dc2287afc977e608cbcf7c2" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "orml-traits", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#78f2d4521856e100d625336692befcc10819e856" +source = "git+https://github.com/NunoAlexandre/open-runtime-module-library?branch=polkadot-v0.9.24#29442c0a2f8ec8d76dc2287afc977e608cbcf7c2" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "impl-trait-for-tuples", "num-traits", "orml-utilities", "parity-scale-codec", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", "xcm", ] [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#78f2d4521856e100d625336692befcc10819e856" +source = "git+https://github.com/NunoAlexandre/open-runtime-module-library?branch=polkadot-v0.9.24#29442c0a2f8ec8d76dc2287afc977e608cbcf7c2" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "parity-scale-codec", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#78f2d4521856e100d625336692befcc10819e856" +source = "git+https://github.com/NunoAlexandre/open-runtime-module-library?branch=polkadot-v0.9.24#29442c0a2f8ec8d76dc2287afc977e608cbcf7c2" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "orml-traits", "parity-scale-codec", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -5965,28 +5844,29 @@ dependencies = [ [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#78f2d4521856e100d625336692befcc10819e856" +source = "git+https://github.com/NunoAlexandre/open-runtime-module-library?branch=polkadot-v0.9.24#29442c0a2f8ec8d76dc2287afc977e608cbcf7c2" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "orml-traits", "orml-xcm-support", + "pallet-xcm", "parity-scale-codec", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] [[package]] name = "os_str_bytes" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d8d0b2f198229de29dca79676f2738ff952edf3fde542eb8bf94d8c21b435" +checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" [[package]] name = "owning_ref" @@ -6001,7 +5881,7 @@ dependencies = [ name = "pallet-anchors" version = "2.0.0" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-authorship", "pallet-balances", @@ -6011,83 +5891,83 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-transaction-payment", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-consensus-aura", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-authority-discovery", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "sp-authorship", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "pallet-authorship", @@ -6095,73 +5975,72 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-staking", + "sp-std", ] [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "beefy-primitives", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-session", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "beefy-merkle-tree", "beefy-primitives", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "hex", - "k256", "log 0.4.17", "pallet-beefy", "pallet-mmr", @@ -6169,27 +6048,27 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6198,7 +6077,7 @@ version = "2.0.0" dependencies = [ "chainbridge", "common-traits", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-anchors", "pallet-authorship", @@ -6211,40 +6090,40 @@ dependencies = [ "proofs", "runtime-common", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "unique-assets", ] [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bp-message-dispatch", "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bp-header-chain", "bp-runtime", "bp-test-utils", "finality-grandpa", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "num-traits", @@ -6252,9 +6131,9 @@ dependencies = [ "scale-info", "serde", "sp-finality-grandpa", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", + "sp-trie", ] [[package]] @@ -6262,7 +6141,7 @@ name = "pallet-bridge-mapping" version = "2.0.0" dependencies = [ "chainbridge", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-anchors", "pallet-authorship", @@ -6273,48 +6152,48 @@ dependencies = [ "parity-scale-codec", "runtime-common", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", ] [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bitvec", "bp-message-dispatch", "bp-messages", "bp-runtime", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "pallet-bounties", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6322,16 +6201,16 @@ name = "pallet-claims" version = "2.0.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "node-primitives", "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6339,24 +6218,24 @@ name = "pallet-collator-allowlist" version = "2.0.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "pallet-authorship", @@ -6365,26 +6244,26 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6393,9 +6272,9 @@ version = "0.1.0" dependencies = [ "common-traits", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", - "getrandom 0.2.6", + "getrandom 0.2.7", "hex", "lazy_static", "log 0.4.17", @@ -6408,12 +6287,12 @@ dependencies = [ "scale-info", "schnorrkel 0.10.2", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", "sp-keyring", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", + "sp-trie", ] [[package]] @@ -6422,7 +6301,7 @@ version = "0.1.0" dependencies = [ "common-traits", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "pallet-balances", @@ -6431,47 +6310,47 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "rand 0.7.3", "scale-info", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", "static_assertions", "strum 0.23.0", ] @@ -6479,19 +6358,19 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] @@ -6499,105 +6378,105 @@ name = "pallet-fees" version = "2.0.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-authorship", "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "pallet-authorship", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-core", "sp-finality-grandpa", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-staking", + "sp-std", ] [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "enumflags2", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", "sp-keyring", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] @@ -6607,7 +6486,7 @@ dependencies = [ "common-traits", "common-types", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "orml-tokens", "orml-traits", @@ -6620,28 +6499,28 @@ dependencies = [ "runtime-common", "scale-info", "serde", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6649,7 +6528,7 @@ name = "pallet-migration-manager" version = "0.1.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "hex", "log 0.4.17", @@ -6659,61 +6538,59 @@ dependencies = [ "parity-scale-codec", "rand 0.8.5", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "sp-version", ] [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", "sp-mmr-primitives", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" -dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" +dependencies = [ + "jsonrpsee", "parity-scale-codec", "serde", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-mmr-primitives", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", ] [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6723,7 +6600,7 @@ dependencies = [ "chainbridge", "common-traits", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-anchors", "pallet-authorship", @@ -6734,10 +6611,10 @@ dependencies = [ "proofs", "runtime-common", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "unique-assets", ] @@ -6747,7 +6624,7 @@ version = "2.0.0" dependencies = [ "common-types", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "orml-tokens", "orml-traits", @@ -6756,41 +6633,57 @@ dependencies = [ "parity-scale-codec", "runtime-common", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-nomination-pools" +version = "1.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", + "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -6801,13 +6694,13 @@ dependencies = [ "common-traits", "common-types", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] @@ -6817,7 +6710,7 @@ dependencies = [ "common-traits", "common-types", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "orml-tokens", "orml-traits", @@ -6831,70 +6724,71 @@ dependencies = [ "runtime-common", "scale-info", "serde", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "safe-mix", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-benchmarking", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -6904,7 +6798,7 @@ dependencies = [ "common-traits", "common-types", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "orml-tokens", "orml-traits", @@ -6914,86 +6808,86 @@ dependencies = [ "runtime-common", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "impl-trait-for-tuples", "log 0.4.17", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-staking", + "sp-std", + "sp-trie", ] [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "pallet-session", "pallet-staking", "rand 0.7.3", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "sp-session", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-std", ] [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "pallet-authorship", @@ -7002,17 +6896,17 @@ dependencies = [ "rand_chacha 0.2.2", "scale-info", "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -7023,184 +6917,181 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "log 0.4.17", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", ] [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-std", "sp-timestamp", ] [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "pallet-treasury", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", "serde", - "smallvec 1.8.0", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", ] [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", "sp-api", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", ] [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-xcm" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -7208,10 +7099,10 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.20#4bbedb30b1478494b410477498bd0a2221177a11" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.24#1d3a0d77b94046cf584dbf712d54fe6e9787d61c" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", @@ -7239,9 +7130,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.1.2" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" +checksum = "9182e4a71cae089267ab03e67c99368db7cd877baf50f931e5d6d4b71e195ac0" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -7253,9 +7144,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.1.2" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8" +checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -7269,20 +7160,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -[[package]] -name = "parity-tokio-ipc" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" -dependencies = [ - "futures 0.3.21", - "libc", - "log 0.4.17", - "rand 0.7.3", - "tokio", - "winapi 0.3.9", -] - [[package]] name = "parity-util-mem" version = "0.11.0" @@ -7293,7 +7170,7 @@ dependencies = [ "hashbrown 0.12.1", "impl-trait-for-tuples", "parity-util-mem-derive", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "primitive-types", "smallvec 1.8.0", "winapi 0.3.9", @@ -7325,24 +7202,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" -[[package]] -name = "parity-ws" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5983d3929ad50f12c3eb9a6743f19d691866ecd44da74c0a3308c3f8a56df0c6" -dependencies = [ - "byteorder", - "bytes 0.4.12", - "httparse", - "log 0.4.17", - "mio 0.6.23", - "mio-extras", - "rand 0.7.3", - "sha-1 0.8.2", - "slab", - "url 2.2.2", -] - [[package]] name = "parking" version = "2.0.0" @@ -7373,9 +7232,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api 0.4.7", "parking_lot_core 0.9.3", @@ -7510,9 +7369,9 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" dependencies = [ "fixedbitset", "indexmap", @@ -7576,17 +7435,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs8" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" -dependencies = [ - "der", - "spki", - "zeroize", -] - [[package]] name = "pkg-config" version = "0.3.25" @@ -7601,8 +7449,8 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "polkadot-approval-distribution" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -7616,26 +7464,27 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", + "rand 0.8.5", "tracing-gum", ] [[package]] name = "polkadot-availability-distribution" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "derive_more", "fatality", "futures 0.3.21", - "lru 0.7.5", + "lru 0.7.7", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7644,20 +7493,20 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-keystore", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-availability-recovery" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "fatality", "futures 0.3.21", - "lru 0.7.5", + "lru 0.7.7", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7673,8 +7522,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "clap", "frame-benchmarking-cli", @@ -7687,9 +7536,10 @@ dependencies = [ "polkadot-service", "sc-cli", "sc-service", + "sc-sysinfo", "sc-tracing", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-trie", "substrate-build-script-utils", "thiserror", "try-runtime-cli", @@ -7697,8 +7547,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -7722,23 +7572,23 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-finality-grandpa", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-inherents", "sp-keyring", "sp-mmr-primitives", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "sp-session", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-storage", "sp-timestamp", "sp-transaction-pool", ] [[package]] name = "polkadot-collator-protocol" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "always-assert", "fatality", @@ -7749,35 +7599,35 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-keystore", + "sp-runtime", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-core-primitives" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "parity-scale-codec", "parity-util-mem", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "polkadot-dispute-distribution" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "derive_more", "fatality", "futures 0.3.21", - "lru 0.7.5", + "lru 0.7.7", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7786,30 +7636,30 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-network", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-keystore", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-erasure-coding" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-trie", "thiserror", ] [[package]] name = "polkadot-gossip-support" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7820,21 +7670,23 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-core", + "sp-keystore", "tracing-gum", ] [[package]] name = "polkadot-network-bridge" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ + "always-assert", "async-trait", + "bytes 1.1.0", "futures 0.3.21", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7847,8 +7699,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "futures 0.3.21", "parity-scale-codec", @@ -7857,7 +7709,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-maybe-compressed-blob", "thiserror", "tracing-gum", @@ -7865,15 +7717,15 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bitvec", "derive_more", "futures 0.3.21", "futures-timer", "kvdb", - "lru 0.7.5", + "lru 0.7.7", "merlin 2.0.1", "parity-scale-codec", "polkadot-node-jaeger", @@ -7884,18 +7736,18 @@ dependencies = [ "polkadot-primitives", "sc-keystore", "schnorrkel 0.9.1", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-av-store" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bitvec", "futures 0.3.21", @@ -7914,10 +7766,11 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bitvec", + "fatality", "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7925,21 +7778,21 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-statement-table", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-keystore", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-keystore", "thiserror", "tracing-gum", "wasm-timer", @@ -7947,8 +7800,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "async-trait", "futures 0.3.21", @@ -7965,8 +7818,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7980,8 +7833,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7997,13 +7850,13 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "fatality", "futures 0.3.21", "kvdb", - "lru 0.7.5", + "lru 0.7.7", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8016,8 +7869,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "async-trait", "futures 0.3.21", @@ -8025,18 +7878,19 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-primitives", "sp-blockchain", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-inherents", + "sp-runtime", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bitvec", + "fatality", "futures 0.3.21", "futures-timer", "polkadot-node-primitives", @@ -8050,8 +7904,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "always-assert", "assert_matches", @@ -8069,19 +7923,20 @@ dependencies = [ "sc-executor-common", "sc-executor-wasmtime", "slotmap", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-externalities", + "sp-io", "sp-maybe-compressed-blob", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-tracing", + "sp-wasm-interface", + "tempfile", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -8089,15 +7944,15 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-keystore", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "futures 0.3.21", "memory-lru", @@ -8108,40 +7963,39 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", "tracing-gum", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "async-std", "lazy_static", "log 0.4.17", "mick-jaeger", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-node-primitives", "polkadot-primitives", "sc-network", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "thiserror", ] [[package]] name = "polkadot-node-metrics" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bs58", "futures 0.3.21", "futures-timer", "log 0.4.17", - "metered-channel", "parity-scale-codec", "polkadot-primitives", + "prioritized-metered-channel", "sc-cli", "sc-service", "sc-tracing", @@ -8151,26 +8005,29 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "async-trait", + "derive_more", "fatality", "futures 0.3.21", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", + "rand 0.8.5", "sc-authority-discovery", "sc-network", - "strum 0.24.0", + "strum 0.24.1", "thiserror", + "tracing-gum", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bounded-vec", "futures 0.3.21", @@ -8179,11 +8036,11 @@ dependencies = [ "polkadot-primitives", "schnorrkel 0.9.1", "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-keystore", "sp-maybe-compressed-blob", "thiserror", "zstd", @@ -8191,8 +8048,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -8201,15 +8058,15 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "derive_more", "futures 0.3.21", + "orchestra", "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", - "polkadot-overseer-gen", "polkadot-primitives", "polkadot-statement-table", "sc-network", @@ -8220,8 +8077,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "async-trait", "derive_more", @@ -8229,8 +8086,7 @@ dependencies = [ "futures 0.3.21", "itertools", "kvdb", - "lru 0.7.5", - "metered-channel", + "lru 0.7.7", "parity-db", "parity-scale-codec", "parity-util-mem", @@ -8243,85 +8099,58 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", + "prioritized-metered-channel", "rand 0.8.5", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-core", + "sp-keystore", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-overseer" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "futures 0.3.21", "futures-timer", - "lru 0.7.5", + "lru 0.7.7", + "orchestra", "parity-util-mem", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem-types", - "polkadot-overseer-gen", "polkadot-primitives", "sc-client-api", "sp-api", + "sp-core", "tracing-gum", ] -[[package]] -name = "polkadot-overseer-gen" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" -dependencies = [ - "async-trait", - "futures 0.3.21", - "futures-timer", - "metered-channel", - "pin-project 1.0.10", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-overseer-gen-proc-macro", - "thiserror", - "tracing-gum", -] - -[[package]] -name = "polkadot-overseer-gen-proc-macro" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" -dependencies = [ - "expander 0.0.6", - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "polkadot-parachain" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "derive_more", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "polkadot-performance-test" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "env_logger", "kusama-runtime", @@ -8335,8 +8164,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bitvec", "frame-system", @@ -8348,29 +8177,29 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-arithmetic", "sp-authority-discovery", "sp-consensus-slots", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-trie", "sp-version", ] [[package]] name = "polkadot-rpc" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", - "jsonrpc-core", + "jsonrpsee", "pallet-mmr-rpc", "pallet-transaction-payment-rpc", "polkadot-primitives", @@ -8389,22 +8218,22 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-keystore", + "sp-runtime", "substrate-frame-rpc-system", "substrate-state-trie-migration-rpc", ] [[package]] name = "polkadot-runtime" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "beefy-primitives", "bitvec", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -8456,16 +8285,16 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-io", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-staking", + "sp-std", "sp-transaction-pool", "sp-version", "static_assertions", @@ -8477,13 +8306,13 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "beefy-primitives", "bitvec", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "impl-trait-for-tuples", "libsecp256k1", @@ -8508,51 +8337,51 @@ dependencies = [ "serde_derive", "slot-range-helper", "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-io", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-staking", + "sp-std", "static_assertions", "xcm", ] [[package]] name = "polkadot-runtime-constants" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.8.0", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", ] [[package]] name = "polkadot-runtime-metrics" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bs58", "parity-scale-codec", "polkadot-primitives", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-std", + "sp-tracing", ] [[package]] name = "polkadot-runtime-parachains" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "bitflags", "bitvec", "derive_more", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "pallet-authority-discovery", @@ -8572,22 +8401,22 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-staking", + "sp-std", "xcm", "xcm-executor", ] [[package]] name = "polkadot-service" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "async-trait", "beefy-gadget", @@ -8597,7 +8426,7 @@ dependencies = [ "hex-literal 0.3.4", "kvdb", "kvdb-rocksdb", - "lru 0.7.5", + "lru 0.7.7", "pallet-babe", "pallet-im-online", "pallet-staking", @@ -8628,6 +8457,7 @@ dependencies = [ "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-parachain", @@ -8654,28 +8484,30 @@ dependencies = [ "sc-offchain", "sc-service", "sc-sync-state-rpc", + "sc-sysinfo", "sc-telemetry", "sc-transaction-pool", "serde", + "serde_json", "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-finality-grandpa", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-inherents", + "sp-io", + "sp-keystore", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "sp-session", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-state-machine", + "sp-storage", "sp-timestamp", "sp-transaction-pool", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-trie", "substrate-prometheus-endpoint", "thiserror", "tracing-gum", @@ -8683,8 +8515,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -8696,20 +8528,20 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-keystore", + "sp-staking", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-statement-table" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "parity-scale-codec", "polkadot-primitives", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", ] [[package]] @@ -8731,7 +8563,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ - "cpufeatures 0.2.2", + "cpufeatures", "opaque-debug 0.3.0", "universal-hash", ] @@ -8743,7 +8575,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cpufeatures", "opaque-debug 0.3.0", "universal-hash", ] @@ -8754,20 +8586,6 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -[[package]] -name = "prettytable-rs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" -dependencies = [ - "atty", - "csv", - "encode_unicode", - "lazy_static", - "term", - "unicode-width", -] - [[package]] name = "primitive-types" version = "0.11.1" @@ -8781,6 +8599,21 @@ dependencies = [ "uint", ] +[[package]] +name = "prioritized-metered-channel" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" +dependencies = [ + "coarsetime", + "crossbeam-queue", + "derive_more", + "futures 0.3.21", + "futures-timer", + "nanorand", + "thiserror", + "tracing", +] + [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -8849,18 +8682,41 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "thiserror", ] +[[package]] +name = "prometheus-client" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825" +dependencies = [ + "dtoa", + "itoa 1.0.2", + "owning_ref", + "prometheus-client-derive-text-encode", +] + +[[package]] +name = "prometheus-client-derive-text-encode" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "proofs" version = "2.0.0" dependencies = [ "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-std", ] [[package]] @@ -8870,7 +8726,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes 1.1.0", - "prost-derive", + "prost-derive 0.9.0", +] + +[[package]] +name = "prost" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +dependencies = [ + "bytes 1.1.0", + "prost-derive 0.10.1", ] [[package]] @@ -8886,13 +8752,48 @@ dependencies = [ "log 0.4.17", "multimap", "petgraph", - "prost", - "prost-types", + "prost 0.9.0", + "prost-types 0.9.0", + "regex", + "tempfile", + "which", +] + +[[package]] +name = "prost-build" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" +dependencies = [ + "bytes 1.1.0", + "cfg-if 1.0.0", + "cmake", + "heck 0.4.0", + "itertools", + "lazy_static", + "log 0.4.17", + "multimap", + "petgraph", + "prost 0.10.4", + "prost-types 0.10.1", "regex", "tempfile", "which", ] +[[package]] +name = "prost-codec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007" +dependencies = [ + "asynchronous-codec", + "bytes 1.1.0", + "prost 0.10.4", + "thiserror", + "unsigned-varint", +] + [[package]] name = "prost-derive" version = "0.9.0" @@ -8906,6 +8807,19 @@ dependencies = [ "syn", ] +[[package]] +name = "prost-derive" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost-types" version = "0.9.0" @@ -8913,7 +8827,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes 1.1.0", - "prost", + "prost 0.9.0", +] + +[[package]] +name = "prost-types" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" +dependencies = [ + "bytes 1.1.0", + "prost 0.10.4", ] [[package]] @@ -9061,7 +8985,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.7", ] [[package]] @@ -9217,24 +9141,13 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - [[package]] name = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.7", "redox_syscall 0.2.13", "thiserror", ] @@ -9324,7 +9237,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "env_logger", "jsonrpsee", @@ -9332,9 +9245,9 @@ dependencies = [ "parity-scale-codec", "serde", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", "sp-version", ] @@ -9407,8 +9320,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -9418,7 +9331,7 @@ dependencies = [ "bp-wococo", "bridge-runtime-common", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "frame-system-rpc-runtime-api", "log 0.4.17", @@ -9462,15 +9375,15 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-io", "sp-mmr-primitives", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-staking", + "sp-std", "sp-transaction-pool", "sp-version", "substrate-wasm-builder", @@ -9481,14 +9394,14 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.8.0", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", ] [[package]] @@ -9501,13 +9414,28 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "rtnetlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f54290e54521dac3de4149d83ddf9f62a359b3cc93bcb494a794a41e6f4744b" +dependencies = [ + "async-global-executor", + "futures 0.3.21", + "log 0.4.17", + "netlink-packet-route", + "netlink-proto", + "nix", + "thiserror", +] + [[package]] name = "runtime-common" version = "1.0.0" dependencies = [ "common-traits", "common-types", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "node-primitives", "orml-traits", @@ -9521,11 +9449,11 @@ dependencies = [ "serde", "smallvec 1.8.0", "sp-api", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", "sp-consensus-aura", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -9539,9 +9467,8 @@ dependencies = [ "cumulus-primitives-core", "development-runtime", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", - "fudge", "kusama-runtime", "lazy_static", "node-primitives", @@ -9574,11 +9501,11 @@ dependencies = [ "sc-service", "sp-authorship", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-tracing", "tokio", "tracing", "tracing-subscriber", @@ -9588,18 +9515,6 @@ dependencies = [ "xcm-executor", ] -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.8.8", -] - [[package]] name = "rustc-demangle" version = "0.1.21" @@ -9627,22 +9542,13 @@ dependencies = [ "semver 0.9.0", ] -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.9", + "semver 1.0.10", ] [[package]] @@ -9659,19 +9565,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.0", - "log 0.4.17", - "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - [[package]] name = "rustls" version = "0.20.6" @@ -9680,20 +9573,8 @@ checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log 0.4.17", "ring", - "sct 0.7.0", - "webpki 0.22.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -dependencies = [ - "openssl-probe", - "rustls 0.19.1", - "schannel", - "security-framework", + "sct", + "webpki", ] [[package]] @@ -9734,6 +9615,17 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "rw-stream-sink" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" +dependencies = [ + "futures 0.3.21", + "pin-project 1.0.10", + "static_assertions", +] + [[package]] name = "ryu" version = "1.0.10" @@ -9776,18 +9668,18 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "log 0.4.17", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-wasm-interface", "thiserror", ] [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "futures 0.3.21", @@ -9796,17 +9688,17 @@ dependencies = [ "libp2p", "log 0.4.17", "parity-scale-codec", - "prost", - "prost-build", + "prost 0.10.4", + "prost-build 0.9.0", "rand 0.7.3", "sc-client-api", "sc-network", "sp-api", "sp-authority-discovery", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -9814,7 +9706,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9828,49 +9720,49 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-runtime", "substrate-prometheus-endpoint", ] [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "parity-scale-codec", "sc-client-api", "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", ] [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "impl-trait-for-tuples", - "memmap2 0.5.3", + "memmap2 0.5.4", "parity-scale-codec", "sc-chain-spec-derive", "sc-network", "sc-telemetry", "serde", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", ] [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -9881,7 +9773,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "chrono", "clap", @@ -9896,6 +9788,7 @@ dependencies = [ "regex", "rpassword", "sc-client-api", + "sc-client-db", "sc-keystore", "sc-network", "sc-service", @@ -9905,11 +9798,11 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-keyring", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-keystore", + "sp-panic-handler", + "sp-runtime", "sp-version", "thiserror", "tiny-bip39", @@ -9919,35 +9812,35 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "fnv", "futures 0.3.21", "hash-db", "log 0.4.17", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-executor", "sc-transaction-pool-api", "sc-utils", "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-database", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-externalities", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "sp-trie", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "hash-db", "kvdb", @@ -9957,38 +9850,38 @@ dependencies = [ "log 0.4.17", "parity-db", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-client-api", "sc-state-db", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-database", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-state-machine", + "sp-trie", ] [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "libp2p", "log 0.4.17", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-client-api", "sc-utils", "serde", "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-state-machine", "substrate-prometheus-endpoint", "thiserror", ] @@ -9996,7 +9889,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "futures 0.3.21", @@ -10008,16 +9901,16 @@ dependencies = [ "sc-consensus-slots", "sc-telemetry", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", "sp-consensus-slots", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -10025,7 +9918,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "fork-tree", @@ -10036,7 +9929,7 @@ dependencies = [ "num-rational 0.2.4", "num-traits", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "rand 0.7.3", "retain_mut", "sc-client-api", @@ -10048,18 +9941,18 @@ dependencies = [ "schnorrkel 0.9.1", "serde", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", "sp-version", "substrate-prometheus-endpoint", "thiserror", @@ -10068,44 +9961,42 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" -dependencies = [ - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" +dependencies = [ + "futures 0.3.21", + "jsonrpsee", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", "serde", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-keystore", + "sp-runtime", "thiserror", ] [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "fork-tree", "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", ] [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "futures 0.3.21", @@ -10115,14 +10006,14 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", "sp-timestamp", "thiserror", ] @@ -10130,37 +10021,37 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "sc-client-api", "sp-authorship", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "thiserror", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "lazy_static", - "lru 0.7.5", + "lru 0.7.7", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-core-hashing-proc-macro", + "sp-externalities", + "sp-io", + "sp-panic-handler", + "sp-runtime-interface", "sp-tasks", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-trie", "sp-version", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-wasm-interface", "tracing", "wasmi", ] @@ -10168,15 +10059,15 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "environmental", "parity-scale-codec", "sc-allocator", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", "sp-maybe-compressed-blob", + "sp-sandbox", "sp-serializer", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-wasm-interface", "thiserror", "wasm-instrument", "wasmi", @@ -10185,23 +10076,22 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "log 0.4.17", "parity-scale-codec", "sc-allocator", "sc-executor-common", - "scoped-tls", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime-interface", + "sp-sandbox", + "sp-wasm-interface", "wasmi", ] [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "cfg-if 1.0.0", "libc", @@ -10210,16 +10100,16 @@ dependencies = [ "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime-interface", + "sp-sandbox", + "sp-wasm-interface", "wasmtime", ] [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "ahash", "async-trait", @@ -10231,7 +10121,7 @@ dependencies = [ "hex", "log 0.4.17", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "rand 0.8.5", "sc-block-builder", "sc-chain-spec", @@ -10244,14 +10134,14 @@ dependencies = [ "sc-utils", "serde_json", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-finality-grandpa", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -10259,14 +10149,11 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "finality-grandpa", "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-pubsub", + "jsonrpsee", "log 0.4.17", "parity-scale-codec", "sc-client-api", @@ -10275,15 +10162,15 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", "thiserror", ] [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "ansi_term", "futures 0.3.21", @@ -10294,31 +10181,31 @@ dependencies = [ "sc-network", "sc-transaction-pool-api", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", ] [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "hex", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "serde_json", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-core", + "sp-keystore", "thiserror", ] [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", - "asynchronous-codec 0.5.0", + "asynchronous-codec", "bitflags", "bytes 1.1.0", "cid", @@ -10333,75 +10220,140 @@ dependencies = [ "linked-hash-map", "linked_hash_set", "log 0.4.17", - "lru 0.7.5", + "lru 0.7.7", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "pin-project 1.0.10", - "prost", - "prost-build", + "prost 0.10.4", + "prost-build 0.9.0", "rand 0.7.3", "sc-block-builder", "sc-client-api", "sc-consensus", + "sc-network-common", + "sc-network-light", + "sc-network-sync", "sc-peerset", "sc-utils", "serde", "serde_json", "smallvec 1.8.0", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-finality-grandpa", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", - "unsigned-varint 0.6.0", + "unsigned-varint", "void", "zeroize", ] +[[package]] +name = "sc-network-common" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" +dependencies = [ + "futures 0.3.21", + "libp2p", + "parity-scale-codec", + "prost-build 0.9.0", + "sc-peerset", + "smallvec 1.8.0", +] + [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "ahash", "futures 0.3.21", "futures-timer", "libp2p", "log 0.4.17", - "lru 0.7.5", + "lru 0.7.7", "sc-network", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] +[[package]] +name = "sc-network-light" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" +dependencies = [ + "futures 0.3.21", + "libp2p", + "log 0.4.17", + "parity-scale-codec", + "prost 0.10.4", + "prost-build 0.9.0", + "sc-client-api", + "sc-network-common", + "sc-peerset", + "sp-blockchain", + "sp-core", + "sp-runtime", + "thiserror", +] + +[[package]] +name = "sc-network-sync" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" +dependencies = [ + "bitflags", + "either", + "fork-tree", + "futures 0.3.21", + "libp2p", + "log 0.4.17", + "lru 0.7.7", + "parity-scale-codec", + "prost 0.10.4", + "prost-build 0.9.0", + "sc-client-api", + "sc-consensus", + "sc-network-common", + "sc-peerset", + "smallvec 1.8.0", + "sp-arithmetic", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-finality-grandpa", + "sp-runtime", + "thiserror", +] + [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "bytes 1.1.0", "fnv", "futures 0.3.21", "futures-timer", "hex", - "hyper 0.14.18", + "hyper 0.14.19", "hyper-rustls", "num_cpus", "once_cell", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "rand 0.7.3", "sc-client-api", "sc-network", "sc-utils", "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "threadpool", "tracing", ] @@ -10409,7 +10361,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures 0.3.21", "libp2p", @@ -10422,7 +10374,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "log 0.4.17", "substrate-prometheus-endpoint", @@ -10431,15 +10383,14 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures 0.3.21", "hash-db", - "jsonrpc-core", - "jsonrpc-pubsub", + "jsonrpsee", "log 0.4.17", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -10450,11 +10401,11 @@ dependencies = [ "serde_json", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-keystore", "sp-offchain", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "sp-session", "sp-version", ] @@ -10462,25 +10413,22 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-pubsub", + "jsonrpsee", "log 0.4.17", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-chain-spec", "sc-transaction-pool-api", "scale-info", "serde", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-tracing", "sp-version", "thiserror", ] @@ -10488,14 +10436,10 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-http-server", - "jsonrpc-ipc-server", - "jsonrpc-pubsub", - "jsonrpc-ws-server", + "jsonrpsee", "log 0.4.17", "serde_json", "substrate-prometheus-endpoint", @@ -10505,7 +10449,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "directories", @@ -10513,12 +10457,11 @@ dependencies = [ "futures 0.3.21", "futures-timer", "hash-db", - "jsonrpc-core", - "jsonrpc-pubsub", + "jsonrpsee", "log 0.4.17", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "pin-project 1.0.10", "rand 0.7.3", "sc-block-builder", @@ -10530,6 +10473,7 @@ dependencies = [ "sc-informant", "sc-keystore", "sc-network", + "sc-network-common", "sc-offchain", "sc-rpc", "sc-rpc-server", @@ -10542,22 +10486,22 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-externalities", + "sp-inherents", + "sp-keystore", + "sp-runtime", "sp-session", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-state-machine", + "sp-storage", + "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-trie", "sp-version", "substrate-prometheus-endpoint", "tempfile", @@ -10570,7 +10514,7 @@ dependencies = [ [[package]] name = "sc-service-test" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "fdlimit", "futures 0.3.21", @@ -10578,7 +10522,7 @@ dependencies = [ "hex-literal 0.3.4", "log 0.4.17", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-block-builder", "sc-client-api", "sc-client-db", @@ -10590,14 +10534,14 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-externalities", + "sp-panic-handler", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "sp-tracing", + "sp-trie", "substrate-test-runtime", "substrate-test-runtime-client", "tempfile", @@ -10607,25 +10551,23 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "log 0.4.17", "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sc-client-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", ] [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee", "parity-scale-codec", "sc-chain-spec", "sc-client-api", @@ -10635,14 +10577,14 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "thiserror", ] [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures 0.3.21", "libc", @@ -10653,21 +10595,21 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-std", ] [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "chrono", "futures 0.3.21", "libp2p", "log 0.4.17", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "pin-project 1.0.10", "rand 0.7.3", "serde", @@ -10679,7 +10621,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "ansi_term", "atty", @@ -10688,7 +10630,7 @@ dependencies = [ "libc", "log 0.4.17", "once_cell", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "regex", "rustc-hash", "sc-client-api", @@ -10697,10 +10639,10 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-tracing", "thiserror", "tracing", "tracing-log", @@ -10710,7 +10652,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -10721,7 +10663,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures 0.3.21", "futures-timer", @@ -10729,7 +10671,7 @@ dependencies = [ "log 0.4.17", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "retain_mut", "sc-client-api", "sc-transaction-pool-api", @@ -10737,9 +10679,9 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-tracing", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -10748,26 +10690,26 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures 0.3.21", "log 0.4.17", "serde", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", "thiserror", ] [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures 0.3.21", "futures-timer", "lazy_static", "log 0.4.17", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "prometheus", ] @@ -10841,28 +10783,12 @@ dependencies = [ "zeroize", ] -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - [[package]] name = "scopeguard" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sct" version = "0.7.0" @@ -10881,7 +10807,6 @@ checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" dependencies = [ "der", "generic-array 0.14.5", - "pkcs8", "subtle", "zeroize", ] @@ -10942,7 +10867,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537" dependencies = [ - "semver-parser 0.7.0", + "semver-parser", ] [[package]] @@ -10951,23 +10876,14 @@ 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] name = "semver" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" +checksum = "a41d061efea015927ac527063765e73601444cdc344ba855bc7bd44578b25e1c" dependencies = [ "serde", ] @@ -10978,15 +10894,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" version = "1.0.137" @@ -11047,7 +10954,7 @@ checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -11087,7 +10994,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -11099,7 +11006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cpufeatures", "digest 0.10.3", ] @@ -11189,14 +11096,14 @@ checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "slot-range-helper" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "enumn", "parity-scale-codec", "paste", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-std", ] [[package]] @@ -11231,31 +11138,19 @@ checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" [[package]] name = "snow" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7" +checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ "aes-gcm", - "blake2 0.9.2", + "blake2", "chacha20poly1305", - "rand 0.8.5", + "curve25519-dalek 4.0.0-pre.1", "rand_core 0.6.3", "ring", - "rustc_version 0.3.3", - "sha2 0.9.9", + "rustc_version 0.4.0", + "sha2 0.10.2", "subtle", - "x25519-dalek", -] - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", ] [[package]] @@ -11287,16 +11182,16 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "hash-db", "log 0.4.17", "parity-scale-codec", "sp-api-proc-macro", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", "sp-version", "thiserror", ] @@ -11304,9 +11199,9 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "blake2 0.10.4", + "blake2", "proc-macro-crate 1.1.3", "proc-macro2", "quote", @@ -11316,129 +11211,101 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", -] - -[[package]] -name = "sp-application-crypto" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", -] - -[[package]] -name = "sp-arithmetic" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "integer-sqrt", - "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "static_assertions", + "sp-core", + "sp-io", + "sp-std", ] [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-debug-derive", + "sp-std", "static_assertions", ] [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", + "sp-runtime", + "sp-std", ] [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "parity-scale-codec", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "parity-scale-codec", "sp-api", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures 0.3.21", "log 0.4.17", - "lru 0.7.5", + "lru 0.7.7", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "sp-api", "sp-consensus", "sp-database", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-state-machine", "thiserror", ] [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "futures 0.3.21", "futures-timer", "log 0.4.17", "parity-scale-codec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-std", "sp-version", "thiserror", ] @@ -11446,25 +11313,25 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-inherents", + "sp-runtime", + "sp-std", "sp-timestamp", ] [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "merlin 2.0.1", @@ -11472,94 +11339,49 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", + "sp-std", "sp-timestamp", ] [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", + "sp-runtime", + "sp-std", "sp-timestamp", ] [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" -dependencies = [ - "parity-scale-codec", - "schnorrkel 0.9.1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", -] - -[[package]] -name = "sp-core" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "base58", - "bitflags", - "blake2-rfc", - "byteorder", - "dyn-clonable", - "ed25519-dalek", - "futures 0.3.21", - "hash-db", - "hash256-std-hasher", - "hex", - "impl-serde", - "lazy_static", - "libsecp256k1", - "log 0.4.17", - "merlin 2.0.1", - "num-traits", "parity-scale-codec", - "parity-util-mem", - "parking_lot 0.12.0", - "primitive-types", - "rand 0.7.3", - "regex", "scale-info", "schnorrkel 0.9.1", - "secp256k1", - "secrecy", - "serde", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "ss58-registry", - "substrate-bip39", - "thiserror", - "tiny-bip39", - "wasmi", - "zeroize", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "base58", "bitflags", @@ -11579,7 +11401,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "primitive-types", "rand 0.7.3", "regex", @@ -11588,12 +11410,12 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core-hashing", + "sp-debug-derive", + "sp-externalities", + "sp-runtime-interface", + "sp-std", + "sp-storage", "ss58-registry", "substrate-bip39", "thiserror", @@ -11605,76 +11427,41 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "blake2 0.10.4", - "byteorder", - "digest 0.10.3", - "sha2 0.10.2", - "sha3 0.10.1", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "twox-hash", -] - -[[package]] -name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "blake2 0.10.4", + "blake2", "byteorder", "digest 0.10.3", "sha2 0.10.2", "sha3 0.10.1", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-std", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "proc-macro2", - "quote", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "syn", -] - -[[package]] -name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "proc-macro2", "quote", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core-hashing", "syn", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "kvdb", - "parking_lot 0.12.0", -] - -[[package]] -name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "parking_lot 0.12.1", ] [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "proc-macro2", "quote", @@ -11684,29 +11471,18 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", -] - -[[package]] -name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-std", + "sp-storage", ] [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "finality-grandpa", "log 0.4.17", @@ -11714,87 +11490,48 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", -] - -[[package]] -name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "thiserror", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "sp-runtime", + "sp-std", ] [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", + "sp-std", "thiserror", ] [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "futures 0.3.21", - "hash-db", - "libsecp256k1", - "log 0.4.17", - "parity-scale-codec", - "parking_lot 0.12.0", - "secp256k1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "tracing", - "tracing-core", -] - -[[package]] -name = "sp-io" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures 0.3.21", "hash-db", "libsecp256k1", "log 0.4.17", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "secp256k1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-externalities", + "sp-keystore", + "sp-runtime-interface", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-trie", + "sp-wasm-interface", "tracing", "tracing-core", ] @@ -11802,51 +11539,35 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "lazy_static", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", "strum 0.23.0", ] [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "async-trait", - "futures 0.3.21", - "merlin 2.0.1", - "parity-scale-codec", - "parking_lot 0.12.0", - "schnorrkel 0.9.1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "thiserror", -] - -[[package]] -name = "sp-keystore" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "futures 0.3.21", "merlin 2.0.1", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "schnorrkel 0.9.1", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-externalities", "thiserror", ] [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "thiserror", "zstd", @@ -11855,56 +11576,46 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "log 0.4.17", "parity-scale-codec", "serde", "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-debug-derive", + "sp-runtime", + "sp-std", ] [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" -dependencies = [ - "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", -] - -[[package]] -name = "sp-panic-handler" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "backtrace", - "lazy_static", - "regex", + "sp-api", + "sp-core", + "sp-runtime", ] [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "backtrace", "lazy_static", @@ -11914,39 +11625,17 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "rustc-hash", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", -] - -[[package]] -name = "sp-runtime" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log 0.4.17", - "parity-scale-codec", - "parity-util-mem", - "paste", - "rand 0.7.3", - "scale-info", - "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", + "sp-core", ] [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "either", "hash256-std-hasher", @@ -11958,51 +11647,34 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", -] - -[[package]] -name = "sp-runtime-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "static_assertions", + "sp-application-crypto", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-std", ] [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-externalities", + "sp-runtime-interface-proc-macro", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "Inflector", "proc-macro-crate 1.1.3", @@ -12012,21 +11684,23 @@ dependencies = [ ] [[package]] -name = "sp-runtime-interface-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +name = "sp-sandbox" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "Inflector", - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", + "log 0.4.17", + "parity-scale-codec", + "sp-core", + "sp-io", + "sp-std", + "sp-wasm-interface", + "wasmi", ] [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "serde", "serde_json", @@ -12035,78 +11709,45 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", -] - -[[package]] -name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", + "sp-core", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "parity-scale-codec", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", -] - -[[package]] -name = "sp-state-machine" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "hash-db", - "log 0.4.17", - "num-traits", - "parity-scale-codec", - "parking_lot 0.12.0", - "rand 0.7.3", - "smallvec 1.8.0", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "thiserror", - "tracing", - "trie-root", + "sp-runtime", + "sp-std", ] [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "hash-db", "log 0.4.17", "num-traits", "parity-scale-codec", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "rand 0.7.3", "smallvec 1.8.0", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-externalities", + "sp-panic-handler", + "sp-std", + "sp-trie", "thiserror", "tracing", "trie-root", @@ -12115,87 +11756,57 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" - -[[package]] -name = "sp-std" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" - -[[package]] -name = "sp-storage" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", -] +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-debug-derive", + "sp-std", ] [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "log 0.4.17", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-externalities", + "sp-io", + "sp-runtime-interface", + "sp-std", ] [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "futures-timer", "log 0.4.17", "parity-scale-codec", "sp-api", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-inherents", + "sp-runtime", + "sp-std", "thiserror", ] [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "sp-tracing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-std", "tracing", "tracing-core", "tracing-subscriber", @@ -12204,55 +11815,39 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "sp-api", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", ] [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", -] - -[[package]] -name = "sp-trie" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "hash-db", - "memory-db", - "parity-scale-codec", - "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "thiserror", - "trie-db", - "trie-root", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-std", + "sp-trie", ] [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "hash-db", "memory-db", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-std", "thiserror", "trie-db", "trie-root", @@ -12261,16 +11856,16 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm 0.42.2", "scale-info", "serde", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core-hashing-proc-macro", + "sp-runtime", + "sp-std", "sp-version-proc-macro", "thiserror", ] @@ -12278,7 +11873,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -12289,24 +11884,12 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#7ca5e877e184be30d583b4bf8c6856ab074ed1dd" -dependencies = [ - "impl-trait-for-tuples", - "log 0.4.17", - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=master)", - "wasmi", -] - -[[package]] -name = "sp-wasm-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "impl-trait-for-tuples", "log 0.4.17", "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-std", "wasmi", "wasmtime", ] @@ -12317,21 +11900,11 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "spki" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" -dependencies = [ - "base64ct", - "der", -] - [[package]] name = "ss58-registry" -version = "1.18.0" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb8b72a924ccfe7882d0e26144c114503760a4d1248bb5cd06c8ab2d55404cc" +checksum = "5d804c8d48aeab838be31570866fce1130d275b563d49af08b4927a0bd561e7c" dependencies = [ "Inflector", "num-format", @@ -12409,11 +11982,11 @@ dependencies = [ [[package]] name = "strum" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros 0.24.0", + "strum_macros 0.24.1", ] [[package]] @@ -12431,9 +12004,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" +checksum = "9550962e7cf70d9980392878dfaf1dcc3ece024f4cf3bf3c46b978d0bad61d6c" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -12458,7 +12031,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "platforms", ] @@ -12466,32 +12039,31 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee", "log 0.4.17", "parity-scale-codec", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", + "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", ] [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures-util", - "hyper 0.14.18", + "hyper 0.14.19", "log 0.4.17", "prometheus", "thiserror", @@ -12501,30 +12073,28 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee", "log 0.4.17", "parity-scale-codec", "sc-client-api", "sc-rpc-api", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", "trie-db", ] [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "async-trait", "futures 0.3.21", @@ -12540,21 +12110,21 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", "sp-keyring", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-keystore", + "sp-runtime", + "sp-state-machine", ] [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "beefy-primitives", "cfg-if 1.0.0", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "frame-system-rpc-runtime-api", "log 0.4.17", @@ -12567,24 +12137,24 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-application-crypto", "sp-block-builder", "sp-consensus-aura", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-externalities", "sp-finality-grandpa", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-inherents", + "sp-io", "sp-keyring", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-runtime", + "sp-runtime-interface", "sp-session", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-state-machine", + "sp-std", "sp-transaction-pool", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-trie", "sp-version", "substrate-wasm-builder", "trie-db", @@ -12593,7 +12163,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "futures 0.3.21", "parity-scale-codec", @@ -12603,8 +12173,8 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-runtime", "substrate-test-client", "substrate-test-runtime", ] @@ -12612,7 +12182,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "ansi_term", "build-helper", @@ -12645,9 +12215,9 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "syn" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" dependencies = [ "proc-macro2", "quote", @@ -12666,6 +12236,27 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "system-configuration" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +dependencies = [ + "bitflags", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -12692,17 +12283,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "term" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -dependencies = [ - "byteorder", - "dirs", - "winapi 0.3.9", -] - [[package]] name = "termcolor" version = "1.1.3" @@ -12833,9 +12413,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.18.2" +version = "1.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395" +checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" dependencies = [ "bytes 1.1.0", "libc", @@ -12843,10 +12423,10 @@ dependencies = [ "mio 0.8.3", "num_cpus", "once_cell", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "pin-project-lite 0.2.9", "signal-hook-registry", - "socket2 0.4.4", + "socket2", "tokio-macros", "winapi 0.3.9", ] @@ -12885,9 +12465,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", @@ -12913,37 +12493,15 @@ dependencies = [ "tokio-sync", ] -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki 0.21.4", -] - [[package]] name = "tokio-rustls" version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.6", - "tokio", - "webpki 0.22.0", -] - -[[package]] -name = "tokio-stream" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" -dependencies = [ - "futures-core", - "pin-project-lite 0.2.9", + "rustls", "tokio", + "webpki", ] [[package]] @@ -12983,23 +12541,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes 1.1.0", - "futures-core", - "futures-sink", - "log 0.4.17", - "pin-project-lite 0.2.9", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" dependencies = [ "bytes 1.1.0", "futures-core", @@ -13070,8 +12614,8 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -13081,8 +12625,8 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "expander 0.0.6", "proc-macro-crate 1.1.3", @@ -13097,8 +12641,10 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ + "ahash", "lazy_static", "log 0.4.17", + "lru 0.7.7", "tracing-core", ] @@ -13165,9 +12711,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.20.4" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca94d4e9feb6a181c690c4040d7a24ef34018d8313ac5044a61d21222ae24e31" +checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -13189,9 +12735,9 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.20.4" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecae383baad9995efaa34ce8e57d12c3f305e545887472a492b838f4b5cfb77a" +checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" dependencies = [ "cfg-if 1.0.0", "futures-util", @@ -13199,7 +12745,7 @@ dependencies = [ "lazy_static", "log 0.4.17", "lru-cache", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "resolv-conf", "smallvec 1.8.0", "thiserror", @@ -13215,7 +12761,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20#563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#257cdb558c0decbd1da756b43288d06d02ff77c7" dependencies = [ "clap", "jsonrpsee", @@ -13227,12 +12773,12 @@ dependencies = [ "sc-executor", "sc-service", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-core", + "sp-externalities", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-state-machine", "sp-version", "zstd", ] @@ -13311,9 +12857,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" [[package]] name = "unicode-normalization" @@ -13345,9 +12891,9 @@ checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" [[package]] name = "unique-assets" version = "1.0.0" -source = "git+https://github.com/centrifuge/unique-assets?branch=polkadot-v0.9.20#2c327d3a92e4cfa6440a414b22e18f337759e314" +source = "git+https://github.com/centrifuge/unique-assets?branch=polkadot-v0.9.24#716eae54a850aac17c7ddb6541c73d7c16da21a8" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", + "frame-support", ] [[package]] @@ -13360,31 +12906,13 @@ dependencies = [ "subtle", ] -[[package]] -name = "unsigned-varint" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" - -[[package]] -name = "unsigned-varint" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2" -dependencies = [ - "asynchronous-codec 0.5.0", - "bytes 1.1.0", - "futures-io", - "futures-util", -] - [[package]] name = "unsigned-varint" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "bytes 1.1.0", "futures-io", "futures-util", @@ -13517,9 +13045,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -13527,9 +13055,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a" dependencies = [ "bumpalo", "lazy_static", @@ -13542,9 +13070,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" +checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -13554,9 +13082,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.80" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -13564,9 +13092,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" dependencies = [ "proc-macro2", "quote", @@ -13577,9 +13105,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" [[package]] name = "wasm-gc-api" @@ -13624,6 +13152,7 @@ checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" dependencies = [ "downcast-rs", "libc", + "libm", "memory_units", "num-rational 0.2.4", "num-traits", @@ -13790,6 +13319,7 @@ dependencies = [ "libc", "log 0.4.17", "mach", + "memfd", "memoffset", "more-asserts", "rand 0.8.5", @@ -13815,24 +13345,14 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.57" +version = "0.3.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" +checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90" dependencies = [ "js-sys", "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki" version = "0.22.0" @@ -13843,22 +13363,13 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" -dependencies = [ - "webpki 0.21.4", -] - [[package]] name = "webpki-roots" version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" dependencies = [ - "webpki 0.22.0", + "webpki", ] [[package]] @@ -13924,9 +13435,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.4.3" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" [[package]] name = "winapi" @@ -13971,43 +13482,86 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac7fef12f4b59cd0a29339406cc9203ab44e440ddff6b3f5a41455349fa9cf3" +dependencies = [ + "windows_aarch64_msvc 0.29.0", + "windows_i686_gnu 0.29.0", + "windows_i686_msvc 0.29.0", + "windows_x86_64_gnu 0.29.0", + "windows_x86_64_msvc 0.29.0", +] + [[package]] name = "windows-sys" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", ] +[[package]] +name = "windows_aarch64_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_i686_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58" + [[package]] name = "windows_i686_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4" + [[package]] name = "windows_i686_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_x86_64_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" @@ -14016,9 +13570,9 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "winreg" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ "winapi 0.3.9", ] @@ -14055,8 +13609,8 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -14068,20 +13622,20 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "log 0.4.17", "pallet-transaction-payment", "parity-scale-codec", "polkadot-parachain", "scale-info", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", "xcm", "xcm-executor", ] @@ -14089,7 +13643,7 @@ dependencies = [ [[package]] name = "xcm-emulator" version = "0.1.0" -source = "git+https://github.com/shaunxw/xcm-simulator?rev=65cdc715c4927b75285a09897e8cdafd793d02b7#65cdc715c4927b75285a09897e8cdafd793d02b7" +source = "git+https://github.com/NunoAlexandre/xcm-simulator?branch=polkadot-v0.9.24#d21c372306f1cbf6a3b521d8b41e172587ae45e0" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -14097,40 +13651,40 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-test-relay-sproof-builder", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "frame-system", "parachain-info", "parity-scale-codec", "paste", "polkadot-primitives", "polkadot-runtime-parachains", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-io", + "sp-std", "xcm", "xcm-executor", ] [[package]] name = "xcm-executor" -version = "0.9.20" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +version = "0.9.24" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "frame-support", "impl-trait-for-tuples", "log 0.4.17", "parity-scale-codec", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.20)", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "xcm", ] [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.20#568169b41aea59a54ab8cfa23c31e84a26708280" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#22836e55d41eef24ed5917fd654ee82a683a7cfe" dependencies = [ "Inflector", "proc-macro2", @@ -14140,23 +13694,23 @@ dependencies = [ [[package]] name = "yamux" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107" +checksum = "0c0608f53c1dc0bad505d03a34bbd49fbf2ad7b51eb036123e896365532745a1" dependencies = [ "futures 0.3.21", "log 0.4.17", "nohash-hasher", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "rand 0.8.5", "static_assertions", ] [[package]] name = "zeroize" -version = "1.5.5" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" +checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619" dependencies = [ "zeroize_derive", ] diff --git a/Cargo.toml b/Cargo.toml index 23a7f4c321..935ca60618 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,9 +53,10 @@ members = [ [dependencies] # third-party dependencies +jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } serde = { version = "1.0.106", features = ["derive"] } -futures = { version = "0.3.1", features = ["compat"] } +futures = { version = "0.3.21", features = ["compat"] } hex-literal = "0.2.1" jsonrpc-core = "18.0.0" jsonrpc-core-client = { version = "18.0.0", features = ["http", "ws"] } @@ -65,111 +66,107 @@ log = "0.4.8" serde_json = "1.0" clap = { version = "3.1", features = [ "derive" ] } url = "2.2.2" +tracing-core = "=0.1.26" # primitives -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -grandpa-primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-keystore = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +grandpa-primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-keystore = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } # client dependencies -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-client-db = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-service = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-client-db = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-service = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } # Cli specific -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", optional = true } -node-inspect = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } - -# local dependencies -pallet-anchors = { path = "./pallets/anchors" } -pallet-loans = { path = "./pallets/loans" } -pallet-pools = { path = "./pallets/pools" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.24" } +node-inspect = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } # frame dependencies -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-im-online = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +pallet-anchors = { path = "./pallets/anchors", default-features = false } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +pallet-im-online = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } # Cumulus dependencies -cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-client-consensus-relay-chain = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-client-consensus-aura = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-client-consensus-common = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-primitives-parachain-inherent = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-client-cli = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } +cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-client-consensus-relay-chain = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-client-consensus-aura = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-client-consensus-common = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-primitives-parachain-inherent = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-client-cli = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } # Polkadot dependencies -polkadot-parachain = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -polkadot-primitives = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -polkadot-service = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -polkadot-cli = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } +polkadot-parachain = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-primitives = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-service = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-cli = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } # node-specific dependencies altair-runtime = { path = "runtime/altair" } centrifuge-runtime = { path = "runtime/centrifuge" } development-runtime = { path = "runtime/development" } runtime-common = { path = "runtime/common" } -node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } # benchmarking -frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.20" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.24" } # integration testing runtime-integration-tests = { path = "runtime/integration-tests", optional = true } [build-dependencies] vergen = "3.0.4" -substrate-build-script-utils = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +substrate-build-script-utils = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } [dev-dependencies] -sc-service-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sc-service-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } tempfile = "3.1.0" -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } [features] default = [ "std", "cli" ] diff --git a/ci/script.sh b/ci/script.sh index 664a2a370b..2542e0e29c 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -2,7 +2,7 @@ set -eux -RUST_TOOLCHAIN="${RUST_TOOLCHAIN:-nightly-2021-09-28}" +RUST_TOOLCHAIN="${RUST_TOOLCHAIN:-nightly-2022-05-09}" PACKAGE="${PACKAGE:-centrifuge-runtime}" #Need to replicate job for all runtimes # Enable warnings about unused extern crates @@ -25,7 +25,7 @@ case $TARGET in ;; tests) - RUST_MIN_STACK=8388608 cargo test --workspace --release --features test-benchmarks + RUST_MIN_STACK=8388608 cargo test --workspace --release --features test-benchmarks,try-runtime ;; integration) diff --git a/docker-compose-local-relay.yml b/docker-compose-local-relay.yml index bd58b67a90..4e9c610975 100644 --- a/docker-compose-local-relay.yml +++ b/docker-compose-local-relay.yml @@ -4,7 +4,7 @@ version: '3' services: node_alice: container_name: alice - image: "parity/polkadot:v0.9.20" + image: "parity/polkadot:v0.9.24" ports: - "30333:30333" - "9933:9933" @@ -32,7 +32,7 @@ services: node_bob: container_name: bob - image: "parity/polkadot:v0.9.20" + image: "parity/polkadot:v0.9.24" ports: - "30344:30333" - "9935:9933" diff --git a/libs/common-traits/Cargo.toml b/libs/common-traits/Cargo.toml index 12b83de0d5..e40893cf70 100644 --- a/libs/common-traits/Cargo.toml +++ b/libs/common-traits/Cargo.toml @@ -16,9 +16,9 @@ codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive scale-info = { version = "2.0", default-features = false, features = ["derive"] } impl-trait-for-tuples = "0.2.1" -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } [features] default = ['std'] diff --git a/libs/common-types/Cargo.toml b/libs/common-types/Cargo.toml index 72ebe8e1c1..40a5ef2fa8 100644 --- a/libs/common-types/Cargo.toml +++ b/libs/common-types/Cargo.toml @@ -17,16 +17,16 @@ bitflags = "1.3" serde = { version = "1.0.119" } # substrate dependencies -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } # local dependencies common-traits = { path = '../common-traits', default-features = false } [dev-dependencies] -frame-support = { git = "https://github.com/paritytech/substrate", default-features = true , branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = true , branch = "polkadot-v0.9.24" } [features] default = ['std'] diff --git a/libs/proofs/Cargo.toml b/libs/proofs/Cargo.toml index 1bf062b47e..18e7321e99 100644 --- a/libs/proofs/Cargo.toml +++ b/libs/proofs/Cargo.toml @@ -14,10 +14,10 @@ targets = ['x86_64-unknown-linux-gnu'] codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive'] , default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.20" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.24" } [features] default = ['std'] diff --git a/pallets/anchors/Cargo.toml b/pallets/anchors/Cargo.toml index f891d24b60..13e4fe20dc 100644 --- a/pallets/anchors/Cargo.toml +++ b/pallets/anchors/Cargo.toml @@ -15,20 +15,20 @@ serde = { version = "1.0.102" } codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive'] , default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } pallet-fees = { path = "../fees", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } [features] default = ['std'] diff --git a/pallets/anchors/src/lib.rs b/pallets/anchors/src/lib.rs index 7f6c6a1a72..205cac2c3d 100644 --- a/pallets/anchors/src/lib.rs +++ b/pallets/anchors/src/lib.rs @@ -19,7 +19,7 @@ use codec::{Decode, Encode}; use frame_support::{ dispatch::{DispatchError, DispatchResult}, storage::child, - RuntimeDebug, StateVersion, + StateVersion, }; pub use pallet::*; pub mod weights; @@ -69,8 +69,8 @@ pub struct PreCommitData { } /// The data structure for storing committed anchors. -#[derive(Encode, Decode, Default, Clone, PartialEq, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Default, Clone, PartialEq, TypeInfo)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] pub struct AnchorData { id: Hash, pub doc_root: Hash, diff --git a/pallets/bridge-mapping/Cargo.toml b/pallets/bridge-mapping/Cargo.toml index 91357e02de..56062779ab 100644 --- a/pallets/bridge-mapping/Cargo.toml +++ b/pallets/bridge-mapping/Cargo.toml @@ -14,19 +14,19 @@ targets = ['x86_64-unknown-linux-gnu'] codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive'] , default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } pallet-nft = { path = "../nft", default-features = false } [dev-dependencies] -chainbridge = { git = "https://github.com/centrifuge/chainbridge-substrate.git", default-features = false, branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +chainbridge = { git = "https://github.com/centrifuge/chainbridge-substrate.git", default-features = false, branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } pallet-anchors = { path = "../anchors", default-features = false } pallet-fees = { default-features = false, path = "../fees" } runtime-common = { path = "../../runtime/common", default-features = false } diff --git a/pallets/bridge/Cargo.toml b/pallets/bridge/Cargo.toml index 21b30d7021..5893ceeb0a 100644 --- a/pallets/bridge/Cargo.toml +++ b/pallets/bridge/Cargo.toml @@ -15,18 +15,18 @@ targets = ['x86_64-unknown-linux-gnu'] # Substrate basic primitives codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } # Centrifuge Chain dependencies -chainbridge = { git = "https://github.com/centrifuge/chainbridge-substrate.git", default-features = false, branch = "polkadot-v0.9.20" } +chainbridge = { git = "https://github.com/centrifuge/chainbridge-substrate.git", default-features = false, branch = "polkadot-v0.9.24" } pallet-fees = { path = "../fees", default-features = false } pallet-nft = { path = "../nft", default-features = false } -unique-assets = { git = "https://github.com/centrifuge/unique-assets", default-features = false, branch = "polkadot-v0.9.20" } +unique-assets = { git = "https://github.com/centrifuge/unique-assets", default-features = false, branch = "polkadot-v0.9.24" } common-traits = { path = "../../libs/common-traits", default-features = false } [dev-dependencies] @@ -34,12 +34,12 @@ common-traits = { path = "../../libs/common-traits", default-features = false } pallet-anchors = { path = "../anchors", default-features = false } pallet-fees = { path = "../fees", default-features = false } pallet-bridge-mapping = { path = "../bridge-mapping", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } proofs = { path = "../../libs/proofs", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } runtime-common = { path = "../../runtime/common", default_features = false } [features] diff --git a/pallets/bridge/src/lib.rs b/pallets/bridge/src/lib.rs index d985f0d41e..921bb95162 100644 --- a/pallets/bridge/src/lib.rs +++ b/pallets/bridge/src/lib.rs @@ -447,7 +447,7 @@ impl Pallet { /// This actually does computation. If you need to keep using it, then make /// sure you cache the value and only call this once. pub fn account_id() -> T::AccountId { - ::BridgePalletId::get().into_account() + ::BridgePalletId::get().into_account_truncating() } /// Initialize pallet's genesis configuration. diff --git a/pallets/claims/Cargo.toml b/pallets/claims/Cargo.toml index 69b805611a..91a4f487d2 100644 --- a/pallets/claims/Cargo.toml +++ b/pallets/claims/Cargo.toml @@ -14,21 +14,21 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } # optional dependencies for benchmarking -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } [dev-dependencies] -node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } [features] default = ['std'] diff --git a/pallets/claims/src/lib.rs b/pallets/claims/src/lib.rs index d5485c9dd5..6ae03205db 100644 --- a/pallets/claims/src/lib.rs +++ b/pallets/claims/src/lib.rs @@ -433,7 +433,7 @@ impl Pallet { /// This actually does computation. If you need to keep using it, then make /// sure you cache the value and only call this once. pub fn account_id() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } /// Build a sorted hash of two given hash values. diff --git a/pallets/claims/src/migration.rs b/pallets/claims/src/migration.rs index 1d5e0e84a2..41f580378a 100644 --- a/pallets/claims/src/migration.rs +++ b/pallets/claims/src/migration.rs @@ -15,17 +15,16 @@ // along with Cumulus. If not, see . use super::*; +use frame_support::{log, traits::Get, weights::Weight, Blake2_128Concat}; -use frame_support::{generate_storage_alias, log, traits::Get, weights::Weight, Blake2_128Concat}; - -generate_storage_alias!( - Claims, - RootHashes => Map<(Blake2_128Concat, T::Hash), bool> -); +#[frame_support::storage_alias] +pub type RootHashes = + StorageMap::Hash, bool>; pub mod root_hashes { use super::*; + #[cfg(feature = "try-runtime")] pub fn pre_migrate() -> Result<(), &'static str> { let count = RootHashes::::iter_values().count(); ensure!(count != 0, "RootHashes storage items not found!"); @@ -43,6 +42,7 @@ pub mod root_hashes { T::DbWeight::get().reads_writes(1, 1) } + #[cfg(feature = "try-runtime")] pub fn post_migrate() -> Result<(), &'static str> { ensure!( RootHashes::::iter_values().count() == 0, diff --git a/pallets/collator-allowlist/Cargo.toml b/pallets/collator-allowlist/Cargo.toml index 143ff13053..2f288769d8 100644 --- a/pallets/collator-allowlist/Cargo.toml +++ b/pallets/collator-allowlist/Cargo.toml @@ -13,18 +13,18 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive'] , default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } # optional dependencies for benchmarking -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } [features] default = ['std'] diff --git a/pallets/crowdloan-claim/Cargo.toml b/pallets/crowdloan-claim/Cargo.toml index a7451396f0..a5d7a275ae 100644 --- a/pallets/crowdloan-claim/Cargo.toml +++ b/pallets/crowdloan-claim/Cargo.toml @@ -20,15 +20,15 @@ serde = { version = "1.0.119" } scale-info = { version = "2.0", default-features = false, features = ["derive"] } # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } # optional dependencies for benchmarking -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } schnorrkel = { version = "0.10.2", features = ["u64_backend"], default-features = false, optional = true } getrandom = { version = "0.2", default-features = false, optional = true } rand_core = { version = "0.6.2", default-features = false, optional = true} @@ -38,10 +38,10 @@ common-traits = { path= '../../libs/common-traits', default_features = false } proofs = { path= '../../libs/proofs', default_features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-keyring = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.20" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-keyring = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.24" } pallet-crowdloan-reward = { path='../crowdloan-reward', default_features = false } hex = { version="0.4.3", default_features = false } diff --git a/pallets/crowdloan-claim/src/lib.rs b/pallets/crowdloan-claim/src/lib.rs index 411e568c3f..0baa7f5bc8 100644 --- a/pallets/crowdloan-claim/src/lib.rs +++ b/pallets/crowdloan-claim/src/lib.rs @@ -675,7 +675,7 @@ impl Pallet { /// This actually does computation. If you need to keep using it, then make /// sure you cache the value and only call this once. pub fn account_id() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } // Check if the origin is an administrator or represents the root. diff --git a/pallets/crowdloan-reward/Cargo.toml b/pallets/crowdloan-reward/Cargo.toml index 7c61ac3545..f15966af22 100644 --- a/pallets/crowdloan-reward/Cargo.toml +++ b/pallets/crowdloan-reward/Cargo.toml @@ -19,23 +19,23 @@ serde = { version = "1.0.119" } scale-info = { version = "2.0", default-features = false, features = ["derive"] } # Substrae dependencies -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } # Local dependencies common-traits = { path= '../../libs/common-traits', default_features = false } [dev-dependencies] -pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } serde = { version = "1.0.119" } [features] diff --git a/pallets/crowdloan-reward/src/lib.rs b/pallets/crowdloan-reward/src/lib.rs index f4861d8298..b24e33a61c 100644 --- a/pallets/crowdloan-reward/src/lib.rs +++ b/pallets/crowdloan-reward/src/lib.rs @@ -398,7 +398,7 @@ impl Pallet { /// This actually does computation. If you need to keep using it, then make /// sure you cache the value and only call this once. pub fn account_id() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } // Check if a transaction was called by an administrator or root entity. diff --git a/pallets/fees/Cargo.toml b/pallets/fees/Cargo.toml index 553165ad39..514a54fd9e 100644 --- a/pallets/fees/Cargo.toml +++ b/pallets/fees/Cargo.toml @@ -13,19 +13,19 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive'] , default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } # optional dependencies for benchmarking -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } [features] default = ['std'] diff --git a/pallets/loans/Cargo.toml b/pallets/loans/Cargo.toml index 969b74413d..723f7b10ca 100644 --- a/pallets/loans/Cargo.toml +++ b/pallets/loans/Cargo.toml @@ -15,12 +15,12 @@ serde = { version = "1.0.102" } codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive'] , default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } runtime-common = { path = "../../runtime/common", optional = true, default-features = false } # our pallets @@ -29,25 +29,25 @@ common-types = { path = "../../libs/common-types", default-features = false } pallet-permissions = { path = "../../pallets/permissions", default-features = false} # optional dependencies for benchmarking -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.20" } -pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.20" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.24" } +pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.24" } pallet-pools = { path = "../pools", optional = true, default-features = false} -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, optional = true, branch = "master" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.20" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, optional = true, branch = "master" } +orml-tokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, optional = true, branch = "polkadot-v0.9.24" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.24" } +orml-traits = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, optional = true, branch = "polkadot-v0.9.24" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = true , branch = "polkadot-v0.9.20" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = true , branch = "polkadot-v0.9.24" } runtime-common = { path = "../../runtime/common", default-features = true } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = true, branch = "master" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } +orml-tokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = true, branch = "polkadot-v0.9.24" } +orml-traits = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } -pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } pallet-pools = { path = "../pools", default-features = false} [features] diff --git a/pallets/loans/src/benchmarking.rs b/pallets/loans/src/benchmarking.rs index d6a2ed05cd..424bc97245 100644 --- a/pallets/loans/src/benchmarking.rs +++ b/pallets/loans/src/benchmarking.rs @@ -38,7 +38,7 @@ use test_utils::{ pub struct Pallet(LoansPallet); pub trait Config: - LoanConfig::ClassId> + LoanConfig::CollectionId> + pallet_balances::Config + pallet_uniques::Config + pallet_pools::Config @@ -133,7 +133,7 @@ fn create_and_init_pool( ) where ::Balance: From, - ::ClassId: From, + ::CollectionId: From, ::Balance: From, ::CurrencyId: From, ::TrancheId: Into<[u8; 16]>, @@ -141,7 +141,7 @@ where ::PoolId: Into + IsType>, ::CurrencyId: From, ::Balance: From, - ::ClassId: Default, + ::CollectionId: Default, { // create pool let pool_owner = account::("owner", 0, 0); @@ -210,7 +210,7 @@ where fn create_asset() -> (T::AccountId, AssetOf) where ::Balance: From, - ::ClassId: From, + ::CollectionId: From, { // create asset let loan_owner = borrower::(); @@ -278,13 +278,13 @@ where } fn pool_account(pool_id: T::PoolId) -> T::AccountId { - PoolLocator { pool_id }.into_account() + PoolLocator { pool_id }.into_account_truncating() } benchmarks! { where_clause { where - ::ClassId: From, + ::CollectionId: From, ::Balance: From, ::Rate: From, ::Amount: From, @@ -296,7 +296,7 @@ benchmarks! { ::TrancheId: Into<[u8; 16]>, ::EpochId: From, ::PoolId: Into + IsType>, - ::ClassId: Default, + ::CollectionId: Default, } initialise_pool { diff --git a/pallets/loans/src/functions.rs b/pallets/loans/src/functions.rs index 9c428c11a5..8c720ed733 100644 --- a/pallets/loans/src/functions.rs +++ b/pallets/loans/src/functions.rs @@ -35,7 +35,7 @@ impl Pallet { /// returns the account_id of the loan pallet pub fn account_id() -> T::AccountId { - T::LoansPalletId::get().into_account() + T::LoansPalletId::get().into_account_truncating() } /// check if the given loan belongs to the owner provided @@ -80,7 +80,7 @@ impl Pallet { T::NonFungible::mint_into(&loan_class_id.into(), &loan_id.into(), &owner)?; // lock collateral nft - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); T::NonFungible::transfer( &collateral_class_id.into(), &instance_id.into(), @@ -431,7 +431,9 @@ impl Pallet { } /// updates nav for the given pool and returns the latest NAV at this instant and number of loans accrued. - pub fn update_nav_of_pool(pool_id: PoolIdOf) -> Result<(T::Amount, Moment), DispatchError> { + pub(crate) fn update_nav_of_pool( + pool_id: PoolIdOf, + ) -> Result<(T::Amount, Moment), DispatchError> { let now = Self::now(); let write_off_groups = PoolWriteOffGroups::::get(pool_id); let mut updated_loans = 0; diff --git a/pallets/loans/src/lib.rs b/pallets/loans/src/lib.rs index 3d343a16c5..2497602113 100644 --- a/pallets/loans/src/lib.rs +++ b/pallets/loans/src/lib.rs @@ -173,7 +173,7 @@ pub mod pallet { /// Stores the loan info for given pool and loan id #[pallet::storage] #[pallet::getter(fn get_loan)] - pub type Loan = StorageDoubleMap< + pub(crate) type Loan = StorageDoubleMap< _, Blake2_128Concat, PoolIdOf, @@ -186,7 +186,7 @@ pub mod pallet { /// Stores the pool nav against poolId #[pallet::storage] #[pallet::getter(fn nav)] - pub type PoolNAV = + pub(crate) type PoolNAV = StorageMap<_, Blake2_128Concat, PoolIdOf, NAVDetails, OptionQuery>; /// Stores the pool associated with the its write off groups diff --git a/pallets/loans/src/mock.rs b/pallets/loans/src/mock.rs index 51ef2b9f06..496df34de6 100644 --- a/pallets/loans/src/mock.rs +++ b/pallets/loans/src/mock.rs @@ -31,7 +31,7 @@ use frame_system::{EnsureSigned, EnsureSignedBy}; use orml_traits::parameter_type_with_key; use pallet_pools::{PoolDetails, ScheduledUpdateDetails}; use runtime_common::{ - Amount, Balance, ClassId, InstanceId, Moment, Rate, TrancheId, TrancheToken, + Amount, Balance, CollectionId, ItemId, Moment, Rate, TrancheId, TrancheToken, CENTI_CFG as CENTI_CURRENCY, CFG as CURRENCY, }; use sp_core::H256; @@ -145,6 +145,8 @@ impl orml_tokens::Config for MockRuntime { type DustRemovalWhitelist = frame_support::traits::Nothing; type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_types! { @@ -249,22 +251,23 @@ parameter_types! { // Base deposit to add metadata is 0.1 Currency pub const MetadataDepositBase: Balance = 10 * CENTI_CURRENCY; // Deposit to create a class is 1 Currency - pub const ClassDeposit: Balance = CURRENCY; + pub const CollectionDeposit: Balance = CURRENCY; // Deposit to create a class is 0.1 Currency - pub const InstanceDeposit: Balance = 10 * CENTI_CURRENCY; + pub const ItemDeposit: Balance = 10 * CENTI_CURRENCY; // Maximum limit of bytes for Metadata, Attribute key and Value pub const Limit: u32 = 256; } impl pallet_uniques::Config for MockRuntime { type Event = Event; - type ClassId = ClassId; - type InstanceId = InstanceId; + type CollectionId = CollectionId; + type ItemId = ItemId; type Currency = Balances; type ForceOrigin = EnsureSignedBy; type CreateOrigin = AsEnsureOriginWithArg>; - type ClassDeposit = ClassDeposit; - type InstanceDeposit = InstanceDeposit; + type Locker = (); + type CollectionDeposit = CollectionDeposit; + type ItemDeposit = ItemDeposit; type MetadataDepositBase = MetadataDepositBase; type AttributeDepositBase = AttributeDepositBase; type DepositPerByte = DepositPerByte; @@ -302,8 +305,8 @@ parameter_types! { impl pallet_loans::Config for MockRuntime { type Event = Event; - type ClassId = ClassId; - type LoanId = InstanceId; + type ClassId = CollectionId; + type LoanId = ItemId; type Rate = Rate; type Amount = Amount; type NonFungible = Uniques; @@ -374,12 +377,12 @@ impl TestExternalitiesBuilder { orml_tokens::GenesisConfig:: { balances: vec![ ( - PoolLocator { pool_id: 0 }.into_account(), + PoolLocator { pool_id: 0 }.into_account_truncating(), CurrencyId::Tranche(0, JuniorTrancheId::get()), 100_000 * CURRENCY, ), ( - PoolLocator { pool_id: 0 }.into_account(), + PoolLocator { pool_id: 0 }.into_account_truncating(), CurrencyId::Tranche(0, SeniorTrancheId::get()), 100_000 * CURRENCY, ), diff --git a/pallets/loans/src/test_utils.rs b/pallets/loans/src/test_utils.rs index 4da6b36392..154bf57821 100644 --- a/pallets/loans/src/test_utils.rs +++ b/pallets/loans/src/test_utils.rs @@ -63,14 +63,14 @@ pub(crate) fn create_nft_class( ) -> ::ClassId where T: frame_system::Config - + pallet_loans::Config::ClassId> + + pallet_loans::Config::CollectionId> + pallet_uniques::Config, - ::ClassId: From, + ::CollectionId: From, { // Create class. Shouldn't fail. let admin = maybe_admin.unwrap_or(owner.clone()); - let uniques_class_id: ::ClassId = class_id.into(); - as Create>::create_class( + let uniques_class_id: ::CollectionId = class_id.into(); + as Create>::create_collection( &uniques_class_id, &owner, &admin, @@ -102,7 +102,7 @@ pub(crate) fn create( ::EpochId: From, ::PoolId: Into + Into>, { - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); // Initialize pool with initial investments assert_ok!(PoolPallet::::create( @@ -196,9 +196,9 @@ pub(crate) fn initialise_test_pool( ) -> ::ClassId where T: frame_system::Config - + pallet_loans::Config::ClassId> + + pallet_loans::Config::CollectionId> + pallet_uniques::Config, - ::ClassId: From, + ::CollectionId: From, { let class_id = create_nft_class::(class_id, pool_owner.clone(), maybe_admin); pallet_loans::Pallet::::initialise_pool( diff --git a/pallets/loans/src/tests.rs b/pallets/loans/src/tests.rs index f088bd8784..2c147bf611 100644 --- a/pallets/loans/src/tests.rs +++ b/pallets/loans/src/tests.rs @@ -29,7 +29,7 @@ use frame_support::traits::fungibles::Inspect; use frame_support::{assert_err, assert_ok}; use loan_type::{BulletLoan, LoanType}; use pallet_loans::Event as LoanEvent; -use runtime_common::{Amount, Balance, ClassId, InstanceId, Rate, CFG as USD}; +use runtime_common::{Amount, Balance, CollectionId, ItemId, Rate, CFG as USD}; use sp_arithmetic::traits::{checked_pow, CheckedDiv, CheckedMul, CheckedSub}; use sp_arithmetic::FixedPointNumber; use sp_runtime::traits::StaticLookup; @@ -67,9 +67,9 @@ where PoolId = PoolId, TrancheId = [u8; 16], EpochId = u32, - > + pallet_loans::Config + > + pallet_loans::Config + frame_system::Config - + pallet_uniques::Config + + pallet_uniques::Config + pallet_permissions::Config, Role = Role>, PoolIdOf: From<::PoolId>, { @@ -124,7 +124,7 @@ where assert_eq!(loan.status, LoanStatus::Created); // collateral nft owner is pool pallet - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); expect_asset_owner::(collateral, pool_account); // pool should be initialised @@ -186,7 +186,7 @@ fn price_test_loan( loan_type: LoanType, ) where T: pallet_pools::Config - + pallet_loans::Config + + pallet_loans::Config + frame_system::Config, { let res = Loans::price(Origin::signed(admin), pool_id, loan_id, rp, loan_type); @@ -217,7 +217,7 @@ fn price_bullet_loan( ) -> (Rate, LoanType) where T: pallet_pools::Config - + pallet_loans::Config + + pallet_loans::Config + frame_system::Config, { let loan_type = default_bullet_loan_params(); @@ -234,7 +234,7 @@ fn price_credit_line_loan( ) -> (Rate, LoanType) where T: pallet_pools::Config - + pallet_loans::Config + + pallet_loans::Config + frame_system::Config, { let loan_type = default_credit_line_params(); @@ -251,7 +251,7 @@ fn price_credit_line_with_maturity_loan( ) -> (Rate, LoanType) where T: pallet_pools::Config - + pallet_loans::Config + + pallet_loans::Config + frame_system::Config, { let loan_type = default_credit_line_with_maturity_params(); @@ -268,7 +268,7 @@ fn close_test_loan( collateral: AssetOf, ) where T: pallet_pools::Config - + pallet_loans::Config + + pallet_loans::Config + frame_system::Config, { let loan_id = loan.1; @@ -522,7 +522,7 @@ macro_rules! test_borrow_loan { let borrower = Borrower::get(); // successful issue let (pool_id, loan, _collateral) = issue_test_loan::(0, borrower); - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); let pool_balance = balance_of::(CurrencyId::AUSD, &pool_account); assert_eq!(pool_balance, 1000 * USD); @@ -686,7 +686,7 @@ macro_rules! test_repay_loan { // successful issue let (pool_id, loan_nft, collateral_nft) = issue_test_loan::(0, borrower); - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); let pool_balance = balance_of::(CurrencyId::AUSD, &pool_account); assert_eq!(pool_balance, 1000 * USD); @@ -905,7 +905,7 @@ macro_rules! test_pool_nav { let borrower: u64 = Borrower::get(); // successful issue let (pool_id, loan, _collateral) = issue_test_loan::(0, borrower); - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); let pool_balance = balance_of::(CurrencyId::AUSD, &pool_account); assert_eq!(pool_balance, 1000 * USD); @@ -1205,7 +1205,7 @@ macro_rules! test_write_off_maturity_loan { let borrower: u64 = Borrower::get(); // successful issue let (pool_id, loan, _collateral) = issue_test_loan::(0, borrower); - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); let pool_balance = balance_of::(CurrencyId::AUSD, &pool_account); assert_eq!(pool_balance, 1000 * USD); @@ -1308,7 +1308,7 @@ macro_rules! test_admin_write_off_loan_type { let borrower: u64 = Borrower::get(); // successful issue let (pool_id, loan, _asset) = issue_test_loan::(0, borrower); - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); let pool_balance = balance_of::(CurrencyId::AUSD, &pool_account); assert_eq!(pool_balance, 1000 * USD); @@ -1423,7 +1423,7 @@ macro_rules! test_close_written_off_loan_type { let borrower: u64 = Borrower::get(); // successful issue let (pool_id, loan, asset) = issue_test_loan::(0, borrower); - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); let pool_balance = balance_of::(CurrencyId::AUSD, &pool_account); assert_eq!(pool_balance, 1000 * USD); @@ -1554,7 +1554,7 @@ macro_rules! repay_too_early { let borrower: u64 = Borrower::get(); // successful issue let (pool_id, loan, _asset) = issue_test_loan::(0, borrower); - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); let pool_balance = balance_of::(CurrencyId::AUSD, &pool_account); assert_eq!(pool_balance, 1000 * USD); @@ -1617,7 +1617,7 @@ macro_rules! write_off_overflow { let borrower: u64 = Borrower::get(); // successful issue let (pool_id, loan, _asset) = issue_test_loan::(0, borrower); - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); let pool_balance = balance_of::(CurrencyId::AUSD, &pool_account); assert_eq!(pool_balance, 1000 * USD); diff --git a/pallets/loans/src/types.rs b/pallets/loans/src/types.rs index 875d1c03ab..6a94bcf1dc 100644 --- a/pallets/loans/src/types.rs +++ b/pallets/loans/src/types.rs @@ -14,7 +14,6 @@ //! Module provides base types and their functions use super::*; use common_traits::PoolInspect; -use frame_support::RuntimeDebug; use scale_info::TypeInfo; use sp_arithmetic::traits::Zero; @@ -36,8 +35,8 @@ pub(crate) struct ClosedLoan { } /// The data structure for storing pool nav details -#[derive(Encode, Decode, Copy, Clone, PartialEq, Default, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Copy, Clone, PartialEq, Default, TypeInfo)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] pub struct NAVDetails { // this is the latest nav for the given pool. // this will be updated on these scenarios @@ -46,15 +45,15 @@ pub struct NAVDetails { // So NAV could be // approximate when current time != last_updated // exact when current time == last_updated - pub latest: Amount, + pub(crate) latest: Amount, // this is the last time when the nav was calculated for the entire pool - pub last_updated: Moment, + pub(crate) last_updated: Moment, } /// The data structure for storing a specific write off group -#[derive(Encode, Decode, Copy, Clone, PartialEq, Default, RuntimeDebug, TypeInfo)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Copy, Clone, PartialEq, Default, TypeInfo)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] pub struct WriteOffGroup { /// percentage of outstanding debt we are going to write off on a loan pub(crate) percentage: Rate, @@ -89,8 +88,8 @@ pub enum NAVUpdateType { } /// The data structure for storing loan info -#[derive(Encode, Decode, Copy, Clone, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Copy, Clone, TypeInfo)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))] pub struct LoanDetails { pub(crate) collateral: Asset, pub(crate) loan_type: LoanType, @@ -194,7 +193,7 @@ where } /// returns the max_borrow_amount amount for the loan based on the loan type - pub fn max_borrow_amount(&self, now: Moment) -> Amount { + pub(crate) fn max_borrow_amount(&self, now: Moment) -> Amount { match self.loan_type { LoanType::BulletLoan(bl) => bl.max_borrow_amount(self.total_borrowed), LoanType::CreditLine(cl) => { @@ -217,10 +216,10 @@ where /// type alias to Non fungible ClassId type pub(crate) type ClassIdOf = - <::NonFungible as Inspect<::AccountId>>::ClassId; + <::NonFungible as Inspect<::AccountId>>::CollectionId; /// type alias to Non fungible InstanceId type pub(crate) type InstanceIdOf = - <::NonFungible as Inspect<::AccountId>>::InstanceId; + <::NonFungible as Inspect<::AccountId>>::ItemId; /// type alias to Non fungible Asset pub(crate) type AssetOf = Asset<::ClassId, ::LoanId>; /// type alias for pool reserve balance type diff --git a/pallets/migration/Cargo.toml b/pallets/migration/Cargo.toml index 550d205ee7..291236802e 100644 --- a/pallets/migration/Cargo.toml +++ b/pallets/migration/Cargo.toml @@ -15,17 +15,17 @@ codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive scale-info = { version = "2.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } -pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } [dev-dependencies] hex = "0.4.3" diff --git a/pallets/nft-sales/Cargo.toml b/pallets/nft-sales/Cargo.toml index 4d661fc5c7..5ce6f1667d 100644 --- a/pallets/nft-sales/Cargo.toml +++ b/pallets/nft-sales/Cargo.toml @@ -13,30 +13,30 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive'] , default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } # Optional dependencies for benchmarking -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.20" } -pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.20" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, optional = true, branch = "master" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, optional = true, branch = "master" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.24" } +pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.24" } +orml-tokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, optional = true, branch = "polkadot-v0.9.24" } +orml-traits = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, optional = true, branch = "polkadot-v0.9.24" } common-types = { path = "../../libs/common-types", default-features = false, optional = true } runtime-common = { path = "../../runtime/common", default-features = false, optional = true } [dev-dependencies] # Substrate crates & pallets -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } # Orml crates -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = true, branch = "master" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } +orml-tokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = true, branch = "polkadot-v0.9.24" } +orml-traits = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } # Local crates runtime-common = { path = "../../runtime/common", default-features = true } diff --git a/pallets/nft-sales/src/benchmarking.rs b/pallets/nft-sales/src/benchmarking.rs index ddf110b25d..51fea4ea6a 100644 --- a/pallets/nft-sales/src/benchmarking.rs +++ b/pallets/nft-sales/src/benchmarking.rs @@ -14,13 +14,13 @@ benchmarks! { where_clause { where T: Config - + pallet_uniques::Config::ClassId> - + pallet_uniques::Config::InstanceId> + + pallet_uniques::Config::CollectionId> + + pallet_uniques::Config::ItemId> + orml_tokens::Config> + orml_tokens::Config> + pallet_balances::Config, ::Balance: From, - ::ClassId: From, + ::CollectionId: From, ::Balance: From, ::CurrencyId: From, <::Fungibles as fungibles::Inspect>>::AssetId: From, @@ -34,13 +34,13 @@ benchmarks! { deposit_native_balance::(&seller_account); // We need the NFT to exist in the pallet-uniques before we can put it for sale - let (class_id, instance_id) = mint_nft::(0, 1, &seller_account); + let (collection_id, item_id) = mint_nft::(0, 1, &seller_account); // Define the price let price: Price, crate::BalanceOf> = Price { currency: CurrencyId::AUSD.into(), amount: 10_000u128.into() }; - }: _(seller_origin, class_id, instance_id, price) + }: _(seller_origin, collection_id, item_id, price) verify { - assert!(>::contains_key(class_id, instance_id), "NFT should be for sale now"); + assert!(>::contains_key(collection_id, item_id), "NFT should be for sale now"); } // Remove an NFT from sale @@ -50,16 +50,16 @@ benchmarks! { deposit_native_balance::(&seller_account); // We need the NFT to exist in the pallet-uniques before we can put it for sale - let (class_id, instance_id) = mint_nft::(0, 1, &seller_account); + let (collection_id, item_id) = mint_nft::(0, 1, &seller_account); // Define the price let price: Price, crate::BalanceOf> = Price { currency: CurrencyId::KUSD.into(), amount: 10_000u128.into() }; // We need the nft in the storage beforehand to be able to remove it - >::insert(class_id.clone(), instance_id.clone(), Sale { seller: seller_account, price}); + >::insert(collection_id.clone(), item_id.clone(), Sale { seller: seller_account, price}); - }: _(seller_origin, class_id, instance_id) + }: _(seller_origin, collection_id, item_id) verify { - assert!(>::get(class_id, instance_id).is_none(), "The NFT should have been removed from sale"); + assert!(>::get(collection_id, item_id).is_none(), "The NFT should have been removed from sale"); } // Remove an NFT from sale @@ -69,21 +69,21 @@ benchmarks! { deposit_native_balance::(&seller_account); // We need the NFT to exist in the pallet-uniques before we can put it for sale - let (class_id, instance_id) = mint_nft::(0, 1, &seller_account); + let (collection_id, item_id) = mint_nft::(0, 1, &seller_account); // Define the price let price: Price, crate::BalanceOf> = Price { currency: CurrencyId::KUSD.into(), amount: 10_000u128.into() }; // We need the nft in the storage beforehand to be able to remove it - >::insert(class_id.clone(), instance_id.clone(), Sale { seller: seller_account, price: price.clone()}); + >::insert(collection_id.clone(), item_id.clone(), Sale { seller: seller_account, price: price.clone()}); // We need the buyer to have enough balance to pay for the NFT let buyer_account = account::("buyer", 0, 0); let buyer_origin: RawOrigin = RawOrigin::Signed(buyer_account.clone()).into(); deposit_token_balance::(&buyer_account, CurrencyId::KUSD, 100_000u128.into()); - }: _(buyer_origin, class_id, instance_id, price) + }: _(buyer_origin, collection_id, item_id, price) verify { - assert!(>::get(class_id, instance_id).is_none(), "The NFT should have been removed from sale once bought"); + assert!(>::get(collection_id, item_id).is_none(), "The NFT should have been removed from sale once bought"); } } @@ -118,19 +118,19 @@ where } pub(crate) fn create_nft_class( - class_id: u64, + collection_id: u64, owner: T::AccountId, -) -> ::ClassId +) -> ::CollectionId where T: frame_system::Config + pallet_nft_sales::Config + pallet_uniques::Config - + pallet_uniques::Config::ClassId>, - ::ClassId: From, + + pallet_uniques::Config::CollectionId>, + ::CollectionId: From, { // Create class. Shouldn't fail. - let uniques_class_id: ::ClassId = class_id.into(); - as Create>::create_class( + let uniques_class_id: ::CollectionId = collection_id.into(); + as Create>::create_collection( &uniques_class_id, &owner, &owner, @@ -144,28 +144,28 @@ pub(crate) fn mint_nft( instance_id_raw: u128, owner: &T::AccountId, ) -> ( - ::ClassId, - ::InstanceId, + ::CollectionId, + ::ItemId, ) where T: frame_system::Config + pallet_nft_sales::Config + pallet_uniques::Config - + pallet_uniques::Config::ClassId> - + pallet_uniques::Config::InstanceId>, - ::InstanceId: From>, - ::ClassId: From>, - ::ClassId: From, + + pallet_uniques::Config::CollectionId> + + pallet_uniques::Config::ItemId>, + ::ItemId: From>, + ::CollectionId: From>, + ::CollectionId: From, { // Create the NFT class - let class_id: ::ClassId = + let collection_id: ::CollectionId = create_nft_class::(class_id_raw, owner.clone()); // Mint the NFT - let instance_id: ::InstanceId = instance_id_raw.into(); - as Mutate>::mint_into(&class_id, &instance_id, owner) + let item_id: ::ItemId = instance_id_raw.into(); + as Mutate>::mint_into(&collection_id, &item_id, owner) .expect("mint should not fail"); // Done - (class_id, instance_id) + (collection_id, item_id) } diff --git a/pallets/nft-sales/src/lib.rs b/pallets/nft-sales/src/lib.rs index 9a80da6ae4..ea5bcf5964 100644 --- a/pallets/nft-sales/src/lib.rs +++ b/pallets/nft-sales/src/lib.rs @@ -48,10 +48,10 @@ type BalanceOf = type SaleOf = Sale, CurrencyOf, BalanceOf>; -type ClassIdOf = <::NonFungibles as nonfungibles::Inspect>>::ClassId; +type CollectionIdOf = + <::NonFungibles as nonfungibles::Inspect>>::CollectionId; -type InstanceIdOf = - <::NonFungibles as nonfungibles::Inspect>>::InstanceId; +type ItemIdOf = <::NonFungibles as nonfungibles::Inspect>>::ItemId; // Storage types #[derive(Encode, Decode, Default, Clone, PartialEq, TypeInfo)] @@ -95,23 +95,23 @@ pub mod pallet { /// The NonFungibles trait impl that can transfer and inspect NFTs. type NonFungibles: nonfungibles::Transfer; - /// The NFT ClassId type - type ClassId: Parameter + /// The NFT CollectionId type + type CollectionId: Parameter + Member + MaybeSerializeDeserialize + Copy + Default + TypeInfo - + IsType>; + + IsType>; - /// The NFT InstanceId type - type InstanceId: Parameter + /// The NFT ItemId type + type ItemId: Parameter + Member + MaybeSerializeDeserialize + Copy + TypeInfo + From - + IsType>; + + IsType>; /// The Id of this pallet #[pallet::constant] @@ -119,19 +119,19 @@ pub mod pallet { } /// The active sales. - /// A sale is an entry identified by an NFT class and instance id. + /// A sale is an entry identified by an NFT collection and item id. #[pallet::storage] #[pallet::getter(fn get_sale)] pub(super) type Sales = StorageDoubleMap< _, // The hasher for the first key Blake2_128Concat, - // The first key, the nft class Id - T::ClassId, + // The first key, the nft collection Id + T::CollectionId, // The hasher for the second key Blake2_128Concat, - // The second key, the nft instance id - T::InstanceId, + // The second key, the nft item id + T::ItemId, // The data regarding the sale SaleOf, >; @@ -147,10 +147,8 @@ pub mod pallet { ( // The AccountId of the seller NMapKey, - // The NFT ClassId - NMapKey, - // The NFT InstanceId - NMapKey, + NMapKey, + NMapKey, ), // The value; we don't need to store anything further in here (), @@ -162,21 +160,21 @@ pub mod pallet { pub enum Event { /// An NFT is now for sale ForSale { - class_id: T::ClassId, - instance_id: T::InstanceId, + class_id: T::CollectionId, + instance_id: T::ItemId, sale: SaleOf, }, /// An NFT was removed Removed { - class_id: T::ClassId, - instance_id: T::InstanceId, + class_id: T::CollectionId, + instance_id: T::ItemId, }, /// An NFT has been sold Sold { - class_id: T::ClassId, - instance_id: T::InstanceId, + class_id: T::CollectionId, + instance_id: T::ItemId, sale: SaleOf, buyer: T::AccountId, }, @@ -213,8 +211,8 @@ pub mod pallet { #[pallet::weight(::WeightInfo::add())] pub fn add( origin: OriginFor, - class_id: T::ClassId, - instance_id: T::InstanceId, + class_id: T::CollectionId, + instance_id: T::ItemId, price: Price, BalanceOf>, ) -> DispatchResult { let seller = ensure_signed(origin.clone())?; @@ -262,8 +260,8 @@ pub mod pallet { #[pallet::weight(::WeightInfo::remove())] pub fn remove( origin: OriginFor, - class_id: T::ClassId, - instance_id: T::InstanceId, + class_id: T::CollectionId, + instance_id: T::ItemId, ) -> DispatchResult { let who = ensure_signed(origin.clone())?; let sale = >::get(class_id, instance_id).ok_or(Error::::NotForSale)?; @@ -303,8 +301,8 @@ pub mod pallet { #[transactional] pub fn buy( origin: OriginFor, - class_id: T::ClassId, - instance_id: T::InstanceId, + class_id: T::CollectionId, + instance_id: T::ItemId, max_offer: Price, BalanceOf>, ) -> DispatchResult { let buyer = ensure_signed(origin.clone())?; @@ -353,8 +351,8 @@ pub mod pallet { /// - Err(NotFound) when the NFT could not be found in T::NonFungibles fn is_owner( account: T::AccountId, - class_id: T::ClassId, - instance_id: T::InstanceId, + class_id: T::CollectionId, + instance_id: T::ItemId, ) -> Result> { T::NonFungibles::owner(&class_id.into(), &instance_id.into()) .map(|owner| owner == account) @@ -366,17 +364,17 @@ pub mod pallet { } pub fn account() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } // Add a new sale to the storage - fn do_add(class_id: T::ClassId, instance_id: T::InstanceId, sale: SaleOf) { + fn do_add(class_id: T::CollectionId, instance_id: T::ItemId, sale: SaleOf) { >::insert(class_id, instance_id, sale.clone()); NftsBySeller::::insert((sale.seller, class_id, instance_id), ()); } // Remove a sale from the storage - fn do_remove(class_id: T::ClassId, instance_id: T::InstanceId, seller: T::AccountId) { + fn do_remove(class_id: T::CollectionId, instance_id: T::ItemId, seller: T::AccountId) { >::remove(class_id, instance_id); NftsBySeller::::remove((seller, class_id, instance_id)); } diff --git a/pallets/nft-sales/src/mock.rs b/pallets/nft-sales/src/mock.rs index 7d5a4415bf..05b94576f7 100644 --- a/pallets/nft-sales/src/mock.rs +++ b/pallets/nft-sales/src/mock.rs @@ -17,7 +17,7 @@ use frame_support::traits::{AsEnsureOriginWithArg, Everything, GenesisBuild}; use frame_support::{parameter_types, PalletId}; use frame_system::{EnsureSigned, EnsureSignedBy}; use orml_traits::parameter_type_with_key; -use runtime_common::{Balance, ClassId, InstanceId, CENTI_CFG as CENTI_CURRENCY, CFG as CURRENCY}; +use runtime_common::{Balance, CollectionId, ItemId, CENTI_CFG as CENTI_CURRENCY, CFG as CURRENCY}; use sp_core::H256; use sp_runtime::{ testing::Header, @@ -60,6 +60,8 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = frame_support::traits::Nothing; type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_types! { @@ -76,13 +78,14 @@ parameter_type_with_key! { impl pallet_uniques::Config for Test { type Event = (); - type ClassId = ClassId; - type InstanceId = InstanceId; + type CollectionId = CollectionId; + type ItemId = ItemId; type Currency = Balances; type ForceOrigin = EnsureSignedBy; type CreateOrigin = AsEnsureOriginWithArg>; - type ClassDeposit = ClassDeposit; - type InstanceDeposit = InstanceDeposit; + type Locker = (); + type CollectionDeposit = CollectionDeposit; + type ItemDeposit = ItemDeposit; type MetadataDepositBase = MetadataDepositBase; type AttributeDepositBase = AttributeDepositBase; type DepositPerByte = DepositPerByte; @@ -101,10 +104,10 @@ parameter_types! { pub const AttributeDepositBase: Balance = 10 * CENTI_CURRENCY; // Base deposit to add metadata is 0.1 Currency pub const MetadataDepositBase: Balance = 10 * CENTI_CURRENCY; - // Deposit to create a class is 1 Currency - pub const ClassDeposit: Balance = CURRENCY; - // Deposit to create a class is 0.1 Currency - pub const InstanceDeposit: Balance = 10 * CENTI_CURRENCY; + // Deposit to create a collection is 1 Currency + pub const CollectionDeposit: Balance = CURRENCY; + // Deposit to create an item is 0.1 Currency + pub const ItemDeposit: Balance = 10 * CENTI_CURRENCY; // Maximum limit of bytes for Metadata, Attribute key and Value pub const Limit: u32 = 256; } @@ -169,8 +172,8 @@ impl nft_sales::Config for Test { type WeightInfo = (); type Fungibles = OrmlTokens; type NonFungibles = Uniques; - type ClassId = ClassId; - type InstanceId = InstanceId; + type CollectionId = CollectionId; + type ItemId = ItemId; type PalletId = NftSalesPalletId; } diff --git a/pallets/nft-sales/src/tests.rs b/pallets/nft-sales/src/tests.rs index 4407e26fa4..72eefe35c2 100644 --- a/pallets/nft-sales/src/tests.rs +++ b/pallets/nft-sales/src/tests.rs @@ -17,7 +17,7 @@ use common_types::CurrencyId; use frame_support::dispatch::DispatchError; use frame_support::traits::fungibles::Inspect; use frame_support::{assert_noop, assert_ok}; -use runtime_common::InstanceId; +use runtime_common::ItemId; /// Verify that calling `NftSales::add` specifiying an nft that is not present in the /// underlying `pallet_uniques` fails with `nft_sales::Error::::NotFound`. @@ -25,7 +25,7 @@ use runtime_common::InstanceId; fn add_nft_not_found() { new_test_ext().execute_with(|| { let seller: Origin = Origin::signed(SELLER); - let unknown_nft = (0, InstanceId(1)); + let unknown_nft = (0, ItemId(1)); assert_noop!( NftSales::add( @@ -47,14 +47,14 @@ fn add_nft_not_found() { fn add_nft_not_owner() { new_test_ext().execute_with(|| { let owner: Origin = Origin::signed(SELLER); - let (class_id, instance_id) = prepared_nft(&owner); + let (collection_id, item_id) = prepared_nft(&owner); let bad_actor = Origin::signed(BAD_ACTOR); assert_noop!( NftSales::add( bad_actor, - class_id, - instance_id, + collection_id, + item_id, Price { currency: CurrencyId::KUSD, amount: 3 @@ -66,8 +66,8 @@ fn add_nft_not_owner() { // Verify that the NFT is not listed under the BAD_ACTOR assert!(!NftsBySeller::::contains_key(( BAD_ACTOR, - class_id, - instance_id + collection_id, + item_id ))); }); } @@ -76,7 +76,7 @@ fn add_nft_not_owner() { fn add_nft_works() { new_test_ext().execute_with(|| { let seller: Origin = Origin::signed(SELLER); - let (class_id, instance_id) = prepared_nft(&seller); + let (collection_id, item_id) = prepared_nft(&seller); let price = Price { currency: CurrencyId::KUSD, amount: 10_000, @@ -85,30 +85,30 @@ fn add_nft_works() { // Set it for sale in the NftSales assert_ok!(NftSales::add( seller.clone(), - class_id, - instance_id, + collection_id, + item_id, price.clone(), )); // Verify that if the seller tries to put it for sale again, that it fails with `NotOwner` // given that the NFT is not owned by the nft-sales pallet. assert_noop!( - NftSales::add(seller, class_id, instance_id, price.clone()), + NftSales::add(seller, collection_id, item_id, price.clone()), DispatchError::from(nft_sales::Error::::NotOwner) ); // Verify that if the nft-sales pallet would go on trying to add it again, // it would fail with `AlreadyForSale`. assert_noop!( - NftSales::add(NftSales::origin(), class_id, instance_id, price), + NftSales::add(NftSales::origin(), collection_id, item_id, price), DispatchError::from(nft_sales::Error::::AlreadyForSale) ); // Verify that the nft is now listed in the storage assert!(NftsBySeller::::contains_key(( SELLER, - class_id, - instance_id + collection_id, + item_id ))); }); } @@ -118,34 +118,34 @@ fn add_nft_works() { fn remove_nft_bad_actor() { new_test_ext().execute_with(|| { let seller: Origin = Origin::signed(SELLER); - let (class_id, instance_id) = prepared_nft(&seller); + let (collection_id, item_id) = prepared_nft(&seller); let price = Price { currency: CurrencyId::KUSD, amount: 10_000, }; // Set it for sale in the NftSales - assert_ok!(NftSales::add(seller, class_id, instance_id, price)); + assert_ok!(NftSales::add(seller, collection_id, item_id, price)); // Verify that the nft is now listed in the storage assert!(NftsBySeller::::contains_key(( SELLER, - class_id, - instance_id + collection_id, + item_id ))); // Have a bad actor trying to remove it let bad_actor = Origin::signed(BUYER); assert_noop!( - NftSales::remove(bad_actor, class_id, instance_id), + NftSales::remove(bad_actor, collection_id, item_id), DispatchError::from(nft_sales::Error::::NotOwner) ); // Verify that the nft is still listed assert!(NftsBySeller::::contains_key(( SELLER, - class_id, - instance_id + collection_id, + item_id ))); }); } @@ -154,34 +154,34 @@ fn remove_nft_bad_actor() { fn remove_nft_works() { new_test_ext().execute_with(|| { let seller: Origin = Origin::signed(SELLER); - let (class_id, instance_id) = prepared_nft(&seller); + let (collection_id, item_id) = prepared_nft(&seller); let price = Price { currency: CurrencyId::KUSD, amount: 10_000, }; // Add it for sale - assert_ok!(NftSales::add(seller.clone(), class_id, instance_id, price)); + assert_ok!(NftSales::add(seller.clone(), collection_id, item_id, price)); // Verify that it's now stored assert!(NftsBySeller::::contains_key(( SELLER, - class_id, - instance_id + collection_id, + item_id ))); - assert_ok!(NftSales::remove(seller.clone(), class_id, instance_id)); + assert_ok!(NftSales::remove(seller.clone(), collection_id, item_id)); // Verify that the nft is no longer listed in the storage assert!(!NftsBySeller::::contains_key(( SELLER, - class_id, - instance_id + collection_id, + item_id ))); // Verify that try and remove it again fails with `NotForSale` assert_noop!( - NftSales::remove(seller, class_id, instance_id), + NftSales::remove(seller, collection_id, item_id), DispatchError::from(nft_sales::Error::::NotForSale) ); }); @@ -192,7 +192,7 @@ fn remove_nft_works() { fn buy_nft_seller() { new_test_ext().execute_with(|| { let seller: Origin = Origin::signed(SELLER); - let (class_id, instance_id) = prepared_nft(&seller); + let (collection_id, item_id) = prepared_nft(&seller); let price = Price { currency: CurrencyId::KUSD, amount: 10_000, @@ -200,12 +200,12 @@ fn buy_nft_seller() { // Set it for sale in the NftSales assert_ok!(NftSales::add( seller.clone(), - class_id, - instance_id, + collection_id, + item_id, price.clone(), )); - assert_ok!(NftSales::buy(seller, class_id, instance_id, price)); + assert_ok!(NftSales::buy(seller, collection_id, item_id, price)); }); } @@ -213,7 +213,7 @@ fn buy_nft_seller() { fn buy_nft_not_for_sale() { new_test_ext().execute_with(|| { let seller: Origin = Origin::signed(SELLER); - let (class_id, instance_id) = prepared_nft(&seller); + let (collection_id, item_id) = prepared_nft(&seller); let offer = Price { currency: CurrencyId::KUSD, amount: 10_000, @@ -222,7 +222,7 @@ fn buy_nft_not_for_sale() { // Verify that the buyer cannot buy the nft because it's not for sale let buyer: Origin = Origin::signed(BUYER); assert_noop!( - NftSales::buy(buyer, class_id, instance_id, offer), + NftSales::buy(buyer, collection_id, item_id, offer), DispatchError::from(nft_sales::Error::::NotForSale) ); }); @@ -232,7 +232,7 @@ fn buy_nft_not_for_sale() { fn buy_nft_insufficient_balance() { new_test_ext().execute_with(|| { let seller: Origin = Origin::signed(SELLER); - let (class_id, instance_id) = prepared_nft(&seller); + let (collection_id, item_id) = prepared_nft(&seller); let price = Price { currency: CurrencyId::KUSD, amount: OrmlTokens::balance(CurrencyId::KUSD, &1) + 1, @@ -241,8 +241,8 @@ fn buy_nft_insufficient_balance() { // Set it for sale in the NftSales assert_ok!(NftSales::add( seller.clone(), - class_id, - instance_id, + collection_id, + item_id, price.clone(), // < Just too expensive )); @@ -250,7 +250,7 @@ fn buy_nft_insufficient_balance() { // exceeds the seller's balance. let buyer: Origin = Origin::signed(BUYER); assert_noop!( - NftSales::buy(buyer, class_id, instance_id, price), + NftSales::buy(buyer, collection_id, item_id, price), DispatchError::from(orml_tokens::Error::::BalanceTooLow) ); }); @@ -261,7 +261,7 @@ fn buy_nft_works() { new_test_ext().execute_with(|| { let seller: Origin = Origin::signed(SELLER); let seller_initial_balance = OrmlTokens::balance(CurrencyId::KUSD, &1); - let (class_id, instance_id) = prepared_nft(&seller); + let (collection_id, item_id) = prepared_nft(&seller); let price = Price { currency: CurrencyId::KUSD, amount: 10_000, @@ -270,16 +270,16 @@ fn buy_nft_works() { // Add it for sale assert_ok!(NftSales::add( seller.clone(), - class_id, - instance_id, + collection_id, + item_id, price.clone(), )); // Verify that the nft is now listed in the storage assert!(NftsBySeller::::contains_key(( SELLER, - class_id, - instance_id + collection_id, + item_id ))); // Verify that the buyer can buy the nft @@ -287,19 +287,19 @@ fn buy_nft_works() { let buyer_initial_balance = OrmlTokens::balance(CurrencyId::KUSD, &BUYER); assert_ok!(NftSales::buy( buyer.clone(), - class_id, - instance_id, + collection_id, + item_id, price.clone() )); // Verify that if the seller can't buy it back because it's no longer for sale assert_noop!( - NftSales::buy(seller, class_id, instance_id, price.clone()), + NftSales::buy(seller, collection_id, item_id, price.clone()), DispatchError::from(nft_sales::Error::::NotForSale) ); // Verify that if the seller can't buy it back because it's no longer for sale - assert_eq!(Uniques::owner(class_id, instance_id), Some(BUYER)); + assert_eq!(Uniques::owner(collection_id, item_id), Some(BUYER)); // Verify that the price of the nft was transferred to the seller's account assert_eq!( @@ -316,8 +316,8 @@ fn buy_nft_works() { // Verify that the nft is no longer listed assert!(!NftsBySeller::::contains_key(( SELLER, - class_id, - instance_id + collection_id, + item_id ))); }); } @@ -328,7 +328,7 @@ fn buy_nft_works() { fn buy_nft_respects_max_offer_amount() { new_test_ext().execute_with(|| { let seller: Origin = Origin::signed(SELLER); - let (class_id, instance_id) = prepared_nft(&seller); + let (collection_id, item_id) = prepared_nft(&seller); let price = Price { currency: CurrencyId::KUSD, amount: 10_000, @@ -337,8 +337,8 @@ fn buy_nft_respects_max_offer_amount() { // Add it for sale assert_ok!(NftSales::add( seller.clone(), - class_id, - instance_id, + collection_id, + item_id, price.clone(), )); @@ -348,7 +348,7 @@ fn buy_nft_respects_max_offer_amount() { amount: price.amount - 1, }; assert_noop!( - NftSales::buy(buyer.clone(), class_id, instance_id, offer), + NftSales::buy(buyer.clone(), collection_id, item_id, offer), DispatchError::from(nft_sales::Error::::InvalidOffer) ); }); @@ -360,7 +360,7 @@ fn buy_nft_respects_max_offer_amount() { fn buy_nft_respects_max_offer_currency() { new_test_ext().execute_with(|| { let seller: Origin = Origin::signed(SELLER); - let (class_id, instance_id) = prepared_nft(&seller); + let (collection_id, item_id) = prepared_nft(&seller); let price = Price { currency: CurrencyId::KUSD, amount: 10_000, @@ -369,8 +369,8 @@ fn buy_nft_respects_max_offer_currency() { // Add it for sale assert_ok!(NftSales::add( seller.clone(), - class_id, - instance_id, + collection_id, + item_id, price.clone(), )); @@ -381,19 +381,19 @@ fn buy_nft_respects_max_offer_currency() { }; assert_noop!( - NftSales::buy(buyer.clone(), class_id, instance_id, offer), + NftSales::buy(buyer.clone(), collection_id, item_id, offer), DispatchError::from(nft_sales::Error::::InvalidOffer) ); }); } -/// Mint an NFT class and instance and return its `(class_id, instance_id)` -fn prepared_nft(owner: &Origin) -> (u64, InstanceId) { - let (class_id, instance_id) = (0, InstanceId(1)); +/// Mint an NFT class and instance and return its `(collection_id, item_id)` +fn prepared_nft(owner: &Origin) -> (u64, ItemId) { + let (collection_id, item_id) = (0, ItemId(1)); // Mint the nft in the uniques pallet - assert_ok!(Uniques::create(owner.clone(), class_id, SELLER)); - assert_ok!(Uniques::mint(owner.clone(), class_id, instance_id, SELLER)); + assert_ok!(Uniques::create(owner.clone(), collection_id, SELLER)); + assert_ok!(Uniques::mint(owner.clone(), collection_id, item_id, SELLER)); - (class_id, instance_id) + (collection_id, item_id) } diff --git a/pallets/nft/Cargo.toml b/pallets/nft/Cargo.toml index a732d152c9..1b946c798c 100644 --- a/pallets/nft/Cargo.toml +++ b/pallets/nft/Cargo.toml @@ -15,33 +15,33 @@ targets = ['x86_64-unknown-linux-gnu'] # Substrate dependencies codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } # Centrifuge Chain dependencies -chainbridge = { git = "https://github.com/centrifuge/chainbridge-substrate.git", default-features = false, branch = "polkadot-v0.9.20" } +chainbridge = { git = "https://github.com/centrifuge/chainbridge-substrate.git", default-features = false, branch = "polkadot-v0.9.24" } pallet-anchors = { path = "../anchors", default-features = false } pallet-fees = { path = "../fees", default-features = false } proofs = { path = "../../libs/proofs", default-features = false } runtime-common = { path = "../../runtime/common", default-features = false } -unique-assets = { git = "https://github.com/centrifuge/unique-assets", default-features = false, branch = "polkadot-v0.9.20" } +unique-assets = { git = "https://github.com/centrifuge/unique-assets", default-features = false, branch = "polkadot-v0.9.24" } common-traits = { path = "../../libs/common-traits", default-features = false } [dev-dependencies] # Testing and mocking dependencies pallet-anchors = { path = "../anchors", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } proofs = { path = "../../libs/proofs", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } [features] default = ['std'] diff --git a/pallets/permissions/Cargo.toml b/pallets/permissions/Cargo.toml index 53f86433be..b82f8123f4 100644 --- a/pallets/permissions/Cargo.toml +++ b/pallets/permissions/Cargo.toml @@ -16,11 +16,11 @@ serde = { version = "1.0.102" } codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive'] , default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } common-traits = { path = "../../libs/common-traits", default-features = false } # benchmarking diff --git a/pallets/permissions/src/mock.rs b/pallets/permissions/src/mock.rs index 5c8b151751..231513853a 100644 --- a/pallets/permissions/src/mock.rs +++ b/pallets/permissions/src/mock.rs @@ -297,10 +297,14 @@ parameter_types! { pub struct WrapperAccount(u64); impl AccountIdConversion for WrapperAccount { - fn into_sub_account(&self, _sub: S) -> AccountId { + fn into_sub_account_truncating(&self, _sub: S) -> AccountId { self.0 } + fn try_into_sub_account(&self, _sub: S) -> Option { + todo!() + } + fn try_from_sub_account(_x: &AccountId) -> Option<(Self, S)> { None } diff --git a/pallets/pools/Cargo.toml b/pallets/pools/Cargo.toml index e5e1a540af..68c53b0113 100644 --- a/pallets/pools/Cargo.toml +++ b/pallets/pools/Cargo.toml @@ -17,25 +17,25 @@ codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive scale-info = { version = "2.0", default-features = false, features = ["derive"] } rev_slice = { version = "0.1.5", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +orml-traits = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } common-traits = { path = "../../libs/common-traits", default-features = false } common-types = { path = "../../libs/common-types", default-features = false } pallet-permissions = { path = "../../pallets/permissions", default-features = false} [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +orml-tokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } runtime-common = { path = "../../runtime/common", default-features = true } pallet-restricted-tokens = { path = "../../pallets/restricted-tokens", default-features = true} -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = true , branch = "polkadot-v0.9.20" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = true , branch = "polkadot-v0.9.24" } rand = "0.8.5" diff --git a/pallets/pools/src/benchmarking.rs b/pallets/pools/src/benchmarking.rs index 7230992d12..1f93c34c54 100644 --- a/pallets/pools/src/benchmarking.rs +++ b/pallets/pools/src/benchmarking.rs @@ -218,7 +218,7 @@ benchmarks! { let expected = amount + MINT_AMOUNT; let caller = create_investor::(0, TRANCHE)?; Pallet::::update_invest_order(RawOrigin::Signed(caller.clone()).into(), POOL, tranche_location::(TRANCHE), amount)?; - let pool_account = PoolLocator:: { pool_id: POOL }.into_account(); + let pool_account = PoolLocator:: { pool_id: POOL }.into_account_truncating(); let currency = CurrencyId::Tranche(POOL, get_tranche_id::(TRANCHE)); T::Tokens::mint_into(currency.clone(), &pool_account, MINT_AMOUNT)?; populate_epochs::(n)?; diff --git a/pallets/pools/src/lib.rs b/pallets/pools/src/lib.rs index 7dce6a28da..73edac127a 100644 --- a/pallets/pools/src/lib.rs +++ b/pallets/pools/src/lib.rs @@ -26,6 +26,7 @@ mod solution; mod tests; mod tranche; pub mod weights; + use codec::HasCompact; use common_traits::{ Permissions, PoolInspect, PoolNAV, PoolReserve, PoolUpdateGuard, TrancheToken, @@ -40,8 +41,6 @@ use frame_support::{dispatch::DispatchResult, pallet_prelude::*, traits::UnixTim use frame_system::pallet_prelude::*; use orml_traits::Change; use scale_info::TypeInfo; -#[cfg(feature = "std")] -use serde::{Deserialize, Serialize}; use sp_arithmetic::traits::BaseArithmetic; use sp_runtime::{ traits::{ @@ -1376,7 +1375,7 @@ pub mod pallet { /// /// This function checks the state a pool would be in when applying a solution /// to an epoch. Depending on the state, the correct scoring function is chosen. - pub fn score_solution( + pub(crate) fn score_solution( pool_id: &PoolDetailsOf, epoch: &EpochExecutionInfoOf, solution: &[TrancheSolution], @@ -1545,7 +1544,7 @@ pub mod pallet { let collections = Self::calculate_collect(tranche_id, order, end_epoch)?; - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); if collections.payout_currency_amount > Zero::zero() { T::Tokens::transfer( pool.currency, @@ -1612,7 +1611,7 @@ pub mod pallet { .get_mut_tranche(TrancheLoc::Id(tranche_id)) .ok_or(Error::::InvalidTrancheId)? .outstanding_invest_orders; - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); let (send, recv, transfer_amount) = Self::update_order_amount( who, @@ -1639,7 +1638,7 @@ pub mod pallet { .get_mut_tranche(TrancheLoc::Id(tranche_id)) .ok_or(Error::::InvalidTrancheId)?; let mut outstanding = &mut tranche.outstanding_redeem_orders; - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); let (send, recv, transfer_amount) = Self::update_order_amount( who, @@ -1971,7 +1970,7 @@ pub mod pallet { tranche.outstanding_redeem_orders -= token_redeem; // Compute the tranche tokens that need to be minted or burned based on the execution - let pool_address = PoolLocator { pool_id }.into_account(); + let pool_address = PoolLocator { pool_id }.into_account_truncating(); if token_invest > token_redeem { let tokens_to_mint = token_invest - token_redeem; T::Tokens::mint_into(tranche.currency, &pool_address, tokens_to_mint)?; @@ -1996,7 +1995,7 @@ pub mod pallet { pool_id: T::PoolId, amount: T::Balance, ) -> DispatchResult { - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); Pool::::try_mutate(pool_id, |pool| { let pool = pool.as_mut().ok_or(Error::::NoSuchPool)?; let now = Self::now(); @@ -2048,7 +2047,7 @@ pub mod pallet { pool_id: T::PoolId, amount: T::Balance, ) -> DispatchResult { - let pool_account = PoolLocator { pool_id }.into_account(); + let pool_account = PoolLocator { pool_id }.into_account_truncating(); Pool::::try_mutate(pool_id, |pool| { let pool = pool.as_mut().ok_or(Error::::NoSuchPool)?; let now = Self::now(); diff --git a/pallets/pools/src/mock.rs b/pallets/pools/src/mock.rs index 9acba96d3b..c5cf2de12c 100644 --- a/pallets/pools/src/mock.rs +++ b/pallets/pools/src/mock.rs @@ -207,6 +207,8 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = frame_support::traits::Nothing; type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_types! { diff --git a/pallets/pools/src/solution.rs b/pallets/pools/src/solution.rs index c3f4bb11f9..a116f705ad 100644 --- a/pallets/pools/src/solution.rs +++ b/pallets/pools/src/solution.rs @@ -15,8 +15,7 @@ use frame_support::sp_runtime::traits::Convert; use sp_arithmetic::traits::Unsigned; use sp_runtime::ArithmeticError; -#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo)] pub enum PoolState { Healthy, Unhealthy(Vec), @@ -84,16 +83,14 @@ impl PoolState { } } -#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo)] pub enum UnhealthyState { MaxReserveViolated, MinRiskBufferViolated, } /// The solutions struct for epoch solution -#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo)] pub enum EpochSolution { Healthy(HealthySolution), Unhealthy(UnhealthySolution), @@ -302,8 +299,7 @@ where } } -#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo)] pub struct HealthySolution { pub solution: Vec, pub score: Balance, @@ -318,8 +314,7 @@ where } } -#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo)] pub struct UnhealthySolution { pub state: Vec, pub solution: Vec, @@ -388,8 +383,7 @@ where } // The solution struct for a specific tranche -#[derive(Encode, Decode, Clone, Eq, PartialEq, Default, RuntimeDebug, TypeInfo, Copy)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, Eq, PartialEq, RuntimeDebug, Default, TypeInfo, Copy)] pub struct TrancheSolution { pub invest_fulfillment: Perquintill, pub redeem_fulfillment: Perquintill, diff --git a/pallets/pools/src/tranche.rs b/pallets/pools/src/tranche.rs index fd15a40dbb..56c000b8cb 100644 --- a/pallets/pools/src/tranche.rs +++ b/pallets/pools/src/tranche.rs @@ -57,8 +57,7 @@ pub(super) type TrancheOf = Tranche< pub type Seniority = u32; pub type TrancheInput = (TrancheType, Option); -#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo, RuntimeDebug)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive(Encode, Decode, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo)] pub enum TrancheLoc { Index(TrancheIndex), Id(TrancheId), @@ -109,7 +108,7 @@ where pub struct Tranche { pub(super) tranche_type: TrancheType, pub(super) seniority: Seniority, - pub currency: Currency, + pub(super) currency: Currency, pub(super) outstanding_invest_orders: Balance, pub(super) outstanding_redeem_orders: Balance, @@ -344,10 +343,6 @@ where }) } - pub fn tranche_currency(&self, id: TrancheLoc) -> Option { - self.get_tranche(id).map(|tranche| tranche.currency) - } - pub fn tranche_id(&self, id: TrancheLoc) -> Option { match id { TrancheLoc::Id(id) => Some(id), diff --git a/pallets/restricted-tokens/Cargo.toml b/pallets/restricted-tokens/Cargo.toml index 03271beb5c..c345c03bde 100644 --- a/pallets/restricted-tokens/Cargo.toml +++ b/pallets/restricted-tokens/Cargo.toml @@ -16,26 +16,26 @@ serde = { version = "1.0.102" } codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive'] , default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } common-traits = { path = "../../libs/common-traits", default-features = false } common-types = { path = "../../libs/common-types", default-features = false } ## Benchmarkind dependencies -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.20" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, optional = true, branch = "master" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, optional = true, branch = "master" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.24" } +orml-tokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, optional = true, branch = "polkadot-v0.9.24" } +orml-traits = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, optional = true, branch = "polkadot-v0.9.24" } pallet-permissions = { path = "../permissions", default-features = false, optional = true } runtime-common = { path = "../../runtime/common", default-features = false, optional = true } [dev-dependencies] -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = true, branch = "master" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = true, branch = "master" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.20" } +orml-tokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = true, branch = "polkadot-v0.9.24" } +orml-traits = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = true, branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.24" } [features] default = ['std'] diff --git a/pallets/restricted-tokens/src/impl_fungible.rs b/pallets/restricted-tokens/src/impl_fungible.rs index b2dfc2ec0d..2f7833c786 100644 --- a/pallets/restricted-tokens/src/impl_fungible.rs +++ b/pallets/restricted-tokens/src/impl_fungible.rs @@ -66,8 +66,8 @@ impl Inspect for Pallet { )) } - fn can_deposit(who: &T::AccountId, amount: Self::Balance) -> DepositConsequence { - >::can_deposit(who, amount) + fn can_deposit(who: &T::AccountId, amount: Self::Balance, mint: bool) -> DepositConsequence { + >::can_deposit(who, amount, mint) } fn can_withdraw( diff --git a/pallets/restricted-tokens/src/impl_fungibles.rs b/pallets/restricted-tokens/src/impl_fungibles.rs index 339565be86..3e078be43c 100644 --- a/pallets/restricted-tokens/src/impl_fungibles.rs +++ b/pallets/restricted-tokens/src/impl_fungibles.rs @@ -111,11 +111,12 @@ impl Inspect for Pallet { asset: Self::AssetId, who: &T::AccountId, amount: Self::Balance, + mint: bool, ) -> DepositConsequence { if asset == T::NativeToken::get() { - as fungible::Inspect>::can_deposit(who, amount) + as fungible::Inspect>::can_deposit(who, amount, mint) } else { - >::can_deposit(asset, who, amount) + >::can_deposit(asset, who, amount, mint) } } diff --git a/pallets/restricted-tokens/src/mock.rs b/pallets/restricted-tokens/src/mock.rs index 5334506843..7541c30c54 100644 --- a/pallets/restricted-tokens/src/mock.rs +++ b/pallets/restricted-tokens/src/mock.rs @@ -436,6 +436,8 @@ impl orml_tokens::Config for MockRuntime { type DustRemovalWhitelist = frame_support::traits::Nothing; type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_types! { diff --git a/pallets/restricted-tokens/src/tests.rs b/pallets/restricted-tokens/src/tests.rs index 3e057e119a..0a77a309af 100644 --- a/pallets/restricted-tokens/src/tests.rs +++ b/pallets/restricted-tokens/src/tests.rs @@ -383,7 +383,7 @@ fn fungible_can_deposit() { TestExternalitiesBuilder::default() .build(Some(|| {})) .execute_with(|| { - assert!( as fungible::Inspect>::can_deposit(&1, 10) == DepositConsequence::Success); + assert!( as fungible::Inspect>::can_deposit(&1, 10, false) == DepositConsequence::Success); }) } @@ -614,13 +614,13 @@ fn fungibles_can_deposit() { assert!( as fungibles::Inspect< AccountId, - >>::can_deposit(CurrencyId::Cfg, &1, 10) + >>::can_deposit(CurrencyId::Cfg, &1, 10, false) == DepositConsequence::Success ); assert!( as fungibles::Inspect< AccountId, - >>::can_deposit(CurrencyId::KUSD, &1, 10) + >>::can_deposit(CurrencyId::KUSD, &1, 10, false) == DepositConsequence::Success ); }) diff --git a/runtime/altair/Cargo.toml b/runtime/altair/Cargo.toml index 280ffb514b..d169d25172 100644 --- a/runtime/altair/Cargo.toml +++ b/runtime/altair/Cargo.toml @@ -21,88 +21,88 @@ rustc-hex = { version = "2.0", optional = true } serde = { version = "1.0.102", optional = true } # parachain -parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-primitives-utility = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-xcm = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-xcmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-dmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-aura-ext = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-primitives-timestamp = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -pallet-collator-selection = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } +parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-primitives-utility = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-xcm = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-xcmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-dmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-aura-ext = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-primitives-timestamp = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +pallet-collator-selection = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } # polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } # primitives -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } # frame dependencies -frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.20" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["historical"] , branch = "polkadot-v0.9.20" } -pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.20" } -pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -pallet-society = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.24" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["historical"] , branch = "polkadot-v0.9.24" } +pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.24" } +pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +pallet-society = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } # orml pallets -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } +orml-tokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } +orml-traits = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } +orml-xcm-support = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } +orml-xtokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } # our custom pallets runtime-common = { path = "../common", default-features = false } @@ -119,7 +119,7 @@ pallet-nft-sales = { path = "../../pallets/nft-sales", default-features = false pallet-permissions = { path = "../../pallets/permissions", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } [features] default = ["std"] diff --git a/runtime/altair/src/lib.rs b/runtime/altair/src/lib.rs index e7ae03946b..7aa4a80a9b 100644 --- a/runtime/altair/src/lib.rs +++ b/runtime/altair/src/lib.rs @@ -694,23 +694,24 @@ parameter_types! { // Base deposit to add metadata is 0.1 AIR pub const MetadataDepositBase: Balance = 10 * CENTI_AIR; // Deposit to create a class is 1 AIR - pub const ClassDeposit: Balance = AIR; + pub const CollectionDeposit: Balance = AIR; // Deposit to create a class is 0.1 AIR - pub const InstanceDeposit: Balance = 10 * CENTI_AIR; + pub const ItemDeposit: Balance = 10 * CENTI_AIR; // Maximum limit of bytes for Metadata, Attribute key and Value pub const Limit: u32 = 256; } impl pallet_uniques::Config for Runtime { type Event = Event; - type ClassId = ClassId; - type InstanceId = InstanceId; + type CollectionId = CollectionId; + type ItemId = ItemId; type Currency = Balances; // a straight majority of council can act as force origin type ForceOrigin = EnsureRootOr; type CreateOrigin = AsEnsureOriginWithArg>; - type ClassDeposit = ClassDeposit; - type InstanceDeposit = InstanceDeposit; + type Locker = (); + type CollectionDeposit = CollectionDeposit; + type ItemDeposit = ItemDeposit; type MetadataDepositBase = MetadataDepositBase; type AttributeDepositBase = AttributeDepositBase; type DepositPerByte = DepositPerByte; @@ -909,7 +910,7 @@ parameter_type_with_key! { } parameter_types! { - pub TreasuryAccount: AccountId = TreasuryPalletId::get().into_account(); + pub TreasuryAccount: AccountId = TreasuryPalletId::get().into_account_truncating(); } impl orml_tokens::Config for Runtime { @@ -924,6 +925,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = frame_support::traits::Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_types! { @@ -935,8 +938,8 @@ impl pallet_nft_sales::Config for Runtime { type WeightInfo = weights::pallet_nft_sales::SubstrateWeight; type Fungibles = Tokens; type NonFungibles = Uniques; - type ClassId = ClassId; - type InstanceId = InstanceId; + type CollectionId = CollectionId; + type ItemId = ItemId; type PalletId = NftSalesPalletId; } @@ -1163,7 +1166,7 @@ impl_runtime_apis! { } } - impl runtime_common::apis::AnchorApi for Runtime { + impl runtime_common::AnchorApi for Runtime { fn get_anchor_by_id(id: Hash) -> Option> { Anchor::get_anchor_by_id(id) } diff --git a/runtime/altair/src/weights/pallet_treasury.rs b/runtime/altair/src/weights/pallet_treasury.rs index f3202cce6b..0617c890c4 100644 --- a/runtime/altair/src/weights/pallet_treasury.rs +++ b/runtime/altair/src/weights/pallet_treasury.rs @@ -55,4 +55,9 @@ impl WeightInfo for SubstrateWeight { .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + fn remove_approval() -> Weight { + (7_027_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } } diff --git a/runtime/altair/src/weights/pallet_uniques.rs b/runtime/altair/src/weights/pallet_uniques.rs index 7d36bab085..c6a0d865b2 100644 --- a/runtime/altair/src/weights/pallet_uniques.rs +++ b/runtime/altair/src/weights/pallet_uniques.rs @@ -87,12 +87,12 @@ impl WeightInfo for SubstrateWeight { .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn freeze_class() -> Weight { + fn freeze_collection() -> Weight { (32_696_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn thaw_class() -> Weight { + fn thaw_collection() -> Weight { (32_653_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -107,7 +107,7 @@ impl WeightInfo for SubstrateWeight { .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn force_asset_status() -> Weight { + fn force_item_status() -> Weight { (39_157_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) @@ -132,12 +132,12 @@ impl WeightInfo for SubstrateWeight { .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn set_class_metadata() -> Weight { + fn set_collection_metadata() -> Weight { (71_585_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn clear_class_metadata() -> Weight { + fn clear_collection_metadata() -> Weight { (67_624_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -157,4 +157,9 @@ impl WeightInfo for SubstrateWeight { .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + fn set_collection_max_supply() -> Weight { + (38_380_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } } diff --git a/runtime/altair/src/weights/pallet_utility.rs b/runtime/altair/src/weights/pallet_utility.rs index e92135b6a5..819887fc82 100644 --- a/runtime/altair/src/weights/pallet_utility.rs +++ b/runtime/altair/src/weights/pallet_utility.rs @@ -48,4 +48,9 @@ impl WeightInfo for SubstrateWeight { fn dispatch_as() -> Weight { (24_091_000 as Weight) } + fn force_batch(c: u32) -> Weight { + (29_136_000 as Weight) + // Standard Error: 2_000 + .saturating_add((5_697_000 as Weight).saturating_mul(c as Weight)) + } } diff --git a/runtime/altair/src/xcm.rs b/runtime/altair/src/xcm.rs index 0a5cf512b5..2a608b6c91 100644 --- a/runtime/altair/src/xcm.rs +++ b/runtime/altair/src/xcm.rs @@ -330,8 +330,8 @@ parameter_types! { } parameter_type_with_key! { - pub ParachainMinFee: |_location: MultiLocation| -> u128 { - u128::MAX + pub ParachainMinFee: |_location: MultiLocation| -> Option { + None }; } diff --git a/runtime/centrifuge/Cargo.toml b/runtime/centrifuge/Cargo.toml index 0b29993f42..e606cd56f3 100644 --- a/runtime/centrifuge/Cargo.toml +++ b/runtime/centrifuge/Cargo.toml @@ -21,81 +21,81 @@ rustc-hex = { version = "2.0", optional = true } serde = { version = "1.0.102", optional = true } # parachain -parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-primitives-utility = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-xcm = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-xcmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-dmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-aura-ext = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-primitives-timestamp = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } +parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-primitives-utility = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-xcm = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-xcmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-dmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-aura-ext = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-primitives-timestamp = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } # polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } # primitives -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } # frame dependencies -frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.20" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["historical"] , branch = "polkadot-v0.9.20" } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.20" } -pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false, optional = true } -pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.24" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["historical"] , branch = "polkadot-v0.9.24" } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true, branch = "polkadot-v0.9.24" } +pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.24" } +pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } # Our pallets and modules @@ -110,10 +110,10 @@ pallet-nft = { path = "../../pallets/nft", default-features = false } pallet-migration-manager = { path = "../../pallets/migration", default-features = false } # bridge pallets -chainbridge = { git = "https://github.com/centrifuge/chainbridge-substrate.git", default-features = false, branch = "polkadot-v0.9.20" } +chainbridge = { git = "https://github.com/centrifuge/chainbridge-substrate.git", default-features = false, branch = "polkadot-v0.9.24" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } [features] default = ["std"] diff --git a/runtime/centrifuge/src/lib.rs b/runtime/centrifuge/src/lib.rs index e8f74b2d54..dfad55f096 100644 --- a/runtime/centrifuge/src/lib.rs +++ b/runtime/centrifuge/src/lib.rs @@ -976,7 +976,7 @@ impl_runtime_apis! { } } - impl runtime_common::apis::AnchorApi for Runtime { + impl runtime_common::AnchorApi for Runtime { fn get_anchor_by_id(id: Hash) -> Option> { Anchor::get_anchor_by_id(id) } diff --git a/runtime/centrifuge/src/weights/pallet_treasury.rs b/runtime/centrifuge/src/weights/pallet_treasury.rs index 42928c761d..2a95747957 100644 --- a/runtime/centrifuge/src/weights/pallet_treasury.rs +++ b/runtime/centrifuge/src/weights/pallet_treasury.rs @@ -55,4 +55,9 @@ impl WeightInfo for SubstrateWeight { .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + fn remove_approval() -> Weight { + (7_027_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } } diff --git a/runtime/centrifuge/src/weights/pallet_utility.rs b/runtime/centrifuge/src/weights/pallet_utility.rs index 49b5b754e9..ca24a962ef 100644 --- a/runtime/centrifuge/src/weights/pallet_utility.rs +++ b/runtime/centrifuge/src/weights/pallet_utility.rs @@ -45,4 +45,9 @@ impl WeightInfo for SubstrateWeight { fn dispatch_as() -> Weight { (18_522_000 as Weight) } + fn force_batch(c: u32) -> Weight { + (29_136_000 as Weight) + // Standard Error: 2_000 + .saturating_add((4_697_000 as Weight).saturating_mul(c as Weight)) + } } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index cca7ac6aac..963cbcd5f1 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -15,20 +15,20 @@ smallvec = "1.4.0" # Substrate dependencies codec = { package = 'parity-scale-codec', version = '3.0.0', default-features = false, features = ['derive'] } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } # ORML dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } +orml-traits = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } # Local Dependencies common-traits = { path = "../../libs/common-traits", default-features = false } diff --git a/runtime/common/src/apis/anchors.rs b/runtime/common/src/apis/anchors.rs deleted file mode 100644 index 4078cb42e0..0000000000 --- a/runtime/common/src/apis/anchors.rs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2021 Centrifuge Foundation (centrifuge.io). -// -// This file is part of the Centrifuge chain project. -// Centrifuge is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version (see http://www.gnu.org/licenses). -// Centrifuge is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -use codec::Codec; -use pallet_anchors::AnchorData; -use sp_api::decl_runtime_apis; - -decl_runtime_apis! { - /// Runtime for pallet-anchors. - /// - /// Note: That the runtime api is pallet specific, while the rpc method - /// are more focused on domain-specifc logic pub trait AnchorApi - pub trait AnchorApi - where - Hash: Codec, - BlockNumber: Codec - { - fn get_anchor_by_id(id: Hash) -> Option>; - } -} diff --git a/runtime/common/src/apis/mod.rs b/runtime/common/src/apis/mod.rs deleted file mode 100644 index 2828169062..0000000000 --- a/runtime/common/src/apis/mod.rs +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2021 Centrifuge Foundation (centrifuge.io). -// -// This file is part of the Centrifuge chain project. -// Centrifuge is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version (see http://www.gnu.org/licenses). -// Centrifuge is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -//! Runtime apis useful in the Centrifuge ecosystem -pub use anchors::*; -pub use pools::*; - -mod anchors; -mod pools; diff --git a/runtime/common/src/apis/pools.rs b/runtime/common/src/apis/pools.rs deleted file mode 100644 index 010b650c40..0000000000 --- a/runtime/common/src/apis/pools.rs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2021 Centrifuge Foundation (centrifuge.io). -// -// This file is part of the Centrifuge chain project. -// Centrifuge is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version (see http://www.gnu.org/licenses). -// Centrifuge is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -use codec::Codec; -use pallet_pools::{EpochSolution, TrancheIndex, TrancheLoc, TrancheSolution}; -use sp_api::decl_runtime_apis; -use sp_std::vec::Vec; - -decl_runtime_apis! { - /// Runtime for pallet-pools. - /// - /// Note: That the runtime api is pallet specific, while the rpc method - /// are more focused on domain-specifc logic - pub trait PoolsApi - where - PoolId: Codec, - TrancheId: Codec, - Balance: Codec, - Currency: Codec, - BalanceRatio: Codec, - { - fn currency(pool_id: PoolId) -> Option; - - fn inspect_epoch_solution(pool_id: PoolId, solution: Vec) -> Option>; - - fn tranche_token_price(pool_id: PoolId, tranche: TrancheLoc) -> Option; - - fn tranche_token_prices(pool_id: PoolId) -> Option>; - - fn tranche_ids(pool_id: PoolId) -> Option>; - - fn tranche_id(pool_id: PoolId, tranche_index: TrancheIndex) -> Option; - - fn tranche_currency(pool_id: PoolId, tranche_loc: TrancheLoc) -> Option; - } -} diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index 28a0791067..2edded4f53 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -154,13 +154,13 @@ impl From for TokenId { } } -impl From for InstanceId { +impl From for ItemId { fn from(v: u16) -> Self { Self(v as u128) } } -impl From for InstanceId { +impl From for ItemId { fn from(v: u128) -> Self { Self(v) } diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 6413da9d9d..88110fc7a4 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -24,7 +24,19 @@ mod fixed_point; mod impls; pub use common_types::CurrencyId; -pub mod apis; + +pub mod apis { + use node_primitives::{BlockNumber, Hash}; + use pallet_anchors::AnchorData; + use sp_api::decl_runtime_apis; + + decl_runtime_apis! { + /// The API to query anchoring info. + pub trait AnchorApi { + fn get_anchor_by_id(id: Hash) -> Option>; + } + } +} /// Common types for all runtimes pub mod types { @@ -113,8 +125,8 @@ pub mod types { /// Amount with 18 precision fixed point decimal pub type Amount = crate::fixed_point::Amount; - /// A representation of ClassId for Uniques - pub type ClassId = u64; + /// A representation of CollectionId for Uniques + pub type CollectionId = u64; /// A representation of a tranche identifier pub type TrancheId = [u8; 16]; @@ -136,7 +148,7 @@ pub mod types { #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] pub struct TrancheWeight(pub u128); - /// A representation of InstanceId for Uniques. + /// A representation of ItemId for Uniques. #[derive( codec::Encode, codec::Decode, @@ -151,7 +163,7 @@ pub mod types { TypeInfo, )] #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] - pub struct InstanceId(pub u128); + pub struct ItemId(pub u128); } /// Common constants for all runtimes diff --git a/runtime/development/Cargo.toml b/runtime/development/Cargo.toml index fdb56f4531..f6974f548e 100644 --- a/runtime/development/Cargo.toml +++ b/runtime/development/Cargo.toml @@ -21,95 +21,95 @@ rustc-hex = { version = "2.0", optional = true } serde = { version = "1.0.102", optional = true } # parachain -parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-primitives-utility = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-xcm = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-xcmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-dmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-pallet-aura-ext = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -cumulus-primitives-timestamp = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } -pallet-collator-selection = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.20" } +parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-primitives-utility = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-xcm = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-xcmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-dmp-queue = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-pallet-aura-ext = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +cumulus-primitives-timestamp = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } +pallet-collator-selection = {git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.24" } # polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } # primitives -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +node-primitives = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } # frame dependencies -frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.20" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.20" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["historical"] , branch = "polkadot-v0.9.20" } -pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -pallet-society = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.20" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.24" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , optional = true , branch = "polkadot-v0.9.24" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["historical"] , branch = "polkadot-v0.9.24" } +pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +pallet-society = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } # orml pallets -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "master" } +orml-tokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } +orml-traits = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } +orml-xcm-support = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } +orml-xtokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.24" } runtime-common = { path = "../common", default-features = false } common-types = { path = "../../libs/common-types", default-features = false } common-traits = { path = "../../libs/common-traits", default-features = false } # bridge pallets -chainbridge = { git = "https://github.com/centrifuge/chainbridge-substrate.git", default-features = false, branch = "polkadot-v0.9.20" } +chainbridge = { git = "https://github.com/centrifuge/chainbridge-substrate.git", default-features = false, branch = "polkadot-v0.9.24" } # our custom pallets pallet-anchors = { path = "../../pallets/anchors", default-features = false } @@ -128,7 +128,7 @@ pallet-bridge = { path = "../../pallets/bridge", default-features = false } pallet-nft = { path = "../../pallets/nft", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } [features] default = ["std"] diff --git a/runtime/development/src/lib.rs b/runtime/development/src/lib.rs index b27706e96e..1d8d82844d 100644 --- a/runtime/development/src/lib.rs +++ b/runtime/development/src/lib.rs @@ -10,7 +10,7 @@ use frame_support::{ construct_runtime, parameter_types, traits::{ AsEnsureOriginWithArg, Contains, EnsureOneOf, EqualPrivilegeOnly, Everything, - InstanceFilter, LockIdentifier, U128CurrencyToVote, UnixTime, + InstanceFilter, LockIdentifier, U128CurrencyToVote, }, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}, @@ -57,9 +57,7 @@ use common_types::{ TimeProvider, UNION, }; use pallet_anchors::AnchorData; -use pallet_pools::{ - EpochSolution, PoolDetails, ScheduledUpdateDetails, TrancheIndex, TrancheLoc, TrancheSolution, -}; +use pallet_pools::{PoolDetails, ScheduledUpdateDetails}; use pallet_restricted_tokens::{ FungibleInspectPassthrough, FungiblesInspectPassthrough, TransferDetails, }; @@ -678,23 +676,24 @@ parameter_types! { // Base deposit to add metadata is 0.1 CFG pub const MetadataDepositBase: Balance = 10 * CENTI_CFG; // Deposit to create a class is 1 CFG - pub const ClassDeposit: Balance = CFG; + pub const CollectionDeposit: Balance = CFG; // Deposit to create a class is 0.1 CFG - pub const InstanceDeposit: Balance = 10 * CENTI_CFG; + pub const ItemDeposit: Balance = 10 * CENTI_CFG; // Maximum limit of bytes for Metadata, Attribute key and Value pub const Limit: u32 = 256; } impl pallet_uniques::Config for Runtime { type Event = Event; - type ClassId = ClassId; - type InstanceId = InstanceId; + type CollectionId = CollectionId; + type ItemId = ItemId; type Currency = Tokens; // a straight majority of council can act as force origin type ForceOrigin = EnsureRootOr; type CreateOrigin = AsEnsureOriginWithArg>; - type ClassDeposit = ClassDeposit; - type InstanceDeposit = InstanceDeposit; + type Locker = (); + type CollectionDeposit = CollectionDeposit; + type ItemDeposit = ItemDeposit; type MetadataDepositBase = MetadataDepositBase; type AttributeDepositBase = AttributeDepositBase; type DepositPerByte = DepositPerByte; @@ -715,8 +714,8 @@ impl pallet_nft_sales::Config for Runtime { type WeightInfo = weights::pallet_nft_sales::SubstrateWeight; type Fungibles = Tokens; type NonFungibles = Uniques; - type ClassId = ClassId; - type InstanceId = InstanceId; + type CollectionId = CollectionId; + type ItemId = ItemId; type PalletId = NftSalesPalletId; } @@ -1038,8 +1037,8 @@ parameter_types! { impl pallet_loans::Config for Runtime { type Event = Event; - type ClassId = ClassId; - type LoanId = InstanceId; + type ClassId = CollectionId; + type LoanId = ItemId; type Rate = Rate; type Amount = Amount; type NonFungible = Uniques; @@ -1192,7 +1191,7 @@ parameter_type_with_key! { } parameter_types! { - pub TreasuryAccount: AccountId = TreasuryPalletId::get().into_account(); + pub TreasuryAccount: AccountId = TreasuryPalletId::get().into_account_truncating(); } impl orml_tokens::Config for Runtime { @@ -1207,6 +1206,8 @@ impl orml_tokens::Config for Runtime { type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; type DustRemovalWhitelist = frame_support::traits::Nothing; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } parameter_types! { @@ -1522,72 +1523,12 @@ impl_runtime_apis! { } } - impl runtime_common::apis::AnchorApi for Runtime { + impl runtime_common::AnchorApi for Runtime { fn get_anchor_by_id(id: Hash) -> Option> { Anchor::get_anchor_by_id(id) } } - impl runtime_common::apis::PoolsApi for Runtime { - fn currency(pool_id: PoolId) -> Option{ - pallet_pools::Pool::::get(pool_id).map(|details| details.currency) - } - - fn inspect_epoch_solution(pool_id: PoolId, solution: Vec) -> Option>{ - let pool = pallet_pools::Pool::::get(pool_id)?; - let epoch_execution_info = pallet_pools::EpochExecution::::get(pool_id)?; - pallet_pools::Pallet::::score_solution( - &pool, - &epoch_execution_info, - &solution - ).ok() - } - - fn tranche_token_price(pool_id: PoolId, tranche: TrancheLoc) -> Option{ - let now = as UnixTime>::now().as_secs(); - let mut pool = pallet_pools::Pool::::get(pool_id)?; - let nav: Balance = pallet_loans::Pallet::::update_nav_of_pool(pool_id) - .ok() - .map(|(latest, _)| latest.into())?; - let total_assets = pool.reserve.total.saturating_add(nav); - let index: usize = pool.tranches.tranche_index(&tranche)?.try_into().ok()?; - let prices = pool - .tranches - .calculate_prices::<_, OrmlTokens, _>(total_assets, now) - .ok()?; - prices.get(index).map(|rate: &Rate| rate.clone()) - } - - fn tranche_token_prices(pool_id: PoolId) -> Option>{ - let now = as UnixTime>::now().as_secs(); - let mut pool = pallet_pools::Pool::::get(pool_id)?; - let nav: Balance = pallet_loans::Pallet::::update_nav_of_pool(pool_id) - .ok() - .map(|(latest, _)| latest.into())?; - let total_assets = pool.reserve.total.saturating_add(nav); - pool - .tranches - .calculate_prices::(total_assets, now) - .ok() - } - - fn tranche_ids(pool_id: PoolId) -> Option>{ - let pool = pallet_pools::Pool::::get(pool_id)?; - Some(pool.tranches.ids_residual_top()) - } - - fn tranche_id(pool_id: PoolId, tranche_index: TrancheIndex) -> Option{ - let pool = pallet_pools::Pool::::get(pool_id)?; - let index: usize = tranche_index.try_into().ok()?; - pool.tranches.ids_residual_top().get(index).map(|id| id.clone()) - } - - fn tranche_currency(pool_id: PoolId, tranche_loc: TrancheLoc) -> Option{ - let pool = pallet_pools::Pool::::get(pool_id)?; - pool.tranches.tranche_currency(tranche_loc) - } - } - #[cfg(feature = "runtime-benchmarks")] impl frame_benchmarking::Benchmark for Runtime { fn dispatch_benchmark( diff --git a/runtime/development/src/xcm.rs b/runtime/development/src/xcm.rs index d7fe2a4991..988c9e53c8 100644 --- a/runtime/development/src/xcm.rs +++ b/runtime/development/src/xcm.rs @@ -330,8 +330,8 @@ parameter_types! { } parameter_type_with_key! { - pub ParachainMinFee: |_location: MultiLocation| -> u128 { - u128::MAX + pub ParachainMinFee: |_location: MultiLocation| -> Option { + None }; } diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index dfb8d7c43d..9e519699c5 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/centrifuge/centrifuge-chain" [dependencies] # TODO(protocol): make fudge non-optional once it's operational again -fudge = { git = "https://github.com/centrifuge/fudge", branch = "v0.9.20", optional = true } +#fudge = { git = "https://github.com/centrifuge/fudge", branch = "v0.9.22", optional = true } tokio = { version = "1.15", features = ["macros"] } tracing = "0.1" tracing-subscriber = "0.2" @@ -19,54 +19,54 @@ lazy_static = "1.4.0" # Substrate ## Substrate-Frame -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.20" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } -pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.24" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } +pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.24" } ## Substrate-Primitives -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } ## Substrate-Client -sc-service = { git = "https://github.com/paritytech/substrate", features = ["db", "test-helpers"], branch = "polkadot-v0.9.20" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sc-service = { git = "https://github.com/paritytech/substrate", features = ["db", "test-helpers"], branch = "polkadot-v0.9.24" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } # Polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -polkadot-parachain = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -polkadot-primitives = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -rococo-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-parachain = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-primitives = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +rococo-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } # Cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } # Orml pallets -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "master" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "master" } -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "master" } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "master" } +orml-tokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", branch = "polkadot-v0.9.24" } +orml-traits = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", branch = "polkadot-v0.9.24" } +orml-xcm-support = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", branch = "polkadot-v0.9.24" } +orml-xtokens = { git = "https://github.com/NunoAlexandre/open-runtime-module-library", branch = "polkadot-v0.9.24" } # Misc -xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev="65cdc715c4927b75285a09897e8cdafd793d02b7" } +xcm-emulator = { git = "https://github.com/NunoAlexandre/xcm-simulator", branch = "polkadot-v0.9.24" } # Local runtime-common = { path = "../common" } @@ -76,8 +76,8 @@ altair-runtime = { path = "../altair" } centrifuge-runtime = { path = "../centrifuge" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.20" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } common-traits = { path = "../../libs/common-traits" } common-types = { path = "../../libs/common-types" } pallet-pools = { path = "../../pallets/pools" } diff --git a/runtime/integration-tests/src/xcm/setup.rs b/runtime/integration-tests/src/xcm/setup.rs index d14f2f2956..09774aea8a 100644 --- a/runtime/integration-tests/src/xcm/setup.rs +++ b/runtime/integration-tests/src/xcm/setup.rs @@ -128,5 +128,5 @@ pub fn altair_account() -> AccountId { fn parachain_account(id: u32) -> AccountId { use sp_runtime::traits::AccountIdConversion; - polkadot_parachain::primitives::Sibling::from(id).into_account() + polkadot_parachain::primitives::Sibling::from(id).into_account_truncating() } diff --git a/runtime/integration-tests/src/xcm/test_net.rs b/runtime/integration-tests/src/xcm/test_net.rs index ce439f64dd..a708ac1e50 100644 --- a/runtime/integration-tests/src/xcm/test_net.rs +++ b/runtime/integration-tests/src/xcm/test_net.rs @@ -91,10 +91,13 @@ pub fn relay_ext() -> sp_io::TestExternalities { balances: vec![ (AccountId::from(ALICE), air_amount(2002)), ( - ParaId::from(parachains::altair::ID).into_account(), + ParaId::from(parachains::altair::ID).into_account_truncating(), + air_amount(7), + ), + ( + ParaId::from(PARA_ID_SIBLING).into_account_truncating(), air_amount(7), ), - (ParaId::from(PARA_ID_SIBLING).into_account(), air_amount(7)), ], } .assimilate_storage(&mut t) diff --git a/src/api.rs b/src/api.rs new file mode 100644 index 0000000000..0e44281fad --- /dev/null +++ b/src/api.rs @@ -0,0 +1,58 @@ +use jsonrpsee::{ + core::{async_trait, Error as JsonRpseeError, RpcResult}, + proc_macros::rpc, + types::error::{CallError, ErrorCode, ErrorObject}, +}; + +use node_primitives::{BlockNumber, Hash}; +use pallet_anchors::AnchorData; +pub use runtime_common::AnchorApi as AnchorRuntimeApi; +use sp_api::ProvideRuntimeApi; +use sp_blockchain::HeaderBackend; +use sp_runtime::{generic::BlockId, traits::Block as BlockT}; +use std::sync::Arc; + +#[rpc(client, server)] +pub trait AnchorApi { + /// Returns an anchor given an anchor id from the runtime storage + #[method(name = "anchor_getAnchorById")] + async fn get_anchor_by_id(&self, id: Hash) -> RpcResult>; +} + +/// A struct that implements the [`AnchorApi`]. +pub struct AnchorRpc { + client: Arc, + _marker: std::marker::PhantomData

, +} + +impl AnchorRpc { + /// Create new `Anchor` with the given reference to the client. + pub fn new(client: Arc) -> Self { + Self { + client, + _marker: Default::default(), + } + } +} + +#[async_trait] +impl AnchorApiServer for AnchorRpc +where + Block: BlockT, + C: Send + Sync + 'static + ProvideRuntimeApi + HeaderBackend, + C::Api: AnchorRuntimeApi, +{ + async fn get_anchor_by_id(&self, id: Hash) -> RpcResult> { + let api = self.client.runtime_api(); + let best = self.client.info().best_hash; + let at = BlockId::hash(best); + api.get_anchor_by_id(&at, id) + .ok() + .unwrap() + .ok_or(JsonRpseeError::Call(CallError::Custom(ErrorObject::owned( + ErrorCode::InternalError.code(), + "Unable to find anchor", + Some(format!("{:?}", id)), + )))) + } +} diff --git a/src/command.rs b/src/command.rs index 626ce38716..cbf16ee15b 100644 --- a/src/command.rs +++ b/src/command.rs @@ -24,16 +24,16 @@ use crate::{ use codec::Encode; use cumulus_client_service::genesis::generate_genesis_block; use cumulus_primitives_core::ParaId; -use frame_benchmarking_cli::BenchmarkCmd; +use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use log::info; use node_primitives::Block; -use polkadot_parachain::primitives::AccountIdConversion; use sc_cli::{ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli, }; use sc_service::config::{BasePath, PrometheusConfig}; use sp_core::hexdisplay::HexDisplay; +use sp_runtime::traits::AccountIdConversion; use sp_runtime::traits::Block as BlockT; use std::{io::Write, net::SocketAddr}; @@ -202,6 +202,7 @@ fn extract_genesis_wasm(chain_spec: &Box) -> Result { match $chain_spec.identify() { @@ -407,7 +408,9 @@ pub fn run() -> Result<()> { | BenchmarkCmd::Storage(_) | BenchmarkCmd::Overhead(_) => Err("Unsupported benchmarking command".into()), BenchmarkCmd::Machine(cmd) => { - return runner.sync_run(|config| cmd.run(&config)); + return runner.sync_run(|config| { + cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()) + }); } } } else { @@ -434,7 +437,7 @@ pub fn run() -> Result<()> { let id = cli.parachain_id.unwrap_or(10001).into(); let parachain_account = - AccountIdConversion::::into_account(&id); + AccountIdConversion::::into_account_truncating(&id); let state_version = Cli::native_runtime_version(&config.chain_spec).state_version(); let block: Block = generate_genesis_block(&config.chain_spec, state_version) diff --git a/src/main.rs b/src/main.rs index eda2d5d43a..fb110b6936 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,7 @@ //! Centrifuge Chain Node CLI library. #![warn(missing_docs)] +mod api; mod chain_spec; mod rpc; #[macro_use] diff --git a/src/rpc/mod.rs b/src/rpc.rs similarity index 71% rename from src/rpc/mod.rs rename to src/rpc.rs index b737a7bbdc..9b9404678b 100644 --- a/src/rpc/mod.rs +++ b/src/rpc.rs @@ -12,7 +12,7 @@ //! Centrifuge specific rpc endpoints (common endpoints across all environments) -use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; +use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; use runtime_common::{AccountId, Balance, Index}; use sc_rpc_api::DenyUnsafe; use sc_service::TransactionPool; @@ -20,34 +20,17 @@ use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; use std::sync::Arc; -use substrate_frame_rpc_system::{FullSystem, SystemApi}; - -pub mod anchor; -pub mod pools; +use substrate_frame_rpc_system::{System, SystemApiServer}; /// A type representing all RPC extensions. -pub type RpcExtension = jsonrpc_core::IoHandler; - -/// Error type of our RPC methods -pub enum Error { - /// The call to runtime failed. - RuntimeError, -} - -impl From for i64 { - fn from(e: Error) -> i64 { - match e { - Error::RuntimeError => 1, - } - } -} +pub type RpcExtension = jsonrpsee::RpcModule<()>; /// Instantiate all Full RPC extensions. pub fn create_full( client: Arc, pool: Arc

, deny_unsafe: DenyUnsafe, -) -> RpcExtension +) -> Result> where Block: sp_api::BlockT, C: ProvideRuntimeApi, @@ -58,17 +41,10 @@ where C::Api: BlockBuilder, P: TransactionPool + Sync + Send + 'static, { - let mut io = jsonrpc_core::IoHandler::default(); - - io.extend_with(SystemApi::to_delegate(FullSystem::new( - client.clone(), - pool, - deny_unsafe, - ))); + let mut module = RpcExtension::new(()); - io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new( - client.clone(), - ))); + module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?; + module.merge(TransactionPayment::new(client.clone()).into_rpc())?; - io + Ok(module) } diff --git a/src/rpc/anchor.rs b/src/rpc/anchor.rs deleted file mode 100644 index 75a0eba5a0..0000000000 --- a/src/rpc/anchor.rs +++ /dev/null @@ -1,58 +0,0 @@ -use codec::Codec; -use jsonrpc_core::{Error as RpcError, ErrorCode, Result}; -use jsonrpc_derive::rpc; -use pallet_anchors::AnchorData; -use runtime_common::AnchorApi as AnchorRuntimeApi; -use sp_api::ProvideRuntimeApi; -use sp_blockchain::HeaderBackend; -use sp_runtime::{generic::BlockId, traits::Block as BlockT}; -use std::sync::Arc; - -#[rpc] -pub trait AnchorApi { - /// Returns an anchor given an anchor id from the runtime storage - #[rpc(name = "anchor_getAnchorById")] - fn get_anchor_by_id(&self, id: Hash) -> Result>; -} - -pub struct Anchor { - client: Arc, - _marker: std::marker::PhantomData

, -} - -impl Anchor { - pub fn new(client: Arc) -> Self { - Anchor { - client, - _marker: Default::default(), - } - } -} - -impl AnchorApi> for Anchor -where - Block: BlockT, - C: Send + Sync + 'static + ProvideRuntimeApi + HeaderBackend, - C::Api: AnchorRuntimeApi>, - Hash: Codec + Clone + sp_std::fmt::Debug, -{ - fn get_anchor_by_id( - &self, - id: Hash, - ) -> Result>> { - let api = self.client.runtime_api(); - let best = self.client.info().best_hash; - let at = BlockId::hash(best); - api.get_anchor_by_id(&at, id.clone()) - .map_err(|e| RpcError { - code: ErrorCode::ServerError(crate::rpc::Error::RuntimeError.into()), - message: "Unable to query anchor by id.".into(), - data: Some(format!("{:?}", e).into()), - })? - .ok_or(RpcError { - code: jsonrpc_core::ErrorCode::InternalError, - message: "Unable to find anchor".into(), - data: Some(format!("{:?}", id).into()), - }) - } -} diff --git a/src/rpc/pools.rs b/src/rpc/pools.rs deleted file mode 100644 index 5dc5a79bb6..0000000000 --- a/src/rpc/pools.rs +++ /dev/null @@ -1,197 +0,0 @@ -use codec::Codec; -use jsonrpc_core::{Error as RpcError, ErrorCode, Result}; -use jsonrpc_derive::rpc; -use pallet_pools::{EpochSolution, TrancheIndex, TrancheLoc, TrancheSolution}; -use runtime_common::apis::PoolsApi as PoolsRuntimeApi; -use sp_api::ProvideRuntimeApi; -use sp_blockchain::HeaderBackend; -use sp_runtime::{generic::BlockId, traits::Block as BlockT}; -use std::fmt::Debug; -use std::sync::Arc; - -#[rpc] -pub trait PoolsApi { - #[rpc(name = "pools_currency")] - fn currency(&self, poold_id: PoolId) -> Result; - - #[rpc(name = "pools_inspectEpochSolution")] - fn inspect_epoch_solution( - &self, - pool_id: PoolId, - solution: Vec, - ) -> Result>; - - #[rpc(name = "pools_trancheTokenPrice")] - fn tranche_token_price(&self, pool_id: PoolId, tranche: TrancheId) -> Result; - - #[rpc(name = "pools_trancheTokenPrices")] - fn tranche_token_prices(&self, pool_id: PoolId) -> Result>; - - #[rpc(name = "pools_trancheIds")] - fn tranche_ids(&self, pool_id: PoolId) -> Result>; - - #[rpc(name = "pools_trancheId")] - fn tranche_id(&self, pool_id: PoolId, tranche_index: TrancheIndex) -> Result; - - #[rpc(name = "pools_trancheCurrency")] - fn tranche_currency(&self, pool_id: PoolId, tranche_id: TrancheId) -> Result; -} - -pub struct Pools { - client: Arc, - _marker: std::marker::PhantomData

, -} - -impl Pools { - pub fn new(client: Arc) -> Self { - Pools { - client, - _marker: Default::default(), - } - } -} - -impl - PoolsApi for Pools -where - Block: BlockT, - C: Send + Sync + 'static + ProvideRuntimeApi + HeaderBackend, - C::Api: PoolsRuntimeApi, - Balance: Codec + Copy, - PoolId: Codec + Copy + Debug, - TrancheId: Codec + Clone + Debug, - Currency: Codec, - BalanceRatio: Codec, -{ - fn currency(&self, pool_id: PoolId) -> Result { - let api = self.client.runtime_api(); - let best = self.client.info().best_hash; - let at = BlockId::hash(best); - - api.currency(&at, pool_id) - .map_err(|e| RpcError { - code: ErrorCode::ServerError(crate::rpc::Error::RuntimeError.into()), - message: "Unable to query currency of pool.".into(), - data: Some(format!("{:?}", e).into()), - })? - .ok_or(RpcError { - code: ErrorCode::InvalidParams, - message: "Pool not found.".into(), - data: Some(format!("PoolId: {:?}", pool_id).into()), - }) - } - - fn inspect_epoch_solution( - &self, - pool_id: PoolId, - solution: Vec, - ) -> Result> { - let api = self.client.runtime_api(); - let best = self.client.info().best_hash; - let at = BlockId::hash(best); - - api.inspect_epoch_solution(&at, pool_id, solution.clone()) - .map_err(|e| RpcError { - code: ErrorCode::ServerError(crate::rpc::Error::RuntimeError.into()), - message: "Unable to query inspection for epoch solution.".into(), - data: Some(format!("{:?}", e).into()), - })? - .ok_or(RpcError { - code: ErrorCode::InvalidParams, - message: "Pool not found or invalid solution.".into(), - data: Some(format!("PoolId: {:?}, Solution: {:?}", pool_id, solution).into()), - }) - } - - fn tranche_token_price(&self, pool_id: PoolId, tranche_id: TrancheId) -> Result { - let api = self.client.runtime_api(); - let best = self.client.info().best_hash; - let at = BlockId::hash(best); - - api.tranche_token_price(&at, pool_id, TrancheLoc::Id(tranche_id.clone())) - .map_err(|e| RpcError { - code: ErrorCode::ServerError(crate::rpc::Error::RuntimeError.into()), - message: "Unable to query tranche token price.".into(), - data: Some(format!("{:?}", e).into()), - })? - .ok_or(RpcError { - code: ErrorCode::InvalidParams, - message: "Pool or tranche not found.".into(), - data: Some(format!("PoolId: {:?}, TrancheId: {:?}", pool_id, tranche_id).into()), - }) - } - - fn tranche_token_prices(&self, pool_id: PoolId) -> Result> { - let api = self.client.runtime_api(); - let best = self.client.info().best_hash; - let at = BlockId::hash(best); - - api.tranche_token_prices(&at, pool_id) - .map_err(|e| RpcError { - code: ErrorCode::ServerError(crate::rpc::Error::RuntimeError.into()), - message: "Unable to query tranche token prices.".into(), - data: Some(format!("{:?}", e).into()), - })? - .ok_or(RpcError { - code: ErrorCode::InvalidParams, - message: "Pool not found.".into(), - data: Some(format!("PoolId: {:?}", pool_id).into()), - }) - } - - fn tranche_ids(&self, pool_id: PoolId) -> Result> { - let api = self.client.runtime_api(); - let best = self.client.info().best_hash; - let at = BlockId::hash(best); - - api.tranche_ids(&at, pool_id) - .map_err(|e| RpcError { - code: ErrorCode::ServerError(crate::rpc::Error::RuntimeError.into()), - message: "Unable to query tranche ids.".into(), - data: Some(format!("{:?}", e).into()), - })? - .ok_or(RpcError { - code: ErrorCode::InvalidParams, - message: "Pool not found.".into(), - data: Some(format!("PoolId: {:?}", pool_id).into()), - }) - } - - fn tranche_id(&self, pool_id: PoolId, tranche_index: TrancheIndex) -> Result { - let api = self.client.runtime_api(); - let best = self.client.info().best_hash; - let at = BlockId::hash(best); - - api.tranche_id(&at, pool_id, tranche_index) - .map_err(|e| RpcError { - code: ErrorCode::ServerError(crate::rpc::Error::RuntimeError.into()), - message: "Unable to query tranche ids.".into(), - data: Some(format!("{:?}", e).into()), - })? - .ok_or(RpcError { - code: ErrorCode::InvalidParams, - message: "Pool or tranche not found.".into(), - data: Some( - format!("PoolId: {:?}, TrancheIndex: {:?}", pool_id, tranche_index).into(), - ), - }) - } - - fn tranche_currency(&self, pool_id: PoolId, tranche_id: TrancheId) -> Result { - let api = self.client.runtime_api(); - let best = self.client.info().best_hash; - let at = BlockId::hash(best); - - api.tranche_currency(&at, pool_id, TrancheLoc::Id(tranche_id.clone())) - .map_err(|e| RpcError { - code: ErrorCode::ServerError(crate::rpc::Error::RuntimeError.into()), - message: "Unable to query tranche currency.".into(), - data: Some(format!("{:?}", e).into()), - })? - .ok_or(RpcError { - code: ErrorCode::InvalidParams, - message: "Pool or tranche not found.".into(), - data: Some(format!("PoolId: {:?}, TrancheId: {:?}", pool_id, tranche_id).into()), - }) - } -} diff --git a/src/service.rs b/src/service.rs index 742b866546..485d8ca122 100644 --- a/src/service.rs +++ b/src/service.rs @@ -15,11 +15,8 @@ // along with Cumulus. If not, see . use crate::{ + api::{AnchorApiServer, AnchorRpc}, cli::RpcConfig, - rpc::{ - anchor::{Anchor, AnchorApi}, - pools::{Pools, PoolsApi}, - }, }; use cumulus_client_cli::CollatorOptions; @@ -262,7 +259,7 @@ where >, >, DenyUnsafe, - ) -> Result, sc_service::Error> + ) -> Result + Send + Sync + 'static, @@ -313,6 +310,7 @@ where ¶chain_config, telemetry_worker_handle, &mut task_manager, + None, ) .map_err(|e| match e { RelayChainError::ServiceError(polkadot_service::Error::Sub(x)) => x, @@ -340,12 +338,10 @@ where let rpc_client = client.clone(); let pool = transaction_pool.clone(); - let rpc_extensions_builder = Box::new(move |deny, _subscription_executor| { - rpc_ext_builder(rpc_client.clone(), pool.clone(), deny) - }); + let rpc_builder = { move |deny, _| rpc_ext_builder(rpc_client.clone(), pool.clone(), deny) }; sc_service::spawn_tasks(sc_service::SpawnTasksParams { - rpc_extensions_builder, + rpc_builder: Box::new(rpc_builder), client: client.clone(), transaction_pool: transaction_pool.clone(), task_manager: &mut task_manager, @@ -495,9 +491,11 @@ pub async fn start_altair_node( id, rpc_config, |client, pool, deny_unsafe| { - let mut io = crate::rpc::create_full(client.clone(), pool, deny_unsafe); - io.extend_with(AnchorApi::to_delegate(Anchor::new(client))); - Ok(io) + let mut module = crate::rpc::create_full(client.clone(), pool, deny_unsafe)?; + module + .merge(AnchorRpc::new(client.clone()).into_rpc()) + .map_err(|e| sc_service::Error::Application(e.into()))?; + Ok(module) }, build_altair_import_queue, |client, @@ -651,9 +649,11 @@ pub async fn start_centrifuge_node( id, rpc_config, |client, pool, deny_unsafe| { - let mut io = crate::rpc::create_full(client.clone(), pool, deny_unsafe); - io.extend_with(AnchorApi::to_delegate(Anchor::new(client))); - Ok(io) + let mut module = crate::rpc::create_full(client.clone(), pool, deny_unsafe)?; + module + .merge(AnchorRpc::new(client.clone()).into_rpc()) + .map_err(|e| sc_service::Error::Application(e.into()))?; + Ok(module) }, build_centrifuge_import_queue, |client, @@ -801,17 +801,29 @@ pub async fn start_development_node( >, >, )> { + // let rpc_builder = { + // let client = client.clone(); + // move |_, _| { + // let deps = crate::rpc::FullDeps { + // client: client.clone(), + // command_sink: rpc_sink.clone(), + // _marker: Default::default(), + // }; + // crate::rpc::create_full(deps).map_err(Into::into) + // } + // }; + start_node_impl::( parachain_config, polkadot_config, id, rpc_config, |client, pool, deny_unsafe| { - let mut io = crate::rpc::create_full(client.clone(), pool, deny_unsafe); - io.extend_with(AnchorApi::to_delegate(Anchor::new(client.clone()))); - io.extend_with(PoolsApi::to_delegate(Pools::new(client))); - - Ok(io) + let mut module = crate::rpc::create_full(client.clone(), pool, deny_unsafe)?; + module + .merge(AnchorRpc::new(client.clone()).into_rpc()) + .map_err(|e| sc_service::Error::Application(e.into()))?; + Ok(module) }, build_development_import_queue, |client,