From aec7f47a24f0a3b462188bb3d4f7da18051b8903 Mon Sep 17 00:00:00 2001
From: Zeke Mostov <32168567+emostov@users.noreply.github.com>
Date: Mon, 23 Aug 2021 17:56:38 -0700
Subject: [PATCH] substrate #9202 companion: Multiple vesting schedules (#3407)
* substrate #9202 companion: Multiple vesting schedules
* Update weights inline with substrate updates
* Use 28 vesting schedules
* Add MaxSchedulesParam everywhere
* Fix var name errors
* rever accidental changes to test-runtime
* try merge origin master
* Revert "try merge origin master"
This reverts commit 398d65d1ac6fad1112f94de3d8c351bcf33aa5a0.
* update to pass integrity test
* Make integrity tests work
* Revert const to storage MinVestedTransfer
* Use MAX_VESTING_SCHEDULES const
* Update Cargo.lock to make it compile
* update Substrate
Co-authored-by: parity-processbot <>
---
polkadot/Cargo.lock | 357 ++++++++----------
polkadot/runtime/common/src/claims.rs | 3 +-
polkadot/runtime/common/src/purchase.rs | 3 +-
polkadot/runtime/kusama/src/lib.rs | 1 +
.../kusama/src/weights/pallet_vesting.rs | 77 ++--
polkadot/runtime/polkadot/src/lib.rs | 1 +
.../polkadot/src/weights/pallet_vesting.rs | 75 ++--
polkadot/runtime/test-runtime/src/lib.rs | 1 +
polkadot/runtime/westend/src/lib.rs | 1 +
.../westend/src/weights/pallet_vesting.rs | 76 ++--
10 files changed, 324 insertions(+), 271 deletions(-)
diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index f55eca42ee6..d492f719e4e 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -445,12 +445,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83"
-[[package]]
-name = "base64"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
-
[[package]]
name = "base64"
version = "0.12.3"
@@ -572,9 +566,9 @@ dependencies = [
[[package]]
name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitvec"
@@ -1529,9 +1523,9 @@ dependencies = [
[[package]]
name = "directories"
-version = "3.0.1"
+version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f"
+checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7"
dependencies = [
"dirs-sys",
]
@@ -1548,12 +1542,12 @@ dependencies = [
[[package]]
name = "dirs-sys"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
+checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
dependencies = [
"libc",
- "redox_users 0.3.4",
+ "redox_users",
"winapi 0.3.9",
]
@@ -1564,7 +1558,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
dependencies = [
"libc",
- "redox_users 0.4.0",
+ "redox_users",
"winapi 0.3.9",
]
@@ -1923,7 +1917,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
]
@@ -1941,7 +1935,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -1960,7 +1954,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"Inflector",
"chrono",
@@ -1986,7 +1980,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -1999,7 +1993,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -2014,7 +2008,7 @@ dependencies = [
[[package]]
name = "frame-metadata"
version = "14.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
"serde",
@@ -2025,7 +2019,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"bitflags",
"frame-metadata",
@@ -2051,7 +2045,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"Inflector",
"frame-support-procedural-tools",
@@ -2063,7 +2057,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate 1.0.0",
@@ -2075,7 +2069,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"proc-macro2",
"quote",
@@ -2085,7 +2079,7 @@ dependencies = [
[[package]]
name = "frame-support-test"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-metadata",
"frame-support",
@@ -2106,7 +2100,7 @@ dependencies = [
[[package]]
name = "frame-support-test-pallet"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -2116,7 +2110,7 @@ dependencies = [
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"log",
@@ -2132,7 +2126,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2146,7 +2140,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2155,7 +2149,7 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"sp-api",
@@ -4554,7 +4548,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -4569,7 +4563,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -4583,7 +4577,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4606,7 +4600,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4661,7 +4655,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4739,7 +4733,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4755,7 +4749,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4770,7 +4764,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -4793,7 +4787,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4810,7 +4804,7 @@ dependencies = [
[[package]]
name = "pallet-gilt"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4824,7 +4818,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4846,7 +4840,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -4861,7 +4855,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4880,7 +4874,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4896,7 +4890,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4911,7 +4905,7 @@ dependencies = [
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"ckb-merkle-mountain-range",
"frame-benchmarking",
@@ -4928,7 +4922,7 @@ dependencies = [
[[package]]
name = "pallet-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -4944,7 +4938,7 @@ dependencies = [
[[package]]
name = "pallet-mmr-rpc"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -4961,7 +4955,7 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4975,7 +4969,7 @@ dependencies = [
[[package]]
name = "pallet-nicks"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -4988,7 +4982,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -5004,7 +4998,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5026,7 +5020,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5040,7 +5034,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -5053,7 +5047,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5068,7 +5062,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -5088,7 +5082,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5104,7 +5098,7 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -5117,7 +5111,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5139,7 +5133,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"proc-macro-crate 1.0.0",
"proc-macro2",
@@ -5150,7 +5144,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"log",
"sp-arithmetic",
@@ -5159,7 +5153,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -5172,7 +5166,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5189,7 +5183,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5204,7 +5198,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-support",
"frame-system",
@@ -5220,7 +5214,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -5237,7 +5231,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -5248,7 +5242,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5264,7 +5258,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5279,11 +5273,12 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-benchmarking",
"frame-support",
"frame-system",
+ "log",
"parity-scale-codec",
"sp-runtime",
"sp-std",
@@ -7705,17 +7700,6 @@ dependencies = [
"bitflags",
]
-[[package]]
-name = "redox_users"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
-dependencies = [
- "getrandom 0.1.14",
- "redox_syscall 0.1.56",
- "rust-argon2",
-]
-
[[package]]
name = "redox_users"
version = "0.4.0"
@@ -7814,7 +7798,7 @@ dependencies = [
[[package]]
name = "remote-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"env_logger 0.9.0",
"jsonrpsee-proc-macros",
@@ -7826,6 +7810,7 @@ dependencies = [
"sp-core",
"sp-io",
"sp-runtime",
+ "sp-version",
]
[[package]]
@@ -7969,18 +7954,6 @@ dependencies = [
"winapi 0.3.9",
]
-[[package]]
-name = "rust-argon2"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
-dependencies = [
- "base64 0.11.0",
- "blake2b_simd",
- "constant_time_eq",
- "crossbeam-utils 0.7.2",
-]
-
[[package]]
name = "rustc-demangle"
version = "0.1.16"
@@ -8096,7 +8069,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"log",
"sp-core",
@@ -8107,7 +8080,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"derive_more",
@@ -8117,7 +8090,7 @@ dependencies = [
"libp2p",
"log",
"parity-scale-codec",
- "prost 0.7.0",
+ "prost 0.8.0",
"prost-build 0.7.0",
"rand 0.7.3",
"sc-client-api",
@@ -8134,7 +8107,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"futures 0.3.16",
"futures-timer 3.0.2",
@@ -8157,7 +8130,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -8173,7 +8146,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -8189,7 +8162,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"proc-macro-crate 1.0.0",
"proc-macro2",
@@ -8200,7 +8173,7 @@ dependencies = [
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"chrono",
"fdlimit",
@@ -8238,7 +8211,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"fnv",
"futures 0.3.16",
@@ -8266,7 +8239,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"hash-db",
"kvdb",
@@ -8291,7 +8264,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -8315,7 +8288,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"derive_more",
@@ -8358,7 +8331,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"derive_more",
"futures 0.3.16",
@@ -8382,7 +8355,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -8395,7 +8368,7 @@ dependencies = [
[[package]]
name = "sc-consensus-manual-seal"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"assert_matches",
"async-trait",
@@ -8429,7 +8402,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -8455,7 +8428,7 @@ dependencies = [
[[package]]
name = "sc-consensus-uncles"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"sc-client-api",
"sp-authorship",
@@ -8466,7 +8439,7 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"lazy_static",
"libsecp256k1 0.6.0",
@@ -8492,7 +8465,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"derive_more",
"parity-scale-codec",
@@ -8509,7 +8482,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"log",
"parity-scale-codec",
@@ -8525,7 +8498,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -8544,7 +8517,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"derive_more",
@@ -8581,7 +8554,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"derive_more",
"finality-grandpa",
@@ -8605,7 +8578,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"ansi_term 0.12.1",
"futures 0.3.16",
@@ -8622,7 +8595,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"derive_more",
@@ -8637,7 +8610,7 @@ dependencies = [
[[package]]
name = "sc-light"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"hash-db",
"parity-scale-codec",
@@ -8655,7 +8628,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-std",
"async-trait",
@@ -8679,7 +8652,7 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.11.1",
"pin-project 1.0.8",
- "prost 0.7.0",
+ "prost 0.8.0",
"prost-build 0.7.0",
"rand 0.7.3",
"sc-block-builder",
@@ -8706,7 +8679,7 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"futures 0.3.16",
"futures-timer 3.0.2",
@@ -8722,7 +8695,7 @@ dependencies = [
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"bytes 1.0.1",
"fnv",
@@ -8749,7 +8722,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"futures 0.3.16",
"libp2p",
@@ -8762,7 +8735,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -8771,7 +8744,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"futures 0.3.16",
"hash-db",
@@ -8802,7 +8775,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"derive_more",
"futures 0.3.16",
@@ -8827,7 +8800,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"futures 0.3.16",
"jsonrpc-core",
@@ -8843,7 +8816,7 @@ dependencies = [
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"directories",
@@ -8907,7 +8880,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"log",
"parity-scale-codec",
@@ -8921,7 +8894,7 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -8943,7 +8916,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"chrono",
"futures 0.3.16",
@@ -8961,7 +8934,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"ansi_term 0.12.1",
"atty",
@@ -8992,7 +8965,7 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"proc-macro-crate 1.0.0",
"proc-macro2",
@@ -9003,7 +8976,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"futures 0.3.16",
"intervalier",
@@ -9030,7 +9003,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"derive_more",
"futures 0.3.16",
@@ -9464,7 +9437,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"hash-db",
"log",
@@ -9481,7 +9454,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"blake2-rfc",
"proc-macro-crate 1.0.0",
@@ -9493,7 +9466,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
"serde",
@@ -9505,7 +9478,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -9519,7 +9492,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -9531,7 +9504,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -9543,7 +9516,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -9555,7 +9528,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"futures 0.3.16",
"log",
@@ -9573,7 +9546,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -9592,7 +9565,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"merlin",
@@ -9614,7 +9587,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
"sp-arithmetic",
@@ -9624,7 +9597,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
"schnorrkel",
@@ -9636,7 +9609,7 @@ dependencies = [
[[package]]
name = "sp-core"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"base58",
"blake2-rfc",
@@ -9680,7 +9653,7 @@ dependencies = [
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"kvdb",
"parking_lot 0.11.1",
@@ -9689,7 +9662,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"proc-macro2",
"quote",
@@ -9699,7 +9672,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -9710,7 +9683,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"finality-grandpa",
"log",
@@ -9727,7 +9700,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -9741,7 +9714,7 @@ dependencies = [
[[package]]
name = "sp-io"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"futures 0.3.16",
"hash-db",
@@ -9766,7 +9739,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"lazy_static",
"sp-core",
@@ -9777,7 +9750,7 @@ dependencies = [
[[package]]
name = "sp-keystore"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"derive_more",
@@ -9794,7 +9767,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"ruzstd",
"zstd",
@@ -9803,7 +9776,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
"serde",
@@ -9816,7 +9789,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections-solution-type"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"proc-macro-crate 1.0.0",
"proc-macro2",
@@ -9827,7 +9800,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"sp-api",
"sp-core",
@@ -9837,7 +9810,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"backtrace",
]
@@ -9845,7 +9818,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"rustc-hash",
"serde",
@@ -9855,7 +9828,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"either",
"hash256-std-hasher",
@@ -9876,7 +9849,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -9893,7 +9866,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"Inflector",
"proc-macro-crate 1.0.0",
@@ -9905,7 +9878,7 @@ dependencies = [
[[package]]
name = "sp-serializer"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"serde",
"serde_json",
@@ -9914,7 +9887,7 @@ dependencies = [
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -9927,7 +9900,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -9937,7 +9910,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"hash-db",
"log",
@@ -9960,12 +9933,12 @@ dependencies = [
[[package]]
name = "sp-std"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
[[package]]
name = "sp-storage"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -9978,7 +9951,7 @@ dependencies = [
[[package]]
name = "sp-tasks"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"log",
"sp-core",
@@ -9991,7 +9964,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"futures-timer 3.0.2",
@@ -10007,7 +9980,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"erased-serde",
"log",
@@ -10025,7 +9998,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"sp-api",
"sp-runtime",
@@ -10034,7 +10007,7 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"log",
@@ -10049,7 +10022,7 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"hash-db",
"memory-db",
@@ -10063,7 +10036,7 @@ dependencies = [
[[package]]
name = "sp-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"futures 0.3.16",
"futures-timer 3.0.2",
@@ -10074,7 +10047,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -10089,7 +10062,7 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"parity-scale-codec",
"proc-macro2",
@@ -10100,7 +10073,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -10298,7 +10271,7 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"platforms",
]
@@ -10306,7 +10279,7 @@ dependencies = [
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-system-rpc-runtime-api",
"futures 0.3.16",
@@ -10328,7 +10301,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-std",
"derive_more",
@@ -10342,7 +10315,7 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -10369,7 +10342,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"futures 0.3.16",
"substrate-test-utils-derive",
@@ -10379,7 +10352,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"proc-macro-crate 1.0.0",
"quote",
@@ -10389,7 +10362,7 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"ansi_term 0.12.1",
"build-helper",
@@ -10544,7 +10517,7 @@ dependencies = [
[[package]]
name = "test-runner"
version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"frame-system",
"futures 0.3.16",
@@ -10995,7 +10968,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#74e839b8690725873423885bef2e0af7d878fc6e"
+source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415"
dependencies = [
"log",
"parity-scale-codec",
diff --git a/polkadot/runtime/common/src/claims.rs b/polkadot/runtime/common/src/claims.rs
index d6c13476693..60d9a0aa9e8 100644
--- a/polkadot/runtime/common/src/claims.rs
+++ b/polkadot/runtime/common/src/claims.rs
@@ -773,7 +773,7 @@ mod tests {
}
parameter_types! {
- pub const MinVestedTransfer: u64 = 0;
+ pub const MinVestedTransfer: u64 = 1;
}
impl pallet_vesting::Config for Test {
@@ -782,6 +782,7 @@ mod tests {
type BlockNumberToBalance = Identity;
type MinVestedTransfer = MinVestedTransfer;
type WeightInfo = ();
+ const MAX_VESTING_SCHEDULES: u32 = 28;
}
parameter_types! {
diff --git a/polkadot/runtime/common/src/purchase.rs b/polkadot/runtime/common/src/purchase.rs
index 3aaa069d943..f2b2a7a299b 100644
--- a/polkadot/runtime/common/src/purchase.rs
+++ b/polkadot/runtime/common/src/purchase.rs
@@ -539,7 +539,7 @@ mod tests {
}
parameter_types! {
- pub const MinVestedTransfer: u64 = 0;
+ pub const MinVestedTransfer: u64 = 1;
}
impl pallet_vesting::Config for Test {
@@ -548,6 +548,7 @@ mod tests {
type BlockNumberToBalance = Identity;
type MinVestedTransfer = MinVestedTransfer;
type WeightInfo = ();
+ const MAX_VESTING_SCHEDULES: u32 = 28;
}
parameter_types! {
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index 350d70a94a7..ede28280b21 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -951,6 +951,7 @@ impl pallet_vesting::Config for Runtime {
type BlockNumberToBalance = ConvertInto;
type MinVestedTransfer = MinVestedTransfer;
type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
+ const MAX_VESTING_SCHEDULES: u32 = 28;
}
parameter_types! {
diff --git a/polkadot/runtime/kusama/src/weights/pallet_vesting.rs b/polkadot/runtime/kusama/src/weights/pallet_vesting.rs
index f98b5148fd0..8f5ee20edc3 100644
--- a/polkadot/runtime/kusama/src/weights/pallet_vesting.rs
+++ b/polkadot/runtime/kusama/src/weights/pallet_vesting.rs
@@ -42,46 +42,71 @@ use sp_std::marker::PhantomData;
/// Weight functions for `pallet_vesting`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
- fn vest_locked(l: u32) -> Weight {
- (42_136_000 as Weight)
- // Standard Error: 16_000
- .saturating_add((235_000 as Weight).saturating_mul(l as Weight))
+ fn vest_locked(l: u32, s: u32, ) -> Weight {
+ (93_789_000 as Weight)
+ // Standard Error: 70_000
+ .saturating_add((41_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 182_000
+ .saturating_add((211_000 as Weight).saturating_mul(s as Weight))
+
.saturating_add(T::DbWeight::get().reads(2 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
}
- fn vest_unlocked(l: u32) -> Weight {
- (45_276_000 as Weight)
- // Standard Error: 10_000
- .saturating_add((189_000 as Weight).saturating_mul(l as Weight))
+ fn vest_unlocked(_l: u32, s: u32, ) -> Weight {
+ (90_737_000 as Weight)
+ // Standard Error: 0
+ .saturating_add((263_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
- fn vest_other_locked(l: u32) -> Weight {
- (42_030_000 as Weight)
- // Standard Error: 18_000
- .saturating_add((243_000 as Weight).saturating_mul(l as Weight))
+ fn vest_other_locked(l: u32, s: u32, ) -> Weight {
+ (85_211_000 as Weight)
+ // Standard Error: 17_000
+ .saturating_add((153_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 45_000
+ .saturating_add((289_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
- .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
}
- fn vest_other_unlocked(l: u32) -> Weight {
- (45_211_000 as Weight)
- // Standard Error: 10_000
- .saturating_add((191_000 as Weight).saturating_mul(l as Weight))
+ fn vest_other_unlocked(l: u32, s: u32, ) -> Weight {
+ (90_368_000 as Weight)
+ // Standard Error: 17_000
+ .saturating_add((31_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 45_000
+ .saturating_add((132_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
- fn vested_transfer(l: u32) -> Weight {
- (100_375_000 as Weight)
- // Standard Error: 13_000
- .saturating_add((136_000 as Weight).saturating_mul(l as Weight))
+ fn vested_transfer(l: u32, _s: u32, ) -> Weight {
+ (167_500_000 as Weight)
+ // Standard Error: 194_000
+ .saturating_add((255_000 as Weight).saturating_mul(l as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
- fn force_vested_transfer(l: u32) -> Weight {
- (100_907_000 as Weight)
- // Standard Error: 12_000
- .saturating_add((101_000 as Weight).saturating_mul(l as Weight))
+ fn force_vested_transfer(l: u32, _s: u32, ) -> Weight {
+ (174_000_000 as Weight)
+ // Standard Error: 70_000
+ .saturating_add((143_000 as Weight).saturating_mul(l as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
+ fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
+ (101_778_000 as Weight)
+ // Standard Error: 17_000
+ .saturating_add((194_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 48_000
+ .saturating_add((361_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ }
+ fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
+ (104_111_000 as Weight)
+ // Standard Error: 88_000
+ .saturating_add((276_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 240_000
+ .saturating_add((194_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ }
}
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index ea4d64f133a..8e5eb277685 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -861,6 +861,7 @@ impl pallet_vesting::Config for Runtime {
type BlockNumberToBalance = ConvertInto;
type MinVestedTransfer = MinVestedTransfer;
type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
+ const MAX_VESTING_SCHEDULES: u32 = 28;
}
impl pallet_utility::Config for Runtime {
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_vesting.rs b/polkadot/runtime/polkadot/src/weights/pallet_vesting.rs
index 4de01dc16ca..67e71acb239 100644
--- a/polkadot/runtime/polkadot/src/weights/pallet_vesting.rs
+++ b/polkadot/runtime/polkadot/src/weights/pallet_vesting.rs
@@ -42,46 +42,71 @@ use sp_std::marker::PhantomData;
/// Weight functions for `pallet_vesting`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
- fn vest_locked(l: u32) -> Weight {
- (41_282_000 as Weight)
- // Standard Error: 14_000
- .saturating_add((225_000 as Weight).saturating_mul(l as Weight))
+ fn vest_locked(l: u32, s: u32, ) -> Weight {
+ (93_789_000 as Weight)
+ // Standard Error: 70_000
+ .saturating_add((41_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 182_000
+ .saturating_add((211_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
}
- fn vest_unlocked(l: u32) -> Weight {
- (44_048_000 as Weight)
- // Standard Error: 10_000
- .saturating_add((192_000 as Weight).saturating_mul(l as Weight))
+ fn vest_unlocked(_l: u32, s: u32, ) -> Weight {
+ (90_737_000 as Weight)
+ // Standard Error: 0
+ .saturating_add((263_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
- fn vest_other_locked(l: u32) -> Weight {
- (40_722_000 as Weight)
+ fn vest_other_locked(l: u32, s: u32, ) -> Weight {
+ (85_211_000 as Weight)
// Standard Error: 17_000
- .saturating_add((242_000 as Weight).saturating_mul(l as Weight))
+ .saturating_add((153_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 45_000
+ .saturating_add((289_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
- .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
}
- fn vest_other_unlocked(l: u32) -> Weight {
- (43_752_000 as Weight)
- // Standard Error: 14_000
- .saturating_add((215_000 as Weight).saturating_mul(l as Weight))
+ fn vest_other_unlocked(l: u32, s: u32, ) -> Weight {
+ (90_368_000 as Weight)
+ // Standard Error: 17_000
+ .saturating_add((31_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 45_000
+ .saturating_add((132_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
- fn vested_transfer(l: u32) -> Weight {
- (97_642_000 as Weight)
- // Standard Error: 13_000
- .saturating_add((133_000 as Weight).saturating_mul(l as Weight))
+ fn vested_transfer(l: u32, _s: u32, ) -> Weight {
+ (167_500_000 as Weight)
+ // Standard Error: 194_000
+ .saturating_add((255_000 as Weight).saturating_mul(l as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
- fn force_vested_transfer(l: u32) -> Weight {
- (97_119_000 as Weight)
- // Standard Error: 13_000
- .saturating_add((124_000 as Weight).saturating_mul(l as Weight))
+ fn force_vested_transfer(l: u32, _s: u32, ) -> Weight {
+ (174_000_000 as Weight)
+ // Standard Error: 70_000
+ .saturating_add((143_000 as Weight).saturating_mul(l as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
+ fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
+ (101_778_000 as Weight)
+ // Standard Error: 17_000
+ .saturating_add((194_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 48_000
+ .saturating_add((361_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ }
+ fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
+ (104_111_000 as Weight)
+ // Standard Error: 88_000
+ .saturating_add((276_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 240_000
+ .saturating_add((194_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ }
}
+
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
index fa70d3ee91b..1ca04fbf118 100644
--- a/polkadot/runtime/test-runtime/src/lib.rs
+++ b/polkadot/runtime/test-runtime/src/lib.rs
@@ -442,6 +442,7 @@ impl pallet_vesting::Config for Runtime {
type BlockNumberToBalance = ConvertInto;
type MinVestedTransfer = MinVestedTransfer;
type WeightInfo = ();
+ const MAX_VESTING_SCHEDULES: u32 = 28;
}
impl pallet_sudo::Config for Runtime {
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index dc7604a5ea3..8910e306d54 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -629,6 +629,7 @@ impl pallet_vesting::Config for Runtime {
type BlockNumberToBalance = ConvertInto;
type MinVestedTransfer = MinVestedTransfer;
type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
+ const MAX_VESTING_SCHEDULES: u32 = 28;
}
impl pallet_sudo::Config for Runtime {
diff --git a/polkadot/runtime/westend/src/weights/pallet_vesting.rs b/polkadot/runtime/westend/src/weights/pallet_vesting.rs
index a269923abc6..c2a2df68398 100644
--- a/polkadot/runtime/westend/src/weights/pallet_vesting.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_vesting.rs
@@ -42,46 +42,70 @@ use sp_std::marker::PhantomData;
/// Weight functions for `pallet_vesting`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
- fn vest_locked(l: u32) -> Weight {
- (42_241_000 as Weight)
- // Standard Error: 13_000
- .saturating_add((220_000 as Weight).saturating_mul(l as Weight))
+ fn vest_locked(l: u32, s: u32, ) -> Weight {
+ (93_789_000 as Weight)
+ // Standard Error: 70_000
+ .saturating_add((41_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 182_000
+ .saturating_add((211_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
- .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ .saturating_add(T::DbWeight::get().writes(2 as Weight))
}
- fn vest_unlocked(l: u32) -> Weight {
- (45_263_000 as Weight)
- // Standard Error: 10_000
- .saturating_add((188_000 as Weight).saturating_mul(l as Weight))
+ fn vest_unlocked(_l: u32, s: u32, ) -> Weight {
+ (90_737_000 as Weight)
+ // Standard Error: 0
+ .saturating_add((263_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
- fn vest_other_locked(l: u32) -> Weight {
- (41_538_000 as Weight)
+ fn vest_other_locked(l: u32, s: u32, ) -> Weight {
+ (85_211_000 as Weight)
// Standard Error: 17_000
- .saturating_add((239_000 as Weight).saturating_mul(l as Weight))
+ .saturating_add((153_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 45_000
+ .saturating_add((289_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
- .saturating_add(T::DbWeight::get().writes(2 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
}
- fn vest_other_unlocked(l: u32) -> Weight {
- (44_715_000 as Weight)
- // Standard Error: 13_000
- .saturating_add((207_000 as Weight).saturating_mul(l as Weight))
+ fn vest_other_unlocked(l: u32, s: u32, ) -> Weight {
+ (90_368_000 as Weight)
+ // Standard Error: 17_000
+ .saturating_add((31_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 45_000
+ .saturating_add((132_000 as Weight).saturating_mul(s as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
- fn vested_transfer(l: u32) -> Weight {
- (100_413_000 as Weight)
- // Standard Error: 13_000
- .saturating_add((103_000 as Weight).saturating_mul(l as Weight))
+ fn vested_transfer(l: u32, _s: u32, ) -> Weight {
+ (167_500_000 as Weight)
+ // Standard Error: 194_000
+ .saturating_add((255_000 as Weight).saturating_mul(l as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
- fn force_vested_transfer(l: u32) -> Weight {
- (99_525_000 as Weight)
- // Standard Error: 13_000
- .saturating_add((108_000 as Weight).saturating_mul(l as Weight))
+ fn force_vested_transfer(l: u32, _s: u32, ) -> Weight {
+ (174_000_000 as Weight)
+ // Standard Error: 70_000
+ .saturating_add((143_000 as Weight).saturating_mul(l as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
-}
+ fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
+ (101_778_000 as Weight)
+ // Standard Error: 17_000
+ .saturating_add((194_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 48_000
+ .saturating_add((361_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ }
+ fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
+ (104_111_000 as Weight)
+ // Standard Error: 88_000
+ .saturating_add((276_000 as Weight).saturating_mul(l as Weight))
+ // Standard Error: 240_000
+ .saturating_add((194_000 as Weight).saturating_mul(s as Weight))
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(3 as Weight))
+ }
+}
\ No newline at end of file
--
GitLab