diff --git a/Cargo.dev.toml b/Cargo.dev.toml index 8825d3e9e..96899b9e5 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -32,72 +32,72 @@ resolver = "2" split-debuginfo = "unpacked" [patch.'https://github.com/paritytech/substrate'] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "814752f60ab8cce7e2ece3ce0c1b10799b4eab28" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "3348e144f0a2b39ce08bd8e3b976c42fe0c990b9" } [patch.'https://github.com/paritytech/cumulus'] -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "95ca5a085727c1494ddeeae4a2b2e69c4ee1933b" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "95ca5a085727c1494ddeeae4a2b2e69c4ee1933b" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "95ca5a085727c1494ddeeae4a2b2e69c4ee1933b" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "95ca5a085727c1494ddeeae4a2b2e69c4ee1933b" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "95ca5a085727c1494ddeeae4a2b2e69c4ee1933b" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "390042a01940a0a4d0b28eb196a2e9251f3cec33" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "390042a01940a0a4d0b28eb196a2e9251f3cec33" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "390042a01940a0a4d0b28eb196a2e9251f3cec33" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "390042a01940a0a4d0b28eb196a2e9251f3cec33" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "390042a01940a0a4d0b28eb196a2e9251f3cec33" } [patch.'https://github.com/paritytech/polkadot'] -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "22836e55d41eef24ed5917fd654ee82a683a7cfe" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "22836e55d41eef24ed5917fd654ee82a683a7cfe" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "22836e55d41eef24ed5917fd654ee82a683a7cfe" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "22836e55d41eef24ed5917fd654ee82a683a7cfe" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "22836e55d41eef24ed5917fd654ee82a683a7cfe" } -xcm = { git = "https://github.com/paritytech//polkadot", rev = "22836e55d41eef24ed5917fd654ee82a683a7cfe" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "22836e55d41eef24ed5917fd654ee82a683a7cfe" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "22836e55d41eef24ed5917fd654ee82a683a7cfe" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "22836e55d41eef24ed5917fd654ee82a683a7cfe" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "5174e9ae75b6843ecc460dfaa15f5851230638b8" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "5174e9ae75b6843ecc460dfaa15f5851230638b8" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "5174e9ae75b6843ecc460dfaa15f5851230638b8" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "5174e9ae75b6843ecc460dfaa15f5851230638b8" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "5174e9ae75b6843ecc460dfaa15f5851230638b8" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = "5174e9ae75b6843ecc460dfaa15f5851230638b8" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "5174e9ae75b6843ecc460dfaa15f5851230638b8" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "5174e9ae75b6843ecc460dfaa15f5851230638b8" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "5174e9ae75b6843ecc460dfaa15f5851230638b8" } diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml index af7b4e9e6..fc1f2eb82 100644 --- a/asset-registry/Cargo.toml +++ b/asset-registry/Cargo.toml @@ -13,37 +13,37 @@ serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } # substrate -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } # orml orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] # substrate -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.25" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.25" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.25" } # orml orml-tokens = { path = "../tokens" } diff --git a/asset-registry/src/lib.rs b/asset-registry/src/lib.rs index 0708904a4..32222204f 100644 --- a/asset-registry/src/lib.rs +++ b/asset-registry/src/lib.rs @@ -4,7 +4,7 @@ #![allow(clippy::large_enum_variant)] #![allow(clippy::too_many_arguments)] -use frame_support::{pallet_prelude::*, traits::EnsureOriginWithArg, transactional}; +use frame_support::{pallet_prelude::*, traits::EnsureOriginWithArg}; use frame_system::pallet_prelude::*; pub use orml_traits::asset_registry::AssetMetadata; use orml_traits::asset_registry::AssetProcessor; @@ -131,7 +131,6 @@ pub mod module { #[pallet::call] impl Pallet { #[pallet::weight(T::WeightInfo::register_asset())] - #[transactional] pub fn register_asset( origin: OriginFor, metadata: AssetMetadata, @@ -143,7 +142,6 @@ pub mod module { } #[pallet::weight(T::WeightInfo::update_asset())] - #[transactional] pub fn update_asset( origin: OriginFor, asset_id: T::AssetId, diff --git a/asset-registry/src/tests.rs b/asset-registry/src/tests.rs index b92f0fab2..d5d958f41 100644 --- a/asset-registry/src/tests.rs +++ b/asset-registry/src/tests.rs @@ -4,12 +4,12 @@ use super::*; use crate as orml_asset_registry; use crate::tests::para::{AdminAssetTwo, AssetRegistry, CustomMetadata, Origin, Tokens, TreasuryAccount}; use frame_support::{assert_noop, assert_ok}; -use mock::*; +use mock::{para::Call, *}; use orml_traits::MultiCurrency; use polkadot_parachain::primitives::Sibling; use sp_runtime::{ - traits::{AccountIdConversion, BadOrigin}, + traits::{AccountIdConversion, BadOrigin, Dispatchable}, AccountId32, }; use xcm_simulator::TestExt; @@ -346,8 +346,12 @@ fn test_register_duplicate_location_returns_error() { let metadata = dummy_metadata(); assert_ok!(AssetRegistry::register_asset(Origin::root(), metadata.clone(), None)); + let register_asset = Call::AssetRegistry(crate::Call::::register_asset { + metadata: metadata.clone(), + asset_id: None, + }); assert_noop!( - AssetRegistry::register_asset(Origin::root(), metadata.clone(), None), + register_asset.dispatch(Origin::root()), Error::::ConflictingLocation ); }); diff --git a/auction/Cargo.toml b/auction/Cargo.toml index 544f00b6d..e5b835d47 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -12,16 +12,16 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } 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.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/authority/Cargo.toml b/authority/Cargo.toml index 62e13bbf2..7e40fd40f 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -12,16 +12,16 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/authority/src/lib.rs b/authority/src/lib.rs index a72d4240e..5ecaa57ce 100644 --- a/authority/src/lib.rs +++ b/authority/src/lib.rs @@ -24,7 +24,7 @@ use frame_support::{ pallet_prelude::*, traits::{ schedule::{DispatchTime, Named as ScheduleNamed, Priority}, - EnsureOneOf, EnsureOrigin, Get, IsType, OriginTrait, + EitherOfDiverse, EnsureOrigin, Get, IsType, OriginTrait, }, weights::{DispatchClass, GetDispatchInfo, Pays}, }; @@ -394,7 +394,7 @@ pub mod module { #[pallet::weight(T::WeightInfo::remove_authorized_call())] pub fn remove_authorized_call(origin: OriginFor, hash: T::Hash) -> DispatchResult { let root_or_sigend = - EnsureOneOf::, EnsureSigned>::ensure_origin(origin)?; + EitherOfDiverse::, EnsureSigned>::ensure_origin(origin)?; SavedCalls::::try_mutate_exists(hash, |maybe_call| { let (_, maybe_caller) = maybe_call.take().ok_or(Error::::CallNotAuthorized)?; diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index da34f6e51..3520ead87 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -26,18 +26,18 @@ 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 = "3.0.0", features = ["derive"], default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.24" } -sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["wasmtime"], optional = true , branch = "polkadot-v0.9.24" } -sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.24" } -sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["with-kvdb-rocksdb"], optional = true , branch = "polkadot-v0.9.24" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.24" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.25" } +sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["wasmtime"], optional = true , branch = "polkadot-v0.9.25" } +sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.25" } +sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["rocksdb"], optional = true , branch = "polkadot-v0.9.25" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.25" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/bencher/bencher-procedural/Cargo.toml b/bencher/bencher-procedural/Cargo.toml index b25c0620e..cd91a74b1 100644 --- a/bencher/bencher-procedural/Cargo.toml +++ b/bencher/bencher-procedural/Cargo.toml @@ -9,9 +9,9 @@ edition = "2021" proc-macro = true [dependencies] -proc-macro2 = "1.0.6" -quote = "1.0.3" -syn = { version = "1.0.58", features = ["full"] } +proc-macro2 = "1.0.40" +quote = "1.0.18" +syn = { version = "1.0.98", features = ["full"] } [features] default = ["std"] diff --git a/bencher/src/bench_ext.rs b/bencher/src/bench_ext.rs index 2ea29697d..f80222a25 100644 --- a/bencher/src/bench_ext.rs +++ b/bencher/src/bench_ext.rs @@ -1,6 +1,6 @@ use core::any::{Any, TypeId}; use hash_db::Hasher; -use sp_externalities::{Extension, ExtensionStore, Externalities}; +use sp_externalities::{Extension, ExtensionStore, Externalities, MultiRemovalResults}; use sp_state_machine::{Backend, Ext}; use sp_std::sync::Arc; use sp_storage::{ChildInfo, StateVersion, TrackedStorageKey}; @@ -66,19 +66,30 @@ where self.ext.next_child_storage_key(child_info, key) } - fn kill_child_storage(&mut self, child_info: &ChildInfo, limit: Option) -> (bool, u32) { + fn kill_child_storage( + &mut self, + child_info: &ChildInfo, + limit: Option, + maybe_cursor: Option<&[u8]>, + ) -> MultiRemovalResults { self.tracker.on_kill_child_storage(child_info, limit); - self.ext.kill_child_storage(child_info, limit) + self.ext.kill_child_storage(child_info, limit, maybe_cursor) } - fn clear_prefix(&mut self, prefix: &[u8], limit: Option) -> (bool, u32) { + fn clear_prefix(&mut self, prefix: &[u8], limit: Option, maybe_cursor: Option<&[u8]>) -> MultiRemovalResults { self.tracker.on_clear_prefix(prefix, limit); - self.ext.clear_prefix(prefix, limit) + self.ext.clear_prefix(prefix, limit, maybe_cursor) } - fn clear_child_prefix(&mut self, child_info: &ChildInfo, prefix: &[u8], limit: Option) -> (bool, u32) { + fn clear_child_prefix( + &mut self, + child_info: &ChildInfo, + prefix: &[u8], + limit: Option, + maybe_cursor: Option<&[u8]>, + ) -> MultiRemovalResults { self.tracker.on_clear_child_prefix(child_info, prefix, limit); - self.ext.clear_child_prefix(child_info, prefix, limit) + self.ext.clear_child_prefix(child_info, prefix, limit, maybe_cursor) } fn place_storage(&mut self, key: Vec, value: Option>) { diff --git a/bencher/test/Cargo.toml b/bencher/test/Cargo.toml index 467784d93..5e65a1542 100644 --- a/bencher/test/Cargo.toml +++ b/bencher/test/Cargo.toml @@ -15,16 +15,16 @@ required-features = ["bench"] serde = { version = "1.0.136", optional = true } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } 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.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/bencher/test/src/lib.rs b/bencher/test/src/lib.rs index d2270068a..42d824080 100644 --- a/bencher/test/src/lib.rs +++ b/bencher/test/src/lib.rs @@ -11,7 +11,6 @@ pub mod pallet { use frame_support::{ dispatch::{DispatchResult, DispatchResultWithPostInfo}, pallet_prelude::*, - transactional, }; use frame_system::pallet_prelude::*; @@ -59,7 +58,6 @@ pub mod pallet { } impl Pallet { - #[transactional] #[orml_weight_meter::weight(ModuleWeights::::set_foo())] pub(crate) fn set_foo() -> frame_support::dispatch::DispatchResult { Value::::put(2); diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index a29d06cfd..083406d51 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -14,19 +14,19 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } [dev-dependencies] hex-literal = "0.3.4" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } [features] default = [ "std" ] diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index 965c30fb8..dd995002c 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -12,18 +12,18 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } 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.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" } diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index b8ca85dc7..ffa808437 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -12,12 +12,12 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/nft/Cargo.toml b/nft/Cargo.toml index ea97b6666..d2a9ec872 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -12,14 +12,14 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index ea3468868..c5f92759c 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -12,18 +12,18 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } 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", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml index 01dbefeb6..d7c69d066 100644 --- a/oracle/rpc/Cargo.toml +++ b/oracle/rpc/Cargo.toml @@ -8,10 +8,10 @@ description = "RPC module for orml-oracle." [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0" } -jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } 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 e1ccea245..2fe4f8801 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 = "3.0.0", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs index a0ad8ad22..ee9099d76 100644 --- a/oracle/src/lib.rs +++ b/oracle/src/lib.rs @@ -231,6 +231,7 @@ impl, I: 'static> ChangeMembers for Pallet { fn change_members_sorted(_incoming: &[T::AccountId], outgoing: &[T::AccountId], _new: &[T::AccountId]) { // remove values for removed in outgoing { + #[allow(deprecated)] RawValues::::remove_prefix(removed, None); } } diff --git a/payments/Cargo.toml b/payments/Cargo.toml index 6b9c50390..1c0287b21 100644 --- a/payments/Cargo.toml +++ b/payments/Cargo.toml @@ -14,18 +14,18 @@ parity-scale-codec = { version = "3.1.2", default-features = false, features = [ log = { version = "0.4.17", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } orml-traits = {path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] serde = { version = "1.0.136" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } orml-tokens = { path = "../tokens", version = "0.4.1-dev", default-features = false } diff --git a/payments/src/lib.rs b/payments/src/lib.rs index c48be9e97..5ac09c6f6 100644 --- a/payments/src/lib.rs +++ b/payments/src/lib.rs @@ -53,6 +53,7 @@ //! The `PaymentState` enum tracks the possible states that a payment can be in. //! When a payment is 'completed' or 'cancelled' it is removed from storage and //! hence not tracked by a state. +#![allow(deprecated)] // TODO: clean transactional #![cfg_attr(not(feature = "std"), no_std)] pub use pallet::*; diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index 95f99dc7f..f7ab8153d 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -12,17 +12,17 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } 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.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index d1c5d33ca..88a1cbe71 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -12,18 +12,18 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } 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.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/tokens/rpc/Cargo.toml b/tokens/rpc/Cargo.toml index b458baada..bfb92b8ae 100644 --- a/tokens/rpc/Cargo.toml +++ b/tokens/rpc/Cargo.toml @@ -8,13 +8,13 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0" } -jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } 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 205d804c1..0a1cebab3 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 = "3.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } orml-tokens = { default-features = false, path = "../../../tokens" } [features] diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs index 06fefa10c..f67ffdae6 100644 --- a/tokens/src/lib.rs +++ b/tokens/src/lib.rs @@ -37,6 +37,7 @@ #![cfg_attr(not(feature = "std"), no_std)] #![allow(clippy::unused_unit)] #![allow(clippy::comparison_chain)] +#![allow(deprecated)] // TODO: clean transactional pub use crate::imbalances::{NegativeImbalance, PositiveImbalance}; diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs index 485d21ce9..263e8cb28 100644 --- a/tokens/src/mock.rs +++ b/tokens/src/mock.rs @@ -130,6 +130,7 @@ impl pallet_treasury::Config for Runtime { type SpendFunds = (); type WeightInfo = (); type MaxApprovals = MaxApprovals; + type SpendOrigin = frame_support::traits::NeverEnsureOrigin; } thread_local! { diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 2edc59b67..4fd52308f 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -14,12 +14,12 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = num-traits = { version = "0.2.14", default-features = false } impl-trait-for-tuples = "0.2.2" -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } diff --git a/traits/src/currency.rs b/traits/src/currency.rs index cd0c9d71e..49fcaa464 100644 --- a/traits/src/currency.rs +++ b/traits/src/currency.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] // TODO: clean transactional + use crate::arithmetic; use codec::{Codec, FullCodec, MaxEncodedLen}; pub use frame_support::{ diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index 0210f9bf6..d8a28e96e 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -12,18 +12,18 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index 04b39624a..742ea0d8a 100644 --- a/utilities/Cargo.toml +++ b/utilities/Cargo.toml @@ -12,15 +12,15 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } [dev-dependencies] serde_json = "1.0.64" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index 88a61893a..2cd49a691 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -12,15 +12,15 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/vesting/src/lib.rs b/vesting/src/lib.rs index 2bb1ba083..092aae7bd 100644 --- a/vesting/src/lib.rs +++ b/vesting/src/lib.rs @@ -32,7 +32,7 @@ use frame_support::{ ensure, pallet_prelude::*, traits::{Currency, EnsureOrigin, ExistenceRequirement, Get, LockIdentifier, LockableCurrency, WithdrawReasons}, - transactional, BoundedVec, + BoundedVec, }; use frame_system::{ensure_root, ensure_signed, pallet_prelude::*}; use scale_info::TypeInfo; @@ -337,7 +337,6 @@ impl Pallet { }) } - #[transactional] fn do_vested_transfer(from: &T::AccountId, to: &T::AccountId, schedule: VestingScheduleOf) -> DispatchResult { let schedule_amount = ensure_valid_vesting_schedule::(&schedule)?; diff --git a/vesting/src/tests.rs b/vesting/src/tests.rs index f9cadd599..51706440d 100644 --- a/vesting/src/tests.rs +++ b/vesting/src/tests.rs @@ -4,8 +4,9 @@ use super::*; use frame_support::{assert_noop, assert_ok, error::BadOrigin}; -use mock::{Event, *}; +use mock::{Call, Event, *}; use pallet_balances::{BalanceLock, Reasons}; +use sp_runtime::traits::Dispatchable; #[test] fn vesting_from_chain_spec_works() { @@ -400,8 +401,13 @@ fn exceeding_maximum_schedules_should_fail() { }; assert_ok!(Vesting::vested_transfer(Origin::signed(ALICE), BOB, schedule.clone())); assert_ok!(Vesting::vested_transfer(Origin::signed(ALICE), BOB, schedule.clone())); + + let create = Call::Vesting(crate::Call::::vested_transfer { + dest: BOB, + schedule: schedule.clone(), + }); assert_noop!( - Vesting::vested_transfer(Origin::signed(ALICE), BOB, schedule.clone()), + create.dispatch(Origin::signed(ALICE)), Error::::MaxVestingSchedulesExceeded ); diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml index 499ffc62b..a57c6307a 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 = "2.1.2", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } weight-meter-procedural = { path = "weight-meter-procedural", default-features = false } [dev-dependencies] serde = { version = "1.0.136" } codec = { package = "parity-scale-codec", version = "3.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } [features] default = ["std"] diff --git a/weight-meter/weight-meter-procedural/Cargo.toml b/weight-meter/weight-meter-procedural/Cargo.toml index 45d5687ec..ec802c04d 100644 --- a/weight-meter/weight-meter-procedural/Cargo.toml +++ b/weight-meter/weight-meter-procedural/Cargo.toml @@ -9,9 +9,9 @@ edition = "2021" proc-macro = true [dependencies] -proc-macro2 = "1.0.6" -quote = "1.0.3" -syn = { version = "1.0.58", features = ["full"] } +proc-macro2 = "1.0.40" +quote = "1.0.18" +syn = { version = "1.0.98", features = ["full"] } [features] default = ["std"] diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index c1982ba54..24228853a 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -10,12 +10,12 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index 8e5fb812e..b646efd02 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -11,15 +11,15 @@ edition = "2021" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } [dev-dependencies] -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.25" } [features] default = ["std"] diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index dd1b7e1c4..a85c6d3e4 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -13,19 +13,19 @@ serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } # substrate -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.24" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.25" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false , branch = "polkadot-v0.9.24" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false , branch = "polkadot-v0.9.25" } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.24" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.25" } # orml orml-xcm-support = { path = "../xcm-support", default-features = false } @@ -33,21 +33,21 @@ orml-traits = { path = "../traits", default-features = false} [dev-dependencies] # substrate -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.24" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.25" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.24" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.25" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.24" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.25" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.25" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.25" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.25" } # orml orml-tokens = { path = "../tokens" } diff --git a/xtokens/src/lib.rs b/xtokens/src/lib.rs index f5d552244..cb3b41746 100644 --- a/xtokens/src/lib.rs +++ b/xtokens/src/lib.rs @@ -21,7 +21,9 @@ #![allow(clippy::from_over_into)] #![allow(clippy::unused_unit)] #![allow(clippy::large_enum_variant)] +#![allow(clippy::boxed_local)] #![allow(clippy::too_many_arguments)] +#![allow(deprecated)] use frame_support::{ log,