From b619631b22b163ff270d65b1604903bceb6149c5 Mon Sep 17 00:00:00 2001 From: zqh Date: Fri, 25 Feb 2022 08:39:54 +0800 Subject: [PATCH 1/7] update version --- Cargo.dev.toml | 130 +++++++++++++++--------------- auction/Cargo.toml | 12 +-- authority/Cargo.toml | 16 ++-- bencher/Cargo.toml | 24 +++--- bencher/test/Cargo.toml | 12 +-- 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 | 14 ++-- tokens/Cargo.toml | 16 ++-- tokens/rpc/Cargo.toml | 12 +-- tokens/rpc/runtime-api/Cargo.toml | 6 +- traits/Cargo.toml | 10 +-- unknown-tokens/Cargo.toml | 14 ++-- utilities/Cargo.toml | 10 +-- vesting/Cargo.toml | 14 ++-- weight-meter/Cargo.toml | 14 ++-- xcm-support/Cargo.toml | 10 +-- xcm/Cargo.toml | 12 +-- xtokens/Cargo.toml | 44 +++++----- 24 files changed, 225 insertions(+), 225 deletions(-) diff --git a/Cargo.dev.toml b/Cargo.dev.toml index afb84e39c..308fdb6d2 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -30,72 +30,72 @@ resolver = "2" split-debuginfo = "unpacked" [patch.'https://github.com/paritytech/substrate'] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "22d40c761a985482f93bbbea5ba4199bdba74f8e" } [patch.'https://github.com/paritytech/cumulus'] -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "76479e7fef3af7c8828a44647847b01afd5fefe5" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "76479e7fef3af7c8828a44647847b01afd5fefe5" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "76479e7fef3af7c8828a44647847b01afd5fefe5" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "76479e7fef3af7c8828a44647847b01afd5fefe5" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "76479e7fef3af7c8828a44647847b01afd5fefe5" } [patch.'https://github.com/paritytech/polkadot'] -xcm = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } \ No newline at end of file +xcm = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "de0ecd4760b146ecf33f5e867d707d789e21e060" } \ No newline at end of file diff --git a/auction/Cargo.toml b/auction/Cargo.toml index e606f2dc3..d6e31b7ab 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -11,16 +11,16 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", 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.16" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] diff --git a/authority/Cargo.toml b/authority/Cargo.toml index ccaa18c28..4d19072ff 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -11,17 +11,17 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index 3743fe480..bea3cfb73 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -24,18 +24,18 @@ serde_json = {version = "1.0.68", optional = true } hash-db = { version = "0.15.2", default-features = false, optional = true } bencher-procedural = { path = "bencher-procedural", default-features = false } codec = { package = "parity-scale-codec", version = "2.3.1", features = ["derive"], default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, features = ["wasmtime"], optional = true } -sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", optional = true } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, features = ["with-kvdb-rocksdb"], optional = true } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, features = ["wasmtime"], optional = true } +sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", optional = true } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, features = ["with-kvdb-rocksdb"], optional = true } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } [features] default = ["std"] diff --git a/bencher/test/Cargo.toml b/bencher/test/Cargo.toml index 8eb8e2cef..a1146824f 100644 --- a/bencher/test/Cargo.toml +++ b/bencher/test/Cargo.toml @@ -15,16 +15,16 @@ required-features = ["bench"] serde = { version = "1.0.124", optional = true } scale-info = { version = "1.0", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.3.1", features = ["derive"], default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } orml-bencher = { path = "..", default-features = false } orml-weight-meter = { path = "../../weight-meter", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index c9f2976d4..bf984d532 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -12,18 +12,18 @@ serde = { version = "1.0.124", optional = true } paste = "1.0" codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } log = { version = "0.4.14", default-features = false } [dev-dependencies] -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } hex-literal = "0.3.4" [features] diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index e7f45d39d..f6f10fa38 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -11,19 +11,19 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", 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.16" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } 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 cc8ec53e1..0294c5e9a 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -11,12 +11,12 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } [features] default = ["std"] diff --git a/nft/Cargo.toml b/nft/Cargo.toml index fcebd1b37..bcb6e0fdc 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -11,15 +11,15 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index 079f4e5e6..792aaced9 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -11,19 +11,19 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", 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.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } [features] default = ["std"] diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml index 3876dd7b8..20a23adc8 100644 --- a/oracle/rpc/Cargo.toml +++ b/oracle/rpc/Cargo.toml @@ -11,8 +11,8 @@ codec = { package = "parity-scale-codec", version = "2.3.1" } jsonrpc-core = "18.0.0" jsonrpc-core-client = "18.0.0" jsonrpc-derive = "18.0.0" -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } 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 45e0e55da..e3e65d61d 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.3.1", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } [features] default = ["std"] diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index 13bfcae34..27376b1cf 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -11,16 +11,16 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", 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.16" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index 5df33d2a8..ff4c350dd 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -11,17 +11,17 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", 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.16" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] diff --git a/tokens/rpc/Cargo.toml b/tokens/rpc/Cargo.toml index 79b00c4e2..2b4ea18f3 100644 --- a/tokens/rpc/Cargo.toml +++ b/tokens/rpc/Cargo.toml @@ -12,10 +12,10 @@ jsonrpc-core = "18.0.0" jsonrpc-core-client = "18.0.0" jsonrpc-derive = "18.0.0" -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } orml-tokens-rpc-runtime-api = { version = "0.4.1-dev", path = "./runtime-api" } diff --git a/tokens/rpc/runtime-api/Cargo.toml b/tokens/rpc/runtime-api/Cargo.toml index 4ad0886f9..d7e061fac 100644 --- a/tokens/rpc/runtime-api/Cargo.toml +++ b/tokens/rpc/runtime-api/Cargo.toml @@ -8,9 +8,9 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } orml-tokens = { default-features = false, path = "../../../tokens" } [features] diff --git a/traits/Cargo.toml b/traits/Cargo.toml index a58f8a867..b06eb8108 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -11,14 +11,14 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", 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.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", 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.16", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } [features] default = ["std"] diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index 8e2162552..7e680f948 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -11,18 +11,18 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", 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.16" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index 87fb32d96..3e9609cfe 100644 --- a/utilities/Cargo.toml +++ b/utilities/Cargo.toml @@ -11,14 +11,14 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } [dev-dependencies] serde_json = "1.0.64" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index 74f87ec0c..7807a2125 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -11,16 +11,16 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml index 2471621dc..42fbc0ee9 100644 --- a/weight-meter/Cargo.toml +++ b/weight-meter/Cargo.toml @@ -10,19 +10,19 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", 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.3.1" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16"} -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17"} +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } [features] default = ["std"] diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index 83b1b541d..02e0022cb 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -10,13 +10,13 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index 437824a93..3dd77989a 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -10,16 +10,16 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } [dev-dependencies] -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } [features] default = ["std"] diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index 232a9a51a..adb924884 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -11,40 +11,40 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", 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.16" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16"} +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17"} orml-tokens = { path = "../tokens" } orml-xcm = { path = "../xcm" } From 92a4ce110cb741d234fb31086a8b8987a98f339f Mon Sep 17 00:00:00 2001 From: zqh Date: Fri, 25 Feb 2022 08:54:09 +0800 Subject: [PATCH 2/7] update serde and fix build error --- auction/Cargo.toml | 2 +- authority/Cargo.toml | 2 +- bencher/Cargo.toml | 2 +- bencher/src/bench_runner.rs | 2 +- bencher/test/Cargo.toml | 2 +- benchmarking/Cargo.toml | 2 +- currencies/Cargo.toml | 2 +- gradually-update/Cargo.toml | 2 +- nft/Cargo.toml | 2 +- oracle/Cargo.toml | 2 +- rewards/Cargo.toml | 2 +- tokens/Cargo.toml | 2 +- traits/Cargo.toml | 2 +- unknown-tokens/Cargo.toml | 2 +- utilities/Cargo.toml | 2 +- vesting/Cargo.toml | 2 +- weight-gen/Cargo.toml | 2 +- weight-meter/Cargo.toml | 2 +- xtokens/Cargo.toml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/auction/Cargo.toml b/auction/Cargo.toml index d6e31b7ab..cb4863d0e 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/authority/Cargo.toml b/authority/Cargo.toml index 4d19072ff..d804f7aa8 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index bea3cfb73..f55d4567c 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -19,7 +19,7 @@ wasm-gc-api = { version = "0.1.11", optional = true } rand = {version = "0.8.3", optional = true } linregress = { version = "0.4.4", optional = true } parking_lot = { version = "0.11.2", optional = true } -serde = { version = "1.0.124", optional = true, features = ['derive'] } +serde = { version = "1.0.136", optional = true, features = ['derive'] } serde_json = {version = "1.0.68", optional = true } hash-db = { version = "0.15.2", default-features = false, optional = true } bencher-procedural = { path = "bencher-procedural", default-features = false } diff --git a/bencher/src/bench_runner.rs b/bencher/src/bench_runner.rs index 8dc966878..59fce68cf 100644 --- a/bencher/src/bench_runner.rs +++ b/bencher/src/bench_runner.rs @@ -16,7 +16,7 @@ type ComposeHostFunctions = ( ); /// Run benches -pub fn run(wasm_code: Vec) -> std::result::Result, String> { +pub fn run(wasm_code: Vec) -> std::result::Result, sc_executor_common::error::Error> { let mut overlay = OverlayedChanges::default(); let mut cache = StorageTransactionCache::default(); let state = sc_client_db::BenchmarkingState::::new(Default::default(), Default::default(), false, true).unwrap(); diff --git a/bencher/test/Cargo.toml b/bencher/test/Cargo.toml index a1146824f..bf2463015 100644 --- a/bencher/test/Cargo.toml +++ b/bencher/test/Cargo.toml @@ -12,7 +12,7 @@ harness = false required-features = ["bench"] [dependencies] -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } scale-info = { version = "1.0", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.3.1", features = ["derive"], default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index bf984d532..495e9b56c 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -8,7 +8,7 @@ authors = ["Laminar Developers "] edition = "2021" [dependencies] -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } paste = "1.0" codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index f6f10fa38..d65b31b89 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index 0294c5e9a..c88bcd190 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/nft/Cargo.toml b/nft/Cargo.toml index bcb6e0fdc..57f39b506 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index 792aaced9..46eda8b54 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index 27376b1cf..f50b40f34 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index ff4c350dd..d0324d6c5 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/traits/Cargo.toml b/traits/Cargo.toml index b06eb8108..63cee19e9 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index 7e680f948..1b7da88b0 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index 3e9609cfe..70fd4745f 100644 --- a/utilities/Cargo.toml +++ b/utilities/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index 7807a2125..74b8c5d60 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } diff --git a/weight-gen/Cargo.toml b/weight-gen/Cargo.toml index d5ba9e4ba..bc24c6526 100644 --- a/weight-gen/Cargo.toml +++ b/weight-gen/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Laminar Developers "] edition = "2021" [dependencies] -serde = { version = "1.0.119", features = ["derive"] } +serde = { version = "1.0.136", features = ["derive"] } serde_json = "1.0" clap = "2.33.3" handlebars = { version = "4.1.0" } diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml index 42fbc0ee9..3dda758b9 100644 --- a/weight-meter/Cargo.toml +++ b/weight-meter/Cargo.toml @@ -14,7 +14,7 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "pol weight-meter-procedural = { path = "weight-meter-procedural", default-features = false } [dev-dependencies] -serde = { version = "1.0.124" } +serde = { version = "1.0.136" } codec = { package = "parity-scale-codec", version = "2.3.1" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index adb924884..a887f7d52 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.124", optional = true } +serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } From 5d905c2e88891649f37f5610e7ab7f7cb9fa1fe9 Mon Sep 17 00:00:00 2001 From: zqh Date: Fri, 25 Feb 2022 09:01:25 +0800 Subject: [PATCH 3/7] fix test --- benchmarking/src/lib.rs | 2 +- xtokens/src/mock/para.rs | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/benchmarking/src/lib.rs b/benchmarking/src/lib.rs index a8b8d1d95..3d01445ea 100644 --- a/benchmarking/src/lib.rs +++ b/benchmarking/src/lib.rs @@ -826,7 +826,7 @@ macro_rules! impl_benchmark { // Time the storage root recalculation. let start_storage_root = $crate::benchmarking::current_time(); - $crate::storage_root(); + $crate::storage_root($crate::StateVersion::V1); let finish_storage_root = $crate::benchmarking::current_time(); let elapsed_storage_root = finish_storage_root - start_storage_root; diff --git a/xtokens/src/mock/para.rs b/xtokens/src/mock/para.rs index d8cb16037..3784d91f3 100644 --- a/xtokens/src/mock/para.rs +++ b/xtokens/src/mock/para.rs @@ -3,7 +3,7 @@ use crate as orml_xtokens; use frame_support::{ construct_runtime, parameter_types, - traits::{Everything, Get, Nothing}, + traits::{EnsureOneOf, Everything, Get, Nothing}, weights::{constants::WEIGHT_PER_SECOND, Weight}, }; use frame_system::EnsureRoot; @@ -15,12 +15,12 @@ use sp_runtime::{ }; use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId}; -use pallet_xcm::XcmPassthrough; +use pallet_xcm::{EnsureXcm, IsMajorityOfBody, XcmPassthrough}; use polkadot_parachain::primitives::Sibling; use xcm::latest::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, }; use xcm_executor::{traits::WeightTrader, Assets, Config, XcmExecutor}; @@ -112,7 +112,7 @@ parameter_types! { } pub type LocationToAccountId = ( - ParentIsDefault, + ParentIsPreset, SiblingParachainConvertsVia, AccountId32Aliases, ); @@ -128,6 +128,7 @@ pub type XcmOriginToCallOrigin = ( parameter_types! { pub const UnitWeightCost: Weight = 10; pub const MaxInstructions: u32 = 100; + pub const ExecutiveBody: BodyId = BodyId::Executive; } pub type LocalAssetTransactor = MultiCurrencyAdapter< @@ -221,6 +222,9 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ChannelInfo = ChannelInfo; type VersionWrapper = (); type ExecuteOverweightOrigin = EnsureRoot; + type ControllerOrigin = + EnsureOneOf, EnsureXcm>>; + type ControllerOriginConverter = XcmOriginToCallOrigin; } impl cumulus_pallet_dmp_queue::Config for Runtime { From d1ad243927a7062dce959c7ed506b7e250f193da Mon Sep 17 00:00:00 2001 From: zqh Date: Fri, 25 Feb 2022 09:22:17 +0800 Subject: [PATCH 4/7] update bench state_version to 0 --- benchmarking/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarking/src/lib.rs b/benchmarking/src/lib.rs index 3d01445ea..266fb825c 100644 --- a/benchmarking/src/lib.rs +++ b/benchmarking/src/lib.rs @@ -826,7 +826,7 @@ macro_rules! impl_benchmark { // Time the storage root recalculation. let start_storage_root = $crate::benchmarking::current_time(); - $crate::storage_root($crate::StateVersion::V1); + $crate::storage_root($crate::StateVersion::V0); let finish_storage_root = $crate::benchmarking::current_time(); let elapsed_storage_root = finish_storage_root - start_storage_root; From 4f9197b301e3916305036f2d3d75802887df544f Mon Sep 17 00:00:00 2001 From: zqh Date: Fri, 25 Feb 2022 10:17:14 +0800 Subject: [PATCH 5/7] update origin --- xtokens/src/mock/para.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/xtokens/src/mock/para.rs b/xtokens/src/mock/para.rs index 3784d91f3..ef46b3de3 100644 --- a/xtokens/src/mock/para.rs +++ b/xtokens/src/mock/para.rs @@ -3,7 +3,7 @@ use crate as orml_xtokens; use frame_support::{ construct_runtime, parameter_types, - traits::{EnsureOneOf, Everything, Get, Nothing}, + traits::{Everything, Get, Nothing}, weights::{constants::WEIGHT_PER_SECOND, Weight}, }; use frame_system::EnsureRoot; @@ -15,7 +15,7 @@ use sp_runtime::{ }; use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId}; -use pallet_xcm::{EnsureXcm, IsMajorityOfBody, XcmPassthrough}; +use pallet_xcm::XcmPassthrough; use polkadot_parachain::primitives::Sibling; use xcm::latest::prelude::*; use xcm_builder::{ @@ -128,7 +128,6 @@ pub type XcmOriginToCallOrigin = ( parameter_types! { pub const UnitWeightCost: Weight = 10; pub const MaxInstructions: u32 = 100; - pub const ExecutiveBody: BodyId = BodyId::Executive; } pub type LocalAssetTransactor = MultiCurrencyAdapter< @@ -222,8 +221,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ChannelInfo = ChannelInfo; type VersionWrapper = (); type ExecuteOverweightOrigin = EnsureRoot; - type ControllerOrigin = - EnsureOneOf, EnsureXcm>>; + type ControllerOrigin = EnsureRoot; type ControllerOriginConverter = XcmOriginToCallOrigin; } From 479a11c4a10dc8de204a2466de2a72bcf119d983 Mon Sep 17 00:00:00 2001 From: zqh Date: Sun, 27 Feb 2022 12:47:09 +0800 Subject: [PATCH 6/7] update --- bencher/Cargo.toml | 2 +- vesting/src/mock.rs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index f55d4567c..4b7d00369 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -18,7 +18,7 @@ ansi_term = { version = "0.12.1", optional = true } wasm-gc-api = { version = "0.1.11", optional = true } rand = {version = "0.8.3", optional = true } linregress = { version = "0.4.4", optional = true } -parking_lot = { version = "0.11.2", optional = true } +parking_lot = { version = "0.12.0", optional = true } serde = { version = "1.0.136", optional = true, features = ['derive'] } serde_json = {version = "1.0.68", optional = true } hash-db = { version = "0.15.2", default-features = false, optional = true } diff --git a/vesting/src/mock.rs b/vesting/src/mock.rs index 9602960b0..5c321148f 100644 --- a/vesting/src/mock.rs +++ b/vesting/src/mock.rs @@ -77,7 +77,9 @@ impl EnsureOrigin for EnsureAliceOrBob { #[cfg(feature = "runtime-benchmarks")] fn successful_origin() -> Origin { - Origin::from(RawOrigin::Signed(Default::default())) + let zero_account_id = AccountId::decode(&mut sp_runtime::traits::TrailingZeroInput::zeroes()) + .expect("infinite length input; no invalid inputs for type; qed"); + Origin::from(RawOrigin::Signed(zero_account_id)) } } From f5bdc5fe7d7f85ecb613769d354e8091b98de2b0 Mon Sep 17 00:00:00 2001 From: zqh Date: Sun, 27 Feb 2022 15:41:20 +0800 Subject: [PATCH 7/7] update impl-trait-for-tuples --- traits/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 63cee19e9..47a179323 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -15,7 +15,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkad sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } num-traits = { version = "0.2.14", default-features = false } -impl-trait-for-tuples = "0.2.1" +impl-trait-for-tuples = "0.2.2" frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", 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.17", default-features = false }