From 83a76c2bf66c0b1236c31077e6fb24bb760a3535 Mon Sep 17 00:00:00 2001 From: Xiliang Chen Date: Wed, 25 Oct 2023 15:12:39 +1300 Subject: [PATCH] use workspace deps (#960) * use workspace deps * fix * fix * fix * fix * bump --- Cargo.dev.toml | 128 ++++++++++-------- asset-registry/Cargo.toml | 56 ++++---- asset-registry/src/mock/mod.rs | 14 +- asset-registry/src/mock/para.rs | 4 +- asset-registry/src/tests.rs | 2 +- auction/Cargo.toml | 24 ++-- auction/src/lib.rs | 6 +- authority/Cargo.toml | 26 ++-- authority/src/lib.rs | 2 +- authority/src/mock.rs | 2 +- authority/src/tests.rs | 2 +- benchmarking/Cargo.toml | 28 ++-- benchmarking/src/lib.rs | 8 +- build-script-utils/Cargo.toml | 2 +- currencies/Cargo.toml | 28 ++-- currencies/src/lib.rs | 4 +- gradually-update/Cargo.toml | 20 +-- gradually-update/src/lib.rs | 2 +- gradually-update/src/tests.rs | 2 +- nft/Cargo.toml | 20 +-- nft/src/lib.rs | 2 +- oracle/Cargo.toml | 26 ++-- oracle/runtime-api/Cargo.toml | 10 +- oracle/runtime-api/src/lib.rs | 2 +- oracle/src/lib.rs | 2 +- parameters/Cargo.toml | 24 ++-- payments/Cargo.toml | 24 ++-- payments/src/types.rs | 2 +- rewards/Cargo.toml | 24 ++-- rewards/src/lib.rs | 2 +- tokens/Cargo.toml | 32 ++--- tokens/runtime-api/Cargo.toml | 12 +- tokens/runtime-api/src/lib.rs | 2 +- tokens/src/lib.rs | 2 +- traits/Cargo.toml | 22 +-- traits/src/auction.rs | 3 +- traits/src/currency.rs | 2 +- traits/src/lib.rs | 2 +- traits/src/nft.rs | 2 +- traits/src/parameters.rs | 52 +++---- traits/src/rewards.rs | 2 +- unknown-tokens/Cargo.toml | 22 +-- utilities/Cargo.toml | 18 +-- utilities/src/ordered_set.rs | 2 +- vesting/Cargo.toml | 22 +-- vesting/src/lib.rs | 2 +- xcm-support/Cargo.toml | 18 +-- xcm-support/src/currency_adapter.rs | 2 +- xcm/Cargo.toml | 18 +-- xtokens/Cargo.toml | 52 +++---- xtokens/src/mock/mod.rs | 14 +- xtokens/src/mock/para.rs | 2 +- xtokens/src/mock/para_relative_view.rs | 2 +- xtokens/src/mock/para_teleport.rs | 2 +- xtokens/src/mock/teleport_currency_adapter.rs | 2 +- xtokens/src/tests.rs | 4 +- 56 files changed, 422 insertions(+), 391 deletions(-) diff --git a/Cargo.dev.toml b/Cargo.dev.toml index bffa0dd42..3433f8068 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -29,68 +29,76 @@ resolver = "2" [profile.dev] split-debuginfo = "unpacked" -[patch.'https://github.com/paritytech/polkadot-sdk'] -frame-benchmarking = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -frame-support = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-authority-discovery = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-authorship = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-babe = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-balances = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-message-queue = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-scheduler = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-session = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-staking = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-timestamp = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-treasury = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-vesting = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-transaction-payment = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } +[workspace.dependencies] +log = { version = "0.4.20", default-features = false } +scale-info = { version = "2.10.0", default-features = false, features = ["derive"] } +serde = { version = "1.0.189" } +parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] } + +frame-benchmarking = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-authority-discovery = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-babe = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-balances = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-message-queue = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-session = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-staking = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-vesting = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-root-testing = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-api = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-authority-discovery = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-blockchain = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-consensus = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-consensus-slots = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-debug-derive = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-externalities = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-inherents = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-keystore = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-npos-elections = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-panic-handler = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-session = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-staking = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-state-machine = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-storage = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-timestamp = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-trie = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-version = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-wasm-interface = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-tracing = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-weights = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +parachain-info = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +polkadot-parachain-primitives = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } + +xcm-simulator = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } sc-client-api = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } sc-client-db = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } sc-executor = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } sc-executor-common = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } sc-utils = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-api = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-application-crypto = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-arithmetic = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-authority-discovery = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-blockchain = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-consensus = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-consensus-slots = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-debug-derive = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-externalities = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-inherents = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-keystore = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-npos-elections = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-panic-handler = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-runtime-interface = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-session = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-staking = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-state-machine = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-storage = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-timestamp = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-trie = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-version = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-wasm-interface = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-tracing = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-weights = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-primitives-core = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -parachain-info = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-xcm = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -polkadot-parachain-primitives = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.1.0" } diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml index fb4cec6a8..a499f2998 100644 --- a/asset-registry/Cargo.toml +++ b/asset-registry/Cargo.toml @@ -3,50 +3,50 @@ name = "orml-asset-registry" description = "Registry for (foreign) assets" repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/asset-registry" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Interlay Ltd, etc"] edition = "2021" [dependencies] -log = { version = "0.4.20", default-features = false } -scale-info = { version = "2.9.0", 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"] } +log = { workspace = true } +scale-info = { workspace = true } +serde = { workspace = true, optional = true } +parity-scale-codec = { workspace = true } # substrate -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-io = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +pallet-xcm = { workspace = true } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # orml -orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } +orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false } [dev-dependencies] # substrate -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { workspace = true, features = ["std"] } +sp-core = { workspace = true, features = ["std"] } +sp-io = { workspace = true, features = ["std"] } +pallet-message-queue = { workspace = true, features = ["std"] } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-core = { workspace = true, features = ["std"] } +cumulus-pallet-dmp-queue = { workspace = true, features = ["std"] } +cumulus-pallet-xcmp-queue = { workspace = true, features = ["std"] } +cumulus-pallet-xcm = { workspace = true, features = ["std"] } +parachain-info = { workspace = true, features = ["std"] } # polkadot -polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-parachain-primitives = { workspace = true, features = ["std"] } +polkadot-runtime-parachains = { workspace = true, features = ["std"] } +xcm-simulator = { workspace = true } # orml orml-tokens = { path = "../tokens" } @@ -59,7 +59,7 @@ default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "orml-traits/std", diff --git a/asset-registry/src/mock/mod.rs b/asset-registry/src/mock/mod.rs index dfcf58f77..7bcdf01aa 100644 --- a/asset-registry/src/mock/mod.rs +++ b/asset-registry/src/mock/mod.rs @@ -17,7 +17,19 @@ pub const ALICE: AccountId32 = AccountId32::new([0u8; 32]); pub const BOB: AccountId32 = AccountId32::new([1u8; 32]); pub const CHARLIE: AccountId32 = AccountId32::new([2u8; 32]); -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, codec::MaxEncodedLen, TypeInfo)] +#[derive( + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + PartialOrd, + Ord, + parity_scale_codec::MaxEncodedLen, + TypeInfo, +)] #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] pub enum CurrencyId { /// Relay chain token. diff --git a/asset-registry/src/mock/para.rs b/asset-registry/src/mock/para.rs index 3dc3aa3cc..d245955e6 100644 --- a/asset-registry/src/mock/para.rs +++ b/asset-registry/src/mock/para.rs @@ -2,7 +2,6 @@ use super::{Amount, Balance, CurrencyId, CurrencyIdConvert, ParachainXcmRouter}; use crate as orml_asset_registry; -use codec::{Decode, Encode, MaxEncodedLen}; use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId}; use frame_support::traits::{EnsureOrigin, EnsureOriginWithArg}; use frame_support::{ @@ -19,7 +18,8 @@ use orml_traits::{ }; use orml_xcm_support::{IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset}; use pallet_xcm::XcmPassthrough; -use polkadot_parachain::primitives::Sibling; +use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; +use polkadot_parachain_primitives::primitives::Sibling; use sp_core::H256; use sp_runtime::{ traits::{AccountIdConversion, Convert, IdentityLookup}, diff --git a/asset-registry/src/tests.rs b/asset-registry/src/tests.rs index 8e8e1b0c8..5ccaa3142 100644 --- a/asset-registry/src/tests.rs +++ b/asset-registry/src/tests.rs @@ -11,7 +11,7 @@ use frame_support::{ }; use mock::{para::RuntimeCall, *}; use orml_traits::MultiCurrency; -use polkadot_parachain::primitives::Sibling; +use polkadot_parachain_primitives::primitives::Sibling; use sp_runtime::{ traits::{AccountIdConversion, BadOrigin, Dispatchable}, diff --git a/auction/Cargo.toml b/auction/Cargo.toml index 73adc7044..b35561d80 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -3,32 +3,32 @@ name = "orml-auction" description = "Auction module that implements `Auction` trait." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/auction" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } +parity-scale-codec = { workspace = true } +scale-info = { workspace = true } +serde = { workspace = true, optional = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } -orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } +orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { workspace = true, features = ["std"] } +sp-io = { workspace = true, features = ["std"] } [features] default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "orml-traits/std", diff --git a/auction/src/lib.rs b/auction/src/lib.rs index bf5d86463..09fc61908 100644 --- a/auction/src/lib.rs +++ b/auction/src/lib.rs @@ -13,10 +13,10 @@ #![allow(clippy::string_lit_as_bytes)] #![allow(clippy::unused_unit)] -use codec::MaxEncodedLen; use frame_support::pallet_prelude::*; use frame_system::{ensure_signed, pallet_prelude::*}; use orml_traits::{Auction, AuctionHandler, AuctionInfo, Change}; +use parity_scale_codec::MaxEncodedLen; use sp_runtime::{ traits::{AtLeast32BitUnsigned, Bounded, CheckedAdd, MaybeSerializeDeserialize, Member, One, Zero}, DispatchError, DispatchResult, @@ -54,8 +54,8 @@ pub mod module { + Copy + MaybeSerializeDeserialize + Bounded - + codec::FullCodec - + codec::MaxEncodedLen; + + parity_scale_codec::FullCodec + + parity_scale_codec::MaxEncodedLen; /// The `AuctionHandler` that allow custom bidding logic and handles /// auction result. diff --git a/authority/Cargo.toml b/authority/Cargo.toml index 8993f17b2..77977f845 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -3,34 +3,34 @@ name = "orml-authority" description = "Utility pallet to perform ROOT calls in a PoA network" repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/auction" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +parity-scale-codec = { workspace = true } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } serde = { version = "1.0.145", optional = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-core = { workspace = true } +sp-io = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } [dev-dependencies] -pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-root-testing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-preimage = { workspace = true, features = ["std"] } +pallet-scheduler = { workspace = true, features = ["std"] } +pallet-root-testing = { workspace = true, features = ["std"] } +sp-io = { workspace = true, features = ["std"] } [features] default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "scale-info/std", diff --git a/authority/src/lib.rs b/authority/src/lib.rs index 64921151d..ff148b2dc 100644 --- a/authority/src/lib.rs +++ b/authority/src/lib.rs @@ -26,7 +26,6 @@ #![allow(clippy::borrowed_box)] #![allow(clippy::unused_unit)] -use codec::MaxEncodedLen; use frame_support::{ dispatch::PostDispatchInfo, dispatch::{DispatchClass, GetDispatchInfo, Pays}, @@ -37,6 +36,7 @@ use frame_support::{ }, }; use frame_system::{pallet_prelude::*, EnsureRoot, EnsureSigned}; +use parity_scale_codec::MaxEncodedLen; use scale_info::TypeInfo; use sp_core::defer; use sp_runtime::{ diff --git a/authority/src/mock.rs b/authority/src/mock.rs index f42f03144..00be4d249 100644 --- a/authority/src/mock.rs +++ b/authority/src/mock.rs @@ -3,13 +3,13 @@ #![cfg(test)] use super::*; -use codec::{Decode, Encode}; use frame_support::{ parameter_types, traits::{ConstU64, EqualPrivilegeOnly, Everything}, weights::Weight, }; use frame_system::{ensure_root, ensure_signed, EnsureRoot}; +use parity_scale_codec::{Decode, Encode}; use sp_core::H256; use sp_runtime::{ traits::{BadOrigin, IdentityLookup}, diff --git a/authority/src/tests.rs b/authority/src/tests.rs index 685fdcddb..8bdcc9f02 100644 --- a/authority/src/tests.rs +++ b/authority/src/tests.rs @@ -3,7 +3,6 @@ #![cfg(test)] use super::*; -use codec::MaxEncodedLen; use frame_support::{ assert_noop, assert_ok, dispatch::DispatchErrorWithPostInfo, @@ -14,6 +13,7 @@ use mock::{ authority, run_to_block, Authority, BlockNumber, ExtBuilder, MockAsOriginId, OriginCaller, Runtime, RuntimeCall, RuntimeOrigin, System, }; +use parity_scale_codec::MaxEncodedLen; use sp_io::hashing::blake2_256; use sp_runtime::{traits::BadOrigin, Perbill}; diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index be26eb049..37d1107a1 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -3,37 +3,37 @@ name = "orml-benchmarking" description = "Provide macro to benchmark Substrate runtime." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/benchmarking" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Laminar Developers "] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -log = { version = "0.4.20", default-features = false } +parity-scale-codec = { workspace = true } +log = { workspace = true } paste = "1.0.7" scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } +serde = { workspace = true, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-benchmarking = { workspace = true } +frame-support = { workspace = true } +sp-api = { workspace = true } +sp-io = { workspace = true } +sp-runtime = { workspace = true } +sp-runtime-interface = { workspace = true } +sp-std = { workspace = true } +sp-storage = { workspace = true } [dev-dependencies] hex-literal = "0.4.1" -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-system = { workspace = true, features = ["std"] } [features] default = [ "std" ] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-benchmarking/std", "frame-support/std", "log/std", diff --git a/benchmarking/src/lib.rs b/benchmarking/src/lib.rs index 8429cd3a3..0c368becd 100644 --- a/benchmarking/src/lib.rs +++ b/benchmarking/src/lib.rs @@ -5,8 +5,6 @@ mod tests; -#[doc(hidden)] -pub use codec; pub use frame_benchmarking::{ benchmarking, whitelisted_caller, BenchmarkBatch, BenchmarkConfig, BenchmarkError, BenchmarkList, BenchmarkMetadata, BenchmarkParameter, BenchmarkResult, Benchmarking, BenchmarkingSetup, @@ -18,6 +16,8 @@ pub use frame_support; #[doc(hidden)] pub use log; #[doc(hidden)] +pub use parity_scale_codec; +#[doc(hidden)] pub use paste; #[doc(hidden)] pub use sp_io::storage::root as storage_root; @@ -291,13 +291,13 @@ macro_rules! benchmarks_iter { >:: [< new_call_variant_ $dispatch >] ( $($arg),* ); - let __benchmarked_call_encoded = $crate::codec::Encode::encode( + let __benchmarked_call_encoded = $crate::parity_scale_codec::Encode::encode( &__call ); }: { let __call_decoded = < $pallet::Call::<$runtime $(, $instance )?> - as $crate::codec::Decode + as $crate::parity_scale_codec::Decode >::decode(&mut &__benchmarked_call_encoded[..]) .expect("call is encoded above, encoding must be correct"); let __origin = $crate::to_origin!($origin $(, $origin_type)?); diff --git a/build-script-utils/Cargo.toml b/build-script-utils/Cargo.toml index 09cd46743..57339e8c1 100644 --- a/build-script-utils/Cargo.toml +++ b/build-script-utils/Cargo.toml @@ -3,7 +3,7 @@ name = "orml-build-script-utils" description = "Crate with utility functions for `build.rs` scripts." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/build-script-utils" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Parity Technologies ", "Laminar Developers "] edition = "2021" diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index 97b27ec83..5f01f96d5 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -3,36 +3,36 @@ name = "orml-currencies" description = "Provide `MultiCurrency` implementation using `pallet-balances` and `orml-tokens` module." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/currencies" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Laminar Developers "] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +parity-scale-codec = { workspace = true } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } +serde = { workspace = true, optional = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-io = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } -orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } -orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } +orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false } +orml-utilities = { path = "../utilities", version = "0.5.0-dev", default-features = false } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { workspace = true, features = ["std"] } +sp-core = { workspace = true, features = ["std"] } -orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" } +orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.5.0-dev" } [features] default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "orml-traits/std", diff --git a/currencies/src/lib.rs b/currencies/src/lib.rs index f690c2718..f9fa5047e 100644 --- a/currencies/src/lib.rs +++ b/currencies/src/lib.rs @@ -39,7 +39,6 @@ #![cfg_attr(not(feature = "std"), no_std)] #![allow(clippy::unused_unit)] -use codec::Codec; use frame_support::{ pallet_prelude::*, traits::{ @@ -57,6 +56,7 @@ use orml_traits::{ NamedBasicReservableCurrency, NamedMultiReservableCurrency, }; use orml_utilities::with_transaction_result; +use parity_scale_codec::Codec; use sp_runtime::{ traits::{CheckedSub, MaybeSerializeDeserialize, StaticLookup, Zero}, DispatchError, DispatchResult, @@ -695,7 +695,7 @@ where + MaybeSerializeDeserialize + Debug + Default - + codec::MaxEncodedLen, + + parity_scale_codec::MaxEncodedLen, Currency: PalletCurrency, T: Config, { diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index 3a27ee1de..0ff276452 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -3,28 +3,28 @@ name = "orml-gradually-update" description = "Provides way to adjust numeric parameter gradually over a period of time." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/gradually-update" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Laminar Developers "] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } +serde = { workspace = true, optional = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-core = { workspace = true } +sp-io = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } [features] default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "scale-info/std", diff --git a/gradually-update/src/lib.rs b/gradually-update/src/lib.rs index 36d7d6e1c..a2fa33cd9 100644 --- a/gradually-update/src/lib.rs +++ b/gradually-update/src/lib.rs @@ -21,7 +21,6 @@ #![allow(clippy::string_lit_as_bytes)] #![allow(clippy::unused_unit)] -use codec::MaxEncodedLen; use frame_support::{ ensure, pallet_prelude::*, @@ -30,6 +29,7 @@ use frame_support::{ BoundedVec, }; use frame_system::pallet_prelude::*; +use parity_scale_codec::MaxEncodedLen; use scale_info::TypeInfo; use sp_runtime::{ traits::{SaturatedConversion, Saturating}, diff --git a/gradually-update/src/tests.rs b/gradually-update/src/tests.rs index 17f84b84e..6f07fb4c9 100644 --- a/gradually-update/src/tests.rs +++ b/gradually-update/src/tests.rs @@ -3,9 +3,9 @@ #![cfg(test)] use super::*; -use codec::Encode; use frame_support::{assert_noop, assert_ok}; use mock::*; +use parity_scale_codec::Encode; use sp_runtime::{FixedPointNumber, FixedU128, Permill}; fn storage_set(key: &[u8], value: &[u8]) { diff --git a/nft/Cargo.toml b/nft/Cargo.toml index dceacd5f0..df3813f1a 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -3,30 +3,30 @@ name = "orml-nft" description = "Non-fungible token pallet provides basic functions to create and manager NFT" repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/nft" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } +serde = { workspace = true, optional = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { workspace = true, features = ["std"] } +sp-io = { workspace = true, features = ["std"] } [features] default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "scale-info/std", diff --git a/nft/src/lib.rs b/nft/src/lib.rs index b6af89175..2b8bf2891 100644 --- a/nft/src/lib.rs +++ b/nft/src/lib.rs @@ -21,9 +21,9 @@ #![cfg_attr(not(feature = "std"), no_std)] #![allow(clippy::unused_unit)] -use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::{ensure, pallet_prelude::*, traits::Get, BoundedVec, Parameter}; use frame_system::pallet_prelude::*; +use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; use sp_runtime::{ traits::{AtLeast32BitUnsigned, CheckedAdd, CheckedSub, MaybeSerializeDeserialize, Member, One, Zero}, diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index 5d64fc2f1..3bf96cbc5 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -3,34 +3,34 @@ name = "orml-oracle" description = "Oracle module that makes off-chain data available on-chain." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/oracle" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Laminar Developers "] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +parity-scale-codec = { workspace = true } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } +serde = { workspace = true, optional = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-application-crypto = { workspace = true } +sp-io = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } -orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } -orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } +orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false } +orml-utilities = { path = "../utilities", version = "0.5.0-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +sp-core = { workspace = true } [features] default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "orml-traits/std", diff --git a/oracle/runtime-api/Cargo.toml b/oracle/runtime-api/Cargo.toml index ec3f5bb58..8646cbac9 100644 --- a/oracle/runtime-api/Cargo.toml +++ b/oracle/runtime-api/Cargo.toml @@ -1,20 +1,20 @@ [package] name = "orml-oracle-runtime-api" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Laminar Developers "] edition = "2021" license = "Apache-2.0" description = "Runtime API module for orml-oracle." [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } +sp-api = { workspace = true } +sp-std = { workspace = true } [features] default = ["std"] std = [ - "codec/std", + "parity-scale-codec/std", "sp-api/std", "sp-std/std" ] diff --git a/oracle/runtime-api/src/lib.rs b/oracle/runtime-api/src/lib.rs index fb4cca1ad..7a87dbe40 100644 --- a/oracle/runtime-api/src/lib.rs +++ b/oracle/runtime-api/src/lib.rs @@ -6,7 +6,7 @@ // The `unnecessary_mut_passed` warning originates from `decl_runtime_apis` macro. #![allow(clippy::unnecessary_mut_passed)] -use codec::Codec; +use parity_scale_codec::Codec; use sp_std::prelude::Vec; sp_api::decl_runtime_apis! { diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs index 96ba87527..abaa545b9 100644 --- a/oracle/src/lib.rs +++ b/oracle/src/lib.rs @@ -19,7 +19,7 @@ #![allow(clippy::string_lit_as_bytes)] #![allow(clippy::unused_unit)] -use codec::{Decode, Encode, MaxEncodedLen}; +use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; diff --git a/parameters/Cargo.toml b/parameters/Cargo.toml index ca46051f2..b744bbd05 100644 --- a/parameters/Cargo.toml +++ b/parameters/Cargo.toml @@ -3,33 +3,33 @@ name = "orml-parameters" description = "Offer a centra place to store and configure parameters." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/parameters" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } +serde = { workspace = true, optional = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-runtime = { workspace = true } +sp-core = { workspace = true } +sp-std = { workspace = true } -orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } +orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { workspace = true, features = ["std"] } +sp-io = { workspace = true, features = ["std"] } [features] default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "scale-info/std", diff --git a/payments/Cargo.toml b/payments/Cargo.toml index 5e82b5e9a..187e5d6a9 100644 --- a/payments/Cargo.toml +++ b/payments/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Virto Network "] edition = '2021' name = "orml-payments" -version = "0.4.1-dev" +version = "0.5.0-dev" license = "Apache-2.0" homepage = "https://github.com/virto-network/virto-node" repository = "https://github.com/virto-network/virto-node" @@ -10,29 +10,29 @@ description = "Allows users to post escrow payment on-chain" readme = "README.md" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -log = { version = "0.4.20", default-features = false } +parity-scale-codec = { workspace = true } +log = { workspace = true } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } -orml-traits = {path = "../traits", version = "0.4.1-dev", default-features = false } +orml-traits = {path = "../traits", version = "0.5.0-dev", default-features = false } [dev-dependencies] serde = "1.0.136" -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +sp-core = { workspace = true } +sp-io = { workspace = true } -orml-tokens = { path = "../tokens", version = "0.4.1-dev", default-features = false } +orml-tokens = { path = "../tokens", version = "0.5.0-dev", default-features = false } [features] default = ['std'] std = [ - 'codec/std', + 'parity-scale-codec/std', 'frame-support/std', 'frame-system/std', 'log/std', diff --git a/payments/src/types.rs b/payments/src/types.rs index ad320677b..88cca5397 100644 --- a/payments/src/types.rs +++ b/payments/src/types.rs @@ -1,7 +1,7 @@ #![allow(unused_qualifications)] use crate::{pallet, AssetIdOf, BalanceOf}; -use codec::{Decode, Encode, HasCompact, MaxEncodedLen}; use frame_system::pallet_prelude::*; +use parity_scale_codec::{Decode, Encode, HasCompact, MaxEncodedLen}; use scale_info::TypeInfo; use sp_runtime::{DispatchResult, Percent}; diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index 28e8eba84..08538c38a 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -3,33 +3,33 @@ name = "orml-rewards" description = "Store and manage shares and rewards" repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/rewards" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } +serde = { workspace = true, optional = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, features = ["serde"], branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-core = { workspace = true } +sp-io = { workspace = true } +sp-runtime = { workspace = true, features = ["serde"] } +sp-std = { workspace = true } -orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } +orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { workspace = true, features = ["std"] } [features] default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "orml-traits/std", diff --git a/rewards/src/lib.rs b/rewards/src/lib.rs index b98d521f4..59bd3567f 100644 --- a/rewards/src/lib.rs +++ b/rewards/src/lib.rs @@ -5,9 +5,9 @@ mod mock; mod tests; -use codec::{FullCodec, HasCompact}; use frame_support::pallet_prelude::*; use orml_traits::RewardHandler; +use parity_scale_codec::{FullCodec, HasCompact}; use scale_info::TypeInfo; use sp_core::U256; use sp_runtime::{ diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index 4499320ab..382f94b36 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -3,37 +3,37 @@ name = "orml-tokens" description = "Fungible tokens module that implements `MultiCurrency` trait." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/tokens" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Laminar Developers "] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -log = { version = "0.4.20", default-features = false } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +log = { workspace = true } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } +serde = { workspace = true, optional = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-arithmetic = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } -orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } +orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false } [dev-dependencies] -pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-elections-phragmen = { workspace = true, features = ["std"] } +pallet-treasury = { workspace = true, features = ["std"] } +sp-core = { workspace = true, features = ["std"] } +sp-io = { workspace = true, features = ["std"] } +sp-staking = { workspace = true, features = ["std"] } [features] default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "orml-traits/std", diff --git a/tokens/runtime-api/Cargo.toml b/tokens/runtime-api/Cargo.toml index e75fd9b36..67c10a54d 100644 --- a/tokens/runtime-api/Cargo.toml +++ b/tokens/runtime-api/Cargo.toml @@ -1,21 +1,21 @@ [package] name = "orml-tokens-runtime-api" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Laminar Developers "] edition = "2021" license = "Apache-2.0" description = "Runtime API module for orml-tokens." [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } +frame-support = { workspace = true } +sp-api = { workspace = true } +sp-runtime = { workspace = true } [features] default = ["std"] std = [ - "codec/std", + "parity-scale-codec/std", "frame-support/std", "sp-api/std", "sp-runtime/std", diff --git a/tokens/runtime-api/src/lib.rs b/tokens/runtime-api/src/lib.rs index fa7ceb0bd..a54962c0c 100644 --- a/tokens/runtime-api/src/lib.rs +++ b/tokens/runtime-api/src/lib.rs @@ -6,7 +6,7 @@ // The `unnecessary_mut_passed` warning originates from `decl_runtime_apis` macro. #![allow(clippy::unnecessary_mut_passed)] -use codec::Codec; +use parity_scale_codec::Codec; sp_api::decl_runtime_apis! { pub trait TokensApi where diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs index 8a7ab8ac2..a27b57708 100644 --- a/tokens/src/lib.rs +++ b/tokens/src/lib.rs @@ -40,7 +40,6 @@ pub use crate::imbalances::{NegativeImbalance, PositiveImbalance}; -use codec::MaxEncodedLen; use frame_support::{ ensure, pallet_prelude::*, @@ -57,6 +56,7 @@ use frame_support::{ transactional, BoundedVec, }; use frame_system::{ensure_signed, pallet_prelude::*}; +use parity_scale_codec::MaxEncodedLen; use scale_info::TypeInfo; use sp_runtime::{ traits::{ diff --git a/traits/Cargo.toml b/traits/Cargo.toml index acc7112a7..2f20ae568 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -3,33 +3,33 @@ name = "orml-traits" description = "Shared traits including `BasicCurrency`, `MultiCurrency`, `Auction` and more." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/traits" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Laminar Developers "] edition = "2021" [dependencies] scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +serde = { workspace = true, optional = true } +parity-scale-codec = { workspace = true } num-traits = { version = "0.2.14", default-features = false } impl-trait-for-tuples = "0.2.2" paste = "1.0" -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, features = ["serde"], branch = "release-polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +sp-runtime = { workspace = true, features = ["serde"] } +sp-core = { workspace = true } +sp-io = { workspace = true } +sp-std = { workspace = true } +frame-support = { workspace = true } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +xcm = { workspace = true } -orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } +orml-utilities = { path = "../utilities", version = "0.5.0-dev", default-features = false } [features] default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "scale-info/std", "sp-runtime/std", "sp-core/std", diff --git a/traits/src/auction.rs b/traits/src/auction.rs index 28d2e10e1..7096129f3 100644 --- a/traits/src/auction.rs +++ b/traits/src/auction.rs @@ -1,6 +1,5 @@ use crate::Change; -use codec::FullCodec; -use codec::{Decode, Encode, MaxEncodedLen}; +use parity_scale_codec::{Decode, Encode, FullCodec, MaxEncodedLen}; use scale_info::TypeInfo; use sp_runtime::{ traits::{AtLeast32Bit, Bounded, MaybeSerializeDeserialize}, diff --git a/traits/src/currency.rs b/traits/src/currency.rs index 0d50e7477..a8ecf1e2f 100644 --- a/traits/src/currency.rs +++ b/traits/src/currency.rs @@ -1,9 +1,9 @@ use crate::{arithmetic, Happened}; -use codec::{Codec, FullCodec, MaxEncodedLen}; pub use frame_support::{ traits::{BalanceStatus, DefensiveSaturating, LockIdentifier}, transactional, }; +use parity_scale_codec::{Codec, FullCodec, MaxEncodedLen}; use sp_runtime::{ traits::{AtLeast32BitUnsigned, MaybeSerializeDeserialize}, DispatchError, DispatchResult, diff --git a/traits/src/lib.rs b/traits/src/lib.rs index 3f7bb010a..d5777ea6e 100644 --- a/traits/src/lib.rs +++ b/traits/src/lib.rs @@ -1,7 +1,7 @@ #![cfg_attr(not(feature = "std"), no_std)] -use codec::{Decode, Encode, MaxEncodedLen}; use impl_trait_for_tuples::impl_for_tuples; +use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use sp_runtime::{DispatchResult, RuntimeDebug}; use sp_std::{ cmp::{Eq, PartialEq}, diff --git a/traits/src/nft.rs b/traits/src/nft.rs index a333dcbbc..fab986183 100644 --- a/traits/src/nft.rs +++ b/traits/src/nft.rs @@ -1,5 +1,5 @@ -use codec::FullCodec; use frame_support::traits::tokens::nonfungibles::Inspect; +use parity_scale_codec::FullCodec; use sp_runtime::traits::{AtLeast32BitUnsigned, MaybeSerializeDeserialize}; use sp_std::fmt::Debug; diff --git a/traits/src/parameters.rs b/traits/src/parameters.rs index 18da015d9..e47c12489 100644 --- a/traits/src/parameters.rs +++ b/traits/src/parameters.rs @@ -1,9 +1,9 @@ #[doc(hidden)] -pub use codec; -#[doc(hidden)] pub use frame_support; use frame_support::Parameter; #[doc(hidden)] +pub use parity_scale_codec; +#[doc(hidden)] pub use paste; #[doc(hidden)] pub use scale_info; @@ -30,8 +30,8 @@ pub trait Key { } pub trait AggregratedKeyValue: Parameter { - type AggregratedKey: Parameter + codec::MaxEncodedLen; - type AggregratedValue: Parameter + codec::MaxEncodedLen; + type AggregratedKey: Parameter + parity_scale_codec::MaxEncodedLen; + type AggregratedValue: Parameter + parity_scale_codec::MaxEncodedLen; fn into_parts(self) -> (Self::AggregratedKey, Option); } @@ -140,9 +140,9 @@ macro_rules! define_parameters { Clone, PartialEq, Eq, - $crate::parameters::codec::Encode, - $crate::parameters::codec::Decode, - $crate::parameters::codec::MaxEncodedLen, + $crate::parameters::parity_scale_codec::Encode, + $crate::parameters::parity_scale_codec::Decode, + $crate::parameters::parity_scale_codec::MaxEncodedLen, $crate::parameters::sp_runtime::RuntimeDebug, $crate::parameters::scale_info::TypeInfo )] @@ -157,9 +157,9 @@ macro_rules! define_parameters { Clone, PartialEq, Eq, - $crate::parameters::codec::Encode, - $crate::parameters::codec::Decode, - $crate::parameters::codec::MaxEncodedLen, + $crate::parameters::parity_scale_codec::Encode, + $crate::parameters::parity_scale_codec::Decode, + $crate::parameters::parity_scale_codec::MaxEncodedLen, $crate::parameters::sp_runtime::RuntimeDebug, $crate::parameters::scale_info::TypeInfo )] @@ -174,9 +174,9 @@ macro_rules! define_parameters { Clone, PartialEq, Eq, - $crate::parameters::codec::Encode, - $crate::parameters::codec::Decode, - $crate::parameters::codec::MaxEncodedLen, + $crate::parameters::parity_scale_codec::Encode, + $crate::parameters::parity_scale_codec::Decode, + $crate::parameters::parity_scale_codec::MaxEncodedLen, $crate::parameters::sp_runtime::RuntimeDebug, $crate::parameters::scale_info::TypeInfo )] @@ -205,9 +205,9 @@ macro_rules! define_parameters { Clone, PartialEq, Eq, - $crate::parameters::codec::Encode, - $crate::parameters::codec::Decode, - $crate::parameters::codec::MaxEncodedLen, + $crate::parameters::parity_scale_codec::Encode, + $crate::parameters::parity_scale_codec::Decode, + $crate::parameters::parity_scale_codec::MaxEncodedLen, $crate::parameters::sp_runtime::RuntimeDebug, $crate::parameters::scale_info::TypeInfo )] @@ -330,9 +330,9 @@ macro_rules! define_aggregrated_parameters { Clone, PartialEq, Eq, - $crate::parameters::codec::Encode, - $crate::parameters::codec::Decode, - $crate::parameters::codec::MaxEncodedLen, + $crate::parameters::parity_scale_codec::Encode, + $crate::parameters::parity_scale_codec::Decode, + $crate::parameters::parity_scale_codec::MaxEncodedLen, $crate::parameters::sp_runtime::RuntimeDebug, $crate::parameters::scale_info::TypeInfo )] @@ -347,9 +347,9 @@ macro_rules! define_aggregrated_parameters { Clone, PartialEq, Eq, - $crate::parameters::codec::Encode, - $crate::parameters::codec::Decode, - $crate::parameters::codec::MaxEncodedLen, + $crate::parameters::parity_scale_codec::Encode, + $crate::parameters::parity_scale_codec::Decode, + $crate::parameters::parity_scale_codec::MaxEncodedLen, $crate::parameters::sp_runtime::RuntimeDebug, $crate::parameters::scale_info::TypeInfo )] @@ -364,9 +364,9 @@ macro_rules! define_aggregrated_parameters { Clone, PartialEq, Eq, - $crate::parameters::codec::Encode, - $crate::parameters::codec::Decode, - $crate::parameters::codec::MaxEncodedLen, + $crate::parameters::parity_scale_codec::Encode, + $crate::parameters::parity_scale_codec::Decode, + $crate::parameters::parity_scale_codec::MaxEncodedLen, $crate::parameters::sp_runtime::RuntimeDebug, $crate::parameters::scale_info::TypeInfo )] @@ -496,7 +496,7 @@ mod tests { #[test] fn test_define_aggregrated_parameters_key_convert() { use crate::parameters::workaround::Into2; - use codec::Encode; + use parity_scale_codec::Encode; let key1 = pallet1::Key1; let parameter_key: pallet1::ParametersKey = key1.clone().into(); diff --git a/traits/src/rewards.rs b/traits/src/rewards.rs index a30df88c9..27280761a 100644 --- a/traits/src/rewards.rs +++ b/traits/src/rewards.rs @@ -1,4 +1,4 @@ -use codec::FullCodec; +use parity_scale_codec::FullCodec; use sp_runtime::traits::{AtLeast32BitUnsigned, MaybeSerializeDeserialize}; use sp_std::fmt::Debug; diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index 74a494c77..744be3f13 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -3,27 +3,27 @@ name = "orml-unknown-tokens" description = "Unknown tokens module that implements `UnknownAsset` trait." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/unknown-tokens" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +parity-scale-codec = { workspace = true } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } +serde = { workspace = true, optional = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-std = { workspace = true } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +xcm = { workspace = true } orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { workspace = true, features = ["std"] } +sp-io = { workspace = true, features = ["std"] } +sp-runtime = { workspace = true, features = ["std"] } hex-literal = "0.4.1" [features] @@ -31,7 +31,7 @@ default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "orml-xcm-support/std", diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index eca531d78..7c44f7d5e 100644 --- a/utilities/Cargo.toml +++ b/utilities/Cargo.toml @@ -3,31 +3,31 @@ name = "orml-utilities" description = "Various utilities including `FixedU128` and `LinkedList`." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/utilities" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Laminar Developers "] edition = "2021" [dependencies] scale-info = { version = "2.9.0", 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"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, features = ["serde"], branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +sp-runtime = { workspace = true, features = ["serde"] } +sp-std = { workspace = true } +sp-io = { workspace = true } +sp-core = { workspace = true } [dev-dependencies] serde_json = "1.0.64" -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-system = { workspace = true, features = ["std"] } [features] default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "scale-info/std", "frame-support/std", "sp-runtime/std", diff --git a/utilities/src/ordered_set.rs b/utilities/src/ordered_set.rs index f54151824..85c65d634 100644 --- a/utilities/src/ordered_set.rs +++ b/utilities/src/ordered_set.rs @@ -1,5 +1,5 @@ -use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::{traits::Get, BoundedVec, CloneNoBound, DefaultNoBound, PartialEqNoBound}; +use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; #[cfg(feature = "std")] use sp_std::{fmt, prelude::*}; diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index ebd5c9624..132ce5ec6 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -3,31 +3,31 @@ name = "orml-vesting" description = "Provides scheduled balance locking mechanism, in a *graded vesting* way." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/vesting" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Laminar Developers "] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } +serde = { workspace = true, optional = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-io = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { workspace = true, features = ["std"] } +sp-core = { workspace = true, features = ["std"] } [features] default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "scale-info/std", diff --git a/vesting/src/lib.rs b/vesting/src/lib.rs index 467b78f4b..0490be5ed 100644 --- a/vesting/src/lib.rs +++ b/vesting/src/lib.rs @@ -27,7 +27,6 @@ #![cfg_attr(not(feature = "std"), no_std)] #![allow(clippy::unused_unit)] -use codec::{HasCompact, MaxEncodedLen}; use frame_support::{ ensure, pallet_prelude::*, @@ -35,6 +34,7 @@ use frame_support::{ BoundedVec, }; use frame_system::{ensure_root, ensure_signed, pallet_prelude::*}; +use parity_scale_codec::{HasCompact, MaxEncodedLen}; use scale_info::TypeInfo; use sp_runtime::{ traits::{AtLeast32Bit, BlockNumberProvider, CheckedAdd, Saturating, StaticLookup, Zero}, diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index 3151c8994..952ed47c5 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -3,26 +3,26 @@ name = "orml-xcm-support" description = "Supporting module for XCM integration." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/xcm-support" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +parity-scale-codec = { workspace = true } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +xcm = { workspace = true } +xcm-executor = { workspace = true } -orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } +orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false } [features] default = ["std"] std = [ - "codec/std", + "parity-scale-codec/std", "frame-support/std", "orml-traits/std", "sp-runtime/std", diff --git a/xcm-support/src/currency_adapter.rs b/xcm-support/src/currency_adapter.rs index e3c6c0c69..63dcdca16 100644 --- a/xcm-support/src/currency_adapter.rs +++ b/xcm-support/src/currency_adapter.rs @@ -1,5 +1,5 @@ -use codec::FullCodec; use frame_support::traits::Get; +use parity_scale_codec::FullCodec; use sp_runtime::{ traits::{Convert, MaybeSerializeDeserialize, SaturatedConversion}, DispatchError, diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index d121ce8a0..f88d296a1 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -3,28 +3,28 @@ name = "orml-xcm" description = "XCM message helpers." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/xcm" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +parity-scale-codec = { workspace = true } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-std = { workspace = true } -pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +pallet-xcm = { workspace = true } +xcm = { workspace = true } [dev-dependencies] -xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +xcm-executor = { workspace = true, features = ["std"] } [features] default = ["std"] std = [ - "codec/std", + "parity-scale-codec/std", "frame-support/std", "frame-system/std", "pallet-xcm/std", diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index 98296f2ea..ae307e9eb 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -3,30 +3,30 @@ name = "orml-xtokens" description = "Cross-chain token transfer." repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/xtokens" license = "Apache-2.0" -version = "0.4.1-dev" +version = "0.5.0-dev" authors = ["Acala Developers"] edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -log = { version = "0.4.20", default-features = false } +parity-scale-codec = { workspace = true } +log = { workspace = true } scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.136", optional = true } +serde = { workspace = true, optional = true } # substrate -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-io = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } # cumulus -cumulus-primitives-core = { default-features = false , git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-core = { default-features = false , workspace = true } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } -xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" } +pallet-xcm = { workspace = true } +xcm = { workspace = true } +xcm-executor = { workspace = true } # orml orml-traits = { path = "../traits", default-features = false} @@ -34,22 +34,22 @@ orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] # substrate -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { workspace = true, features = ["std"] } +sp-core = { workspace = true, features = ["std"] } +pallet-message-queue = { workspace = true, features = ["std"] } # cumulus -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-pallet-dmp-queue = { workspace = true, features = ["std"] } +cumulus-pallet-xcm = { workspace = true, features = ["std"] } +cumulus-pallet-xcmp-queue = { workspace = true, features = ["std"] } +cumulus-primitives-core = { workspace = true, features = ["std"] } +parachain-info = { workspace = true, features = ["std"] } # polkadot -polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-parachain-primitives = { workspace = true, features = ["std"] } +polkadot-runtime-parachains = { workspace = true, features = ["std"] } +xcm-builder = { workspace = true, features = ["std"] } +xcm-simulator = { workspace = true } # orml orml-tokens = { path = "../tokens" } @@ -60,7 +60,7 @@ default = ["std"] std = [ "serde", - "codec/std", + "parity-scale-codec/std", "cumulus-primitives-core/std", "frame-support/std", "frame-system/std", diff --git a/xtokens/src/mock/mod.rs b/xtokens/src/mock/mod.rs index a18d8eafa..bec6dd96c 100644 --- a/xtokens/src/mock/mod.rs +++ b/xtokens/src/mock/mod.rs @@ -22,7 +22,19 @@ pub mod teleport_currency_adapter; pub const ALICE: AccountId32 = AccountId32::new([0u8; 32]); pub const BOB: AccountId32 = AccountId32::new([1u8; 32]); -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, codec::MaxEncodedLen, TypeInfo)] +#[derive( + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + PartialOrd, + Ord, + parity_scale_codec::MaxEncodedLen, + TypeInfo, +)] #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] pub enum CurrencyId { /// Relay chain token. diff --git a/xtokens/src/mock/para.rs b/xtokens/src/mock/para.rs index 4b01af854..4e812c2da 100644 --- a/xtokens/src/mock/para.rs +++ b/xtokens/src/mock/para.rs @@ -15,7 +15,7 @@ use sp_runtime::{ use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId}; use pallet_xcm::XcmPassthrough; -use polkadot_parachain::primitives::Sibling; +use polkadot_parachain_primitives::primitives::Sibling; use xcm::v3::{prelude::*, Weight}; use xcm_builder::{ AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, NativeAsset, ParentIsPreset, RelayChainAsNative, diff --git a/xtokens/src/mock/para_relative_view.rs b/xtokens/src/mock/para_relative_view.rs index 38bb3b95c..721af1303 100644 --- a/xtokens/src/mock/para_relative_view.rs +++ b/xtokens/src/mock/para_relative_view.rs @@ -15,7 +15,7 @@ use sp_runtime::{ use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId}; use pallet_xcm::XcmPassthrough; -use polkadot_parachain::primitives::Sibling; +use polkadot_parachain_primitives::primitives::Sibling; use xcm::v3::{prelude::*, Weight}; use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedWeightBounds, ParentIsPreset, diff --git a/xtokens/src/mock/para_teleport.rs b/xtokens/src/mock/para_teleport.rs index dddaad3b8..1a12c7998 100644 --- a/xtokens/src/mock/para_teleport.rs +++ b/xtokens/src/mock/para_teleport.rs @@ -15,7 +15,7 @@ use sp_runtime::{ use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId}; use pallet_xcm::XcmPassthrough; -use polkadot_parachain::primitives::Sibling; +use polkadot_parachain_primitives::primitives::Sibling; use xcm::v3::{prelude::*, Weight}; use xcm_builder::{ AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, NativeAsset, ParentIsPreset, RelayChainAsNative, diff --git a/xtokens/src/mock/teleport_currency_adapter.rs b/xtokens/src/mock/teleport_currency_adapter.rs index 7350d666f..6730243ee 100644 --- a/xtokens/src/mock/teleport_currency_adapter.rs +++ b/xtokens/src/mock/teleport_currency_adapter.rs @@ -1,4 +1,4 @@ -use codec::FullCodec; +use parity_scale_codec::FullCodec; use sp_runtime::traits::{Convert, MaybeSerializeDeserialize, SaturatedConversion}; use sp_std::{ cmp::{Eq, PartialEq}, diff --git a/xtokens/src/tests.rs b/xtokens/src/tests.rs index 5ec48ab1b..3c0806e5e 100644 --- a/xtokens/src/tests.rs +++ b/xtokens/src/tests.rs @@ -1,12 +1,12 @@ #![cfg(test)] use super::*; -use codec::Encode; use cumulus_primitives_core::ParaId; use frame_support::{assert_err, assert_noop, assert_ok, traits::Currency}; use mock::*; use orml_traits::{ConcreteFungibleAsset, MultiCurrency}; -use polkadot_parachain::primitives::Sibling; +use parity_scale_codec::Encode; +use polkadot_parachain_primitives::primitives::Sibling; use sp_runtime::{traits::AccountIdConversion, AccountId32}; use xcm::{v3::OriginKind::SovereignAccount, VersionedXcm}; use xcm_simulator::TestExt;