diff --git a/Cargo.dev.toml b/Cargo.dev.toml index 53fd7b3a0..d553040b3 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -30,67 +30,68 @@ resolver = "2" split-debuginfo = "unpacked" [patch.'https://github.com/paritytech/substrate'] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "d76f39995315ec36980908e4b99709bd14927044" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465" } [patch.'https://github.com/paritytech/cumulus'] -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "935bac869a72baef17e46d2ae1abc8c0c650cef5" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "935bac869a72baef17e46d2ae1abc8c0c650cef5" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "935bac869a72baef17e46d2ae1abc8c0c650cef5" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "935bac869a72baef17e46d2ae1abc8c0c650cef5" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "935bac869a72baef17e46d2ae1abc8c0c650cef5" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } [patch.'https://github.com/paritytech/polkadot'] -xcm = { git = "https://github.com/paritytech//polkadot", rev = "5feed981cf0fe671447eabaa9c0d235a8dd0003e" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "5feed981cf0fe671447eabaa9c0d235a8dd0003e" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "5feed981cf0fe671447eabaa9c0d235a8dd0003e" } -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "5feed981cf0fe671447eabaa9c0d235a8dd0003e" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "5feed981cf0fe671447eabaa9c0d235a8dd0003e" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "5feed981cf0fe671447eabaa9c0d235a8dd0003e" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "5feed981cf0fe671447eabaa9c0d235a8dd0003e" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "5feed981cf0fe671447eabaa9c0d235a8dd0003e" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "5feed981cf0fe671447eabaa9c0d235a8dd0003e" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } diff --git a/auction/Cargo.toml b/auction/Cargo.toml index 8ea3a8314..1c2c0c090 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.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", 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.12" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } [features] default = ["std"] diff --git a/authority/Cargo.toml b/authority/Cargo.toml index 09f1b8d0e..f1689b32d 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.12", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } [features] default = ["std"] diff --git a/authority/src/mock.rs b/authority/src/mock.rs index ba047ac9e..87f7fb7de 100644 --- a/authority/src/mock.rs +++ b/authority/src/mock.rs @@ -4,7 +4,11 @@ use super::*; use codec::{Decode, Encode}; -use frame_support::{parameter_types, traits::Everything, weights::Weight}; +use frame_support::{ + parameter_types, + traits::{EqualPrivilegeOnly, Everything}, + weights::Weight, +}; use frame_system::{ensure_root, ensure_signed, EnsureRoot}; use sp_core::H256; use sp_runtime::{ @@ -62,6 +66,7 @@ impl pallet_scheduler::Config for Runtime { type ScheduleOrigin = EnsureRoot; type MaxScheduledPerBlock = (); type WeightInfo = (); + type OriginPrivilegeCmp = EqualPrivilegeOnly; } #[derive(Clone, Encode, Decode, Eq, PartialEq, Ord, PartialOrd, Debug, TypeInfo)] diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index f87b6a84e..1ff95e31f 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -17,20 +17,20 @@ walkdir = { version = "2.3.1", optional = true } 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.0", optional = true } +linregress = { version = "0.4.4", 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.3.1", features = ["derive"], default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false, optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false, features = ["wasmtime"], optional = true } -sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", optional = true } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false, features = ["with-kvdb-rocksdb"], optional = true } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false, optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false, features = ["wasmtime"], optional = true } +sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", optional = true } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false, features = ["with-kvdb-rocksdb"], optional = true } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } [features] default = ["std"] diff --git a/bencher/src/bench_runner.rs b/bencher/src/bench_runner.rs index 1725a1196..09811477f 100644 --- a/bencher/src/bench_runner.rs +++ b/bencher/src/bench_runner.rs @@ -1,4 +1,4 @@ -use frame_benchmarking::frame_support::sp_runtime::traits::{Block, NumberFor}; +use frame_benchmarking::frame_support::sp_runtime::traits::Block; use sc_executor::{sp_wasm_interface::HostFunctions, WasmExecutionMethod, WasmExecutor}; use sc_executor_common::runtime_blob::RuntimeBlob; use sp_state_machine::{Ext, OverlayedChanges, StorageTransactionCache}; @@ -9,7 +9,7 @@ pub fn run(wasm_code: Vec) -> std::result::Result, String> let mut cache = StorageTransactionCache::default(); let state = sc_client_db::BenchmarkingState::::new(Default::default(), Default::default(), false, false).unwrap(); - let mut ext = Ext::<_, NumberFor, _>::new(&mut overlay, &mut cache, &state, None, None); + let mut ext = Ext::new(&mut overlay, &mut cache, &state, None); let mut host_functions = sp_io::SubstrateHostFunctions::host_functions(); host_functions.append(&mut frame_benchmarking::benchmarking::HostFunctions::host_functions()); diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index b388554bf..4c3114084 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -12,19 +12,19 @@ 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.12", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", 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.12" } -hex-literal = "0.2.1" +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +hex-literal = "0.3.4" [features] default = [ "std" ] diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index cba6fb779..5e6ba47d3 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.12", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", 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.12" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" } [features] diff --git a/currencies/src/lib.rs b/currencies/src/lib.rs index d450bd497..ed9438b3e 100644 --- a/currencies/src/lib.rs +++ b/currencies/src/lib.rs @@ -59,11 +59,7 @@ use sp_runtime::{ traits::{CheckedSub, MaybeSerializeDeserialize, StaticLookup, Zero}, DispatchError, DispatchResult, }; -use sp_std::{ - convert::{TryFrom, TryInto}, - fmt::Debug, - marker, result, -}; +use sp_std::{fmt::Debug, marker, result}; mod mock; mod tests; diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index 83fe30fc6..287e81a55 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.12", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } [features] default = ["std"] diff --git a/gradually-update/src/lib.rs b/gradually-update/src/lib.rs index 566f90469..bbe0c45dc 100644 --- a/gradually-update/src/lib.rs +++ b/gradually-update/src/lib.rs @@ -32,7 +32,6 @@ use frame_support::{ use frame_system::pallet_prelude::*; use scale_info::TypeInfo; use sp_runtime::{traits::SaturatedConversion, DispatchResult, RuntimeDebug}; -use sp_std::convert::TryInto; mod default_weight; mod mock; diff --git a/gradually-update/src/tests.rs b/gradually-update/src/tests.rs index 00bbf6a1f..e5e8d630e 100644 --- a/gradually-update/src/tests.rs +++ b/gradually-update/src/tests.rs @@ -7,7 +7,6 @@ use codec::Encode; use frame_support::{assert_noop, assert_ok}; use mock::{Event, *}; use sp_runtime::{FixedPointNumber, FixedU128, Permill}; -use sp_std::convert::TryInto; fn storage_set(key: &Vec, value: &Vec) { // let bounded_key: StorageValueBytes = diff --git a/nft/Cargo.toml b/nft/Cargo.toml index d6219036e..d8393eef9 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.12", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } [features] default = ["std"] diff --git a/nft/src/lib.rs b/nft/src/lib.rs index af0777527..2834852e9 100644 --- a/nft/src/lib.rs +++ b/nft/src/lib.rs @@ -28,7 +28,7 @@ use sp_runtime::{ traits::{AtLeast32BitUnsigned, CheckedAdd, CheckedSub, MaybeSerializeDeserialize, Member, One, Zero}, ArithmeticError, DispatchError, DispatchResult, RuntimeDebug, }; -use sp_std::{convert::TryInto, vec::Vec}; +use sp_std::vec::Vec; mod mock; mod tests; diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index c1cf41434..2deb8013f 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.12", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", 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.12", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } [features] default = ["std"] diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml index 4dc43a5e9..ef6842ee6 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.12" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } 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 3c4138635..2371a91ca 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.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } [features] default = ["std"] diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index 03be8562b..19e565e79 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.12", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", 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.12" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } [features] default = ["std"] diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index b97293de5..28b0e565b 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.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", 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.12" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } [features] default = ["std"] diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs index 249f32420..ff330c157 100644 --- a/tokens/src/lib.rs +++ b/tokens/src/lib.rs @@ -61,12 +61,7 @@ use sp_runtime::{ }, ArithmeticError, DispatchError, DispatchResult, RuntimeDebug, }; -use sp_std::{ - convert::{Infallible, TryFrom, TryInto}, - marker, - prelude::*, - vec::Vec, -}; +use sp_std::{convert::Infallible, marker, prelude::*, vec::Vec}; use orml_traits::{ arithmetic::{self, Signed}, diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 142af1a3b..46542669b 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.12", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", 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.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", 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.12", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } [features] default = ["std"] diff --git a/traits/src/arithmetic.rs b/traits/src/arithmetic.rs index 7c002aae5..571b41ee9 100644 --- a/traits/src/arithmetic.rs +++ b/traits/src/arithmetic.rs @@ -3,7 +3,6 @@ pub use num_traits::{ }; use sp_std::{ self, - convert::{TryFrom, TryInto}, ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Rem, RemAssign, Shl, Shr, Sub, SubAssign}, }; diff --git a/traits/src/currency.rs b/traits/src/currency.rs index f51ebe7c4..7e53353b0 100644 --- a/traits/src/currency.rs +++ b/traits/src/currency.rs @@ -10,7 +10,6 @@ use sp_runtime::{ }; use sp_std::{ cmp::{Eq, PartialEq}, - convert::{TryFrom, TryInto}, fmt::Debug, result, }; diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index f3d1a982b..82b390c57 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.12", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", 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.12" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } [features] default = ["std"] diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index 5405eed93..e2f65db99 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.12", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } [dev-dependencies] serde_json = "1.0.64" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } [features] default = ["std"] diff --git a/utilities/src/ordered_set.rs b/utilities/src/ordered_set.rs index 7fc8b8579..ca7b79fea 100644 --- a/utilities/src/ordered_set.rs +++ b/utilities/src/ordered_set.rs @@ -1,7 +1,6 @@ use codec::{Decode, Encode}; use frame_support::{traits::Get, BoundedVec, DefaultNoBound}; use scale_info::TypeInfo; -use sp_std::convert::TryInto; #[cfg(feature = "std")] use sp_std::{fmt, prelude::*}; diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index 14317162b..559a7e017 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.12", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } [features] default = ["std"] diff --git a/vesting/src/lib.rs b/vesting/src/lib.rs index 384a601c5..0da83064f 100644 --- a/vesting/src/lib.rs +++ b/vesting/src/lib.rs @@ -42,7 +42,6 @@ use sp_runtime::{ }; use sp_std::{ cmp::{Eq, PartialEq}, - convert::TryInto, vec::Vec, }; diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml index 2d85ae59f..c21393f43 100644 --- a/weight-meter/Cargo.toml +++ b/weight-meter/Cargo.toml @@ -11,20 +11,20 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] spin = "0.7.1" scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } weight-meter-procedural = { path = "weight-meter-procedural", default-features = false } orml-bencher = { path = "../bencher", default-features = false, optional = true } [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.12" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"} -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13"} +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } [features] default = ["std"] diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index 3cac4bef7..92e732b84 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.12", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } diff --git a/xcm-support/src/lib.rs b/xcm-support/src/lib.rs index 2a68197e5..cca19ba66 100644 --- a/xcm-support/src/lib.rs +++ b/xcm-support/src/lib.rs @@ -11,7 +11,7 @@ use frame_support::dispatch::{DispatchError, DispatchResult}; use sp_runtime::traits::{CheckedConversion, Convert}; -use sp_std::{convert::TryFrom, marker::PhantomData, prelude::*}; +use sp_std::{marker::PhantomData, prelude::*}; use xcm::latest::prelude::*; use xcm_executor::traits::{FilterAssetLocation, MatchesFungible}; diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index bbc0e3525..e9ffd6765 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.12", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } [dev-dependencies] -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } [features] default = ["std"] diff --git a/xcm/src/lib.rs b/xcm/src/lib.rs index 1334ef9ea..23f47d9da 100644 --- a/xcm/src/lib.rs +++ b/xcm/src/lib.rs @@ -5,10 +5,7 @@ use frame_support::{pallet_prelude::*, traits::EnsureOrigin}; use frame_system::pallet_prelude::*; -use sp_std::{ - boxed::Box, - convert::{TryFrom, TryInto}, -}; +use sp_std::boxed::Box; use xcm::{latest::prelude::*, VersionedMultiLocation, VersionedXcm}; pub use module::*; diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index 855cde707..768d5ddc7 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.12", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", 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.12" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12"} +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13"} orml-tokens = { path = "../tokens" } orml-xcm = { path = "../xcm" } diff --git a/xtokens/src/lib.rs b/xtokens/src/lib.rs index ec24a0fea..a79d3ffb5 100644 --- a/xtokens/src/lib.rs +++ b/xtokens/src/lib.rs @@ -28,7 +28,7 @@ use sp_runtime::{ traits::{AtLeast32BitUnsigned, Convert, MaybeSerializeDeserialize, Member, Zero}, DispatchError, }; -use sp_std::{convert::TryInto, prelude::*, result::Result}; +use sp_std::{prelude::*, result::Result}; use xcm::prelude::*; use xcm_executor::traits::{InvertLocation, WeightBounds};