From 953f73c5ff78c31d835ce730f6a2a58c2a72e362 Mon Sep 17 00:00:00 2001 From: Shaun Wang Date: Thu, 20 May 2021 23:46:07 +0000 Subject: [PATCH 1/4] Use polkadot-0.9.2 deps. --- Cargo.dev.toml | 110 +++++++++++++++--------------- auction/Cargo.toml | 12 ++-- authority/Cargo.toml | 16 ++--- authority/src/mock.rs | 6 +- authority/src/tests.rs | 8 +-- benchmarking/Cargo.toml | 18 ++--- currencies/Cargo.toml | 14 ++-- gradually-update/Cargo.toml | 12 ++-- nft/Cargo.toml | 12 ++-- oracle/Cargo.toml | 14 ++-- oracle/rpc/Cargo.toml | 6 +- oracle/rpc/runtime-api/Cargo.toml | 4 +- rewards/Cargo.toml | 12 ++-- tokens/Cargo.toml | 16 ++--- traits/Cargo.toml | 10 +-- unknown-tokens/Cargo.toml | 14 ++-- utilities/Cargo.toml | 10 +-- vesting/Cargo.toml | 14 ++-- xcm-support/Cargo.toml | 10 +-- xtokens/Cargo.toml | 24 +++---- 20 files changed, 169 insertions(+), 173 deletions(-) diff --git a/Cargo.dev.toml b/Cargo.dev.toml index 1447bf3e7..79ea7ce0e 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -27,54 +27,54 @@ resolver = "2" split-debuginfo = "unpacked" [patch.'https://github.com/paritytech/substrate'] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-npos-elections-compact = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-allocator = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } -sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-npos-elections-compact = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-allocator = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } # [patch.'https://github.com/paritytech/cumulus'] # cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" } @@ -83,13 +83,13 @@ sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = # cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" } # [patch.'https://github.com/paritytech/polkadot'] -# xcm = { git = "https://github.com/paritytech//polkadot", rev = "d2fb288389ae3b0689c1c84f977bde532129e658" } -# xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "d2fb288389ae3b0689c1c84f977bde532129e658" } -# xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "d2fb288389ae3b0689c1c84f977bde532129e658" } -# polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "d2fb288389ae3b0689c1c84f977bde532129e658" } -# polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "d2fb288389ae3b0689c1c84f977bde532129e658" } -# polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "d2fb288389ae3b0689c1c84f977bde532129e658" } -# polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "d2fb288389ae3b0689c1c84f977bde532129e658" } +# xcm = { git = "https://github.com/paritytech//polkadot", rev = "f36bb820120e7ed460071acbdd512850348ae901" } +# xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "f36bb820120e7ed460071acbdd512850348ae901" } +# xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "f36bb820120e7ed460071acbdd512850348ae901" } +# polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "f36bb820120e7ed460071acbdd512850348ae901" } +# polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "f36bb820120e7ed460071acbdd512850348ae901" } +# polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "f36bb820120e7ed460071acbdd512850348ae901" } +# polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "f36bb820120e7ed460071acbdd512850348ae901" } # [patch.'https://github.com/shaunxw/xcm-simulator'] # xcm-simulator = { git = "https://github.com/shaunxw//xcm-simulator", rev = "c52bd64a41a51d08bd5a1e27f32c47419b41f3e5" } diff --git a/auction/Cargo.toml b/auction/Cargo.toml index b491a20f0..f26d6dd27 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -10,16 +10,16 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } [features] default = ["std"] diff --git a/authority/Cargo.toml b/authority/Cargo.toml index a37a3c567..f81f64d9b 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -10,17 +10,17 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } [features] default = ["std"] diff --git a/authority/src/mock.rs b/authority/src/mock.rs index 593710bc6..ca8a36f6c 100644 --- a/authority/src/mock.rs +++ b/authority/src/mock.rs @@ -4,11 +4,7 @@ use super::*; use codec::{Decode, Encode}; -use frame_support::{ - parameter_types, - traits::{OnFinalize, OnInitialize}, - weights::Weight, -}; +use frame_support::{parameter_types, weights::Weight}; use frame_system::{ensure_root, ensure_signed, EnsureRoot}; use sp_core::H256; use sp_runtime::{ diff --git a/authority/src/tests.rs b/authority/src/tests.rs index 9777f02a7..f6bdde3a6 100644 --- a/authority/src/tests.rs +++ b/authority/src/tests.rs @@ -84,7 +84,7 @@ fn schedule_dispatch_at_work() { assert!(System::events().iter().any(|record| record.event == event)); run_to_block(2); - let event = mock::Event::pallet_scheduler(pallet_scheduler::RawEvent::Dispatched( + let event = mock::Event::pallet_scheduler(pallet_scheduler::Event::::Dispatched( (2, 0), Some([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), Ok(()), @@ -103,7 +103,7 @@ fn schedule_dispatch_at_work() { assert!(System::events().iter().any(|record| record.event == event)); run_to_block(3); - let event = mock::Event::pallet_scheduler(pallet_scheduler::RawEvent::Dispatched( + let event = mock::Event::pallet_scheduler(pallet_scheduler::Event::::Dispatched( (3, 0), Some([0, 0, 2, 0, 0, 0].to_vec()), Ok(()), @@ -143,7 +143,7 @@ fn schedule_dispatch_after_work() { assert!(System::events().iter().any(|record| record.event == event)); run_to_block(2); - let event = mock::Event::pallet_scheduler(pallet_scheduler::RawEvent::Dispatched( + let event = mock::Event::pallet_scheduler(pallet_scheduler::Event::::Dispatched( (2, 0), Some([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), Ok(()), @@ -162,7 +162,7 @@ fn schedule_dispatch_after_work() { assert!(System::events().iter().any(|record| record.event == event)); run_to_block(3); - let event = mock::Event::pallet_scheduler(pallet_scheduler::RawEvent::Dispatched( + let event = mock::Event::pallet_scheduler(pallet_scheduler::Event::::Dispatched( (3, 0), Some([0, 0, 2, 0, 0, 0].to_vec()), Ok(()), diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index 4eb603d63..fabface55 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -11,17 +11,17 @@ edition = "2018" serde = { version = "1.0.124", optional = true } paste = "1.0" codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } [dev-dependencies] -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } hex-literal = "0.2.1" [features] diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index 4159171f8..599c6f4b4 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -10,19 +10,19 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" } [features] diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index d29f95fca..c26ec059d 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -10,12 +10,12 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } [features] default = ["std"] diff --git a/nft/Cargo.toml b/nft/Cargo.toml index 6f43fcd1d..69fca0513 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -10,15 +10,15 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } [features] default = ["std"] diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index 38ddbbceb..25cddb0d6 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -10,19 +10,19 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } [features] default = ["std"] diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml index 29219a136..1e13df3dc 100644 --- a/oracle/rpc/Cargo.toml +++ b/oracle/rpc/Cargo.toml @@ -11,8 +11,8 @@ codec = { package = "parity-scale-codec", version = "2.0.0" } jsonrpc-core = "15.0.0" jsonrpc-core-client = "15.0.0" jsonrpc-derive = "15.0.0" -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } orml-oracle-rpc-runtime-api = { path = "runtime-api", version = "0.4.1-dev" } diff --git a/oracle/rpc/runtime-api/Cargo.toml b/oracle/rpc/runtime-api/Cargo.toml index 11fc70bff..8fd2193e3 100644 --- a/oracle/rpc/runtime-api/Cargo.toml +++ b/oracle/rpc/runtime-api/Cargo.toml @@ -8,8 +8,8 @@ description = "Runtime API module for orml-oracle-rpc." [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } [features] default = ["std"] diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index d37de37ec..ce3858750 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -10,15 +10,15 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } [features] default = ["std"] diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index 0b07118e6..5abcb5e28 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -10,19 +10,19 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } # Patch doesn't work as `pallet-elections-phragmen` is now 4.0.0 version. Revert `rev` to `statemint` branch after # other `statemint` dependencies upgraded. -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", rev = "3f110196163b5ec03bac5ee188d60bedf3ebd91d" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } [features] default = ["std"] diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 983c97a87..cba983d6c 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -10,14 +10,14 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } impl-trait-for-tuples = "0.2.1" -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } -# xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1", default-features = false } +# xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false } [features] default = ["std"] diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index edc96557f..a8c0962b9 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -10,18 +10,18 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false } orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } [features] default = ["std"] diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index feaa7977a..56a64ca18 100644 --- a/utilities/Cargo.toml +++ b/utilities/Cargo.toml @@ -10,14 +10,14 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } [dev-dependencies] serde_json = "1.0.64" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } [features] default = ["std"] diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index aee913415..962d4c31d 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -10,16 +10,16 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } [features] default = ["std"] diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index f9a32c5d1..d37e54ec3 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -10,13 +10,13 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index 687e3553f..209c1b255 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -10,30 +10,30 @@ edition = "2018" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2", default-features = false } orml-xcm-support = { path = "../xcm-support", default-features = false } orml-traits = { path = "../traits", default-features = false} [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.1" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } xcm-simulator = { git = "https://github.com/shaunxw/xcm-simulator", branch = "master" } cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" } parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.1" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.1" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.2" } orml-tokens = { path = "../tokens", version = "0.4.1-dev" } orml-traits = { path = "../traits", version = "0.4.1-dev" } From 4e782e4d02b487a253b44f52a6dfe3e7a98dbb1c Mon Sep 17 00:00:00 2001 From: Shaun Wang Date: Fri, 21 May 2021 01:31:16 +0000 Subject: [PATCH 2/4] Update dependencies branch in bencher. --- bencher/Cargo.toml | 16 ++++++++-------- weight-meter/Cargo.toml | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index 5c8eeba26..e01ab3616 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -12,14 +12,14 @@ linregress = { version = "0.4.0", optional = true } serde = { version = "1.0.119", optional = true, features = ['derive'] } serde_json = {version = "1.0.64", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"], default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false, optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false, features = ["wasmtime"], optional = true } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false, features = ["with-kvdb-rocksdb"], optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false, optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false, features = ["wasmtime"], optional = true } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false, features = ["with-kvdb-rocksdb"], optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } [features] default = ["std"] diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml index 7ae22ae33..7385cfdeb 100644 --- a/weight-meter/Cargo.toml +++ b/weight-meter/Cargo.toml @@ -10,19 +10,19 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] spin = "0.7.1" -frame-support = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } weight-meter-procedural = { path = "weight-meter-procedural", default-features = false } [dev-dependencies] serde = { version = "1.0.124" } codec = { package = "parity-scale-codec", version = "2.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1"} -frame-system = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2"} +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } [features] default = ["std"] From b4dbc779b19b3c840b097bebf99278c855db1900 Mon Sep 17 00:00:00 2001 From: Shaun Wang Date: Fri, 21 May 2021 01:52:26 +0000 Subject: [PATCH 3/4] Fix bencher. --- Cargo.dev.toml | 1 + bencher/Cargo.toml | 1 + bencher/src/bench_runner.rs | 11 +++++------ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.dev.toml b/Cargo.dev.toml index 918996bd2..a2e1b3370 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -78,6 +78,7 @@ sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e sp-session = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "1d7f6e12c651d776fc0dc1adefd007bb60f60b63" } # [patch.'https://github.com/paritytech/cumulus'] # cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "95d81d499927e508769690fc43a480f00ddd131e" } diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index e01ab3616..a2626aa9f 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -18,6 +18,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0 sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false, optional = true } sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false, features = ["wasmtime"], optional = true } +sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false, features = ["with-kvdb-rocksdb"], optional = true } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } diff --git a/bencher/src/bench_runner.rs b/bencher/src/bench_runner.rs index 26fabc066..1dc7ffffa 100644 --- a/bencher/src/bench_runner.rs +++ b/bencher/src/bench_runner.rs @@ -4,7 +4,7 @@ use frame_benchmarking::{ }; use sc_client_db::BenchmarkingState; use sc_executor::{sp_wasm_interface::HostFunctions, WasmExecutionMethod, WasmExecutor}; -use sp_core::traits::{CallInWasm, MissingHostFunctions}; +use sc_executor_common::runtime_blob::RuntimeBlob; use sp_io::SubstrateHostFunctions; use sp_state_machine::{Ext, OverlayedChanges, StorageTransactionCache}; @@ -27,13 +27,12 @@ pub fn run(wasm_code: Vec) -> Vec { ); executor - .call_in_wasm( - &wasm_code[..], - None, + .uncached_call( + RuntimeBlob::uncompress_if_needed(&wasm_code[..]).unwrap(), + &mut ext, + true, "run_benches", &[], - &mut ext, - MissingHostFunctions::Disallow, ) .unwrap() } From d6f707d241297ec1306d7a67fcafdaea0145d376 Mon Sep 17 00:00:00 2001 From: Shaun Wang Date: Fri, 21 May 2021 02:03:13 +0000 Subject: [PATCH 4/4] fix --- bencher/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index a2626aa9f..cc3631fe9 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -18,7 +18,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0 sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false, optional = true } sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false, features = ["wasmtime"], optional = true } -sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2" } +sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", optional = true } sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false, features = ["with-kvdb-rocksdb"], optional = true } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.2", default-features = false } @@ -35,6 +35,7 @@ std = [ "sp-runtime-interface/std", "sp-state-machine/std", "sc-executor/std", + "sc-executor-common", "sc-client-db", "frame-benchmarking/std", ]