From 6b812dfb280cbee602066138cc501f23dd06a682 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Tue, 20 Dec 2022 17:28:29 +0100 Subject: [PATCH 1/5] build: upgrade to polkadot v0.9.36 Signed-off-by: Yaroslav Bolyukin --- Cargo.dev.toml | 128 ++++++++++++------------- asset-registry/Cargo.toml | 31 +++--- asset-registry/src/impls.rs | 4 +- asset-registry/src/lib.rs | 2 + asset-registry/src/mock/para.rs | 6 +- auction/Cargo.toml | 12 +-- auction/src/lib.rs | 1 + authority/Cargo.toml | 19 ++-- authority/src/lib.rs | 9 ++ authority/src/mock.rs | 3 + authority/src/tests.rs | 22 ++--- bencher/Cargo.toml | 24 ++--- bencher/test/Cargo.toml | 12 +-- bencher/test/src/lib.rs | 4 +- benchmarking/Cargo.toml | 18 ++-- benchmarking/src/tests.rs | 2 + currencies/Cargo.toml | 14 +-- currencies/src/lib.rs | 3 + gradually-update/Cargo.toml | 12 +-- gradually-update/src/lib.rs | 2 + nft/Cargo.toml | 12 +-- oracle/Cargo.toml | 14 +-- oracle/rpc/Cargo.toml | 6 +- oracle/rpc/runtime-api/Cargo.toml | 4 +- oracle/src/lib.rs | 1 + payments/Cargo.toml | 12 +-- payments/src/lib.rs | 8 ++ rewards/Cargo.toml | 14 +-- tokens/Cargo.toml | 16 ++-- tokens/rpc/Cargo.toml | 12 +-- tokens/rpc/runtime-api/Cargo.toml | 6 +- tokens/src/impls.rs | 4 + tokens/src/lib.rs | 9 ++ traits/Cargo.toml | 8 +- unknown-tokens/Cargo.toml | 12 +-- utilities/Cargo.toml | 10 +- vesting/Cargo.toml | 14 +-- vesting/src/lib.rs | 4 + weight-meter/Cargo.toml | 14 +-- weight-meter/src/mock.rs | 6 ++ xcm-support/Cargo.toml | 6 +- xcm/Cargo.toml | 6 +- xcm/src/lib.rs | 1 + xtokens/Cargo.toml | 36 ++++--- xtokens/src/lib.rs | 6 ++ xtokens/src/mock/para.rs | 6 +- xtokens/src/mock/para_relative_view.rs | 6 +- xtokens/src/mock/para_teleport.rs | 6 +- 48 files changed, 334 insertions(+), 253 deletions(-) diff --git a/Cargo.dev.toml b/Cargo.dev.toml index 3f494b98d..a5d4bf947 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -32,71 +32,71 @@ resolver = "2" split-debuginfo = "unpacked" [patch.'https://github.com/paritytech/substrate'] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } [patch.'https://github.com/paritytech/cumulus'] -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "eb044b17ef24e7f10fa3408ffbd900f8a9da837f" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "eb044b17ef24e7f10fa3408ffbd900f8a9da837f" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "eb044b17ef24e7f10fa3408ffbd900f8a9da837f" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "eb044b17ef24e7f10fa3408ffbd900f8a9da837f" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "eb044b17ef24e7f10fa3408ffbd900f8a9da837f" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "391a5d89880283dfd49b0be95dd214274d28de4d" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "391a5d89880283dfd49b0be95dd214274d28de4d" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "391a5d89880283dfd49b0be95dd214274d28de4d" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "391a5d89880283dfd49b0be95dd214274d28de4d" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "391a5d89880283dfd49b0be95dd214274d28de4d" } [patch.'https://github.com/paritytech/polkadot'] -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -xcm = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "dc25abc712e42b9b51d87ad1168e453a42b5f0bc" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "dc25abc712e42b9b51d87ad1168e453a42b5f0bc" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "dc25abc712e42b9b51d87ad1168e453a42b5f0bc" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "dc25abc712e42b9b51d87ad1168e453a42b5f0bc" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "dc25abc712e42b9b51d87ad1168e453a42b5f0bc" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = "dc25abc712e42b9b51d87ad1168e453a42b5f0bc" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "dc25abc712e42b9b51d87ad1168e453a42b5f0bc" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "dc25abc712e42b9b51d87ad1168e453a42b5f0bc" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "dc25abc712e42b9b51d87ad1168e453a42b5f0bc" } diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml index aa99ae6f2..e61d6df31 100644 --- a/asset-registry/Cargo.toml +++ b/asset-registry/Cargo.toml @@ -7,16 +7,23 @@ version = "0.4.1-dev" authors = ["Interlay Ltd, etc"] edition = "2021" +[package.metadata.deppatcher.originals.dev-dependencies] +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } + [dependencies] scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } # polkadot pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } @@ -29,16 +36,16 @@ orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = fa [dev-dependencies] # substrate -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } # polkadot polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } diff --git a/asset-registry/src/impls.rs b/asset-registry/src/impls.rs index 6dc50b8f1..9bb8e6678 100644 --- a/asset-registry/src/impls.rs +++ b/asset-registry/src/impls.rs @@ -1,5 +1,5 @@ use crate::module::*; -use frame_support::{log, pallet_prelude::*, weights::constants::WEIGHT_PER_SECOND}; +use frame_support::{log, pallet_prelude::*, weights::constants::WEIGHT_REF_TIME_PER_SECOND}; use orml_traits::{ asset_registry::{ AssetMetadata, AssetProcessor, FixedConversionRateProvider, Inspect, Mutate, WeightToFeeConverter, @@ -55,7 +55,7 @@ pub struct FixedRateAssetRegistryTrader(PhantomD impl WeightToFeeConverter for FixedRateAssetRegistryTrader

{ fn convert_weight_to_fee(location: &MultiLocation, weight: Weight) -> Option { let fee_per_second = P::get_fee_per_second(location)?; - let weight_ratio = FixedU128::saturating_from_rational(weight.ref_time(), WEIGHT_PER_SECOND.ref_time() as u128); + let weight_ratio = FixedU128::saturating_from_rational(weight.ref_time(), WEIGHT_REF_TIME_PER_SECOND); let amount = weight_ratio.saturating_mul_int(fee_per_second); Some(amount) } diff --git a/asset-registry/src/lib.rs b/asset-registry/src/lib.rs index 4086f19b6..2bea733e5 100644 --- a/asset-registry/src/lib.rs +++ b/asset-registry/src/lib.rs @@ -140,6 +140,7 @@ pub mod module { #[pallet::call] impl Pallet { + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::register_asset())] pub fn register_asset( origin: OriginFor, @@ -151,6 +152,7 @@ pub mod module { Self::do_register_asset(metadata, asset_id) } + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::update_asset())] pub fn update_asset( origin: OriginFor, diff --git a/asset-registry/src/mock/para.rs b/asset-registry/src/mock/para.rs index e8900a634..2e60a6350 100644 --- a/asset-registry/src/mock/para.rs +++ b/asset-registry/src/mock/para.rs @@ -8,7 +8,7 @@ use frame_support::traits::{EnsureOrigin, EnsureOriginWithArg}; use frame_support::{ construct_runtime, match_types, ord_parameter_types, parameter_types, traits::{ConstU128, ConstU32, ConstU64, Everything, Nothing}, - weights::constants::WEIGHT_PER_SECOND, + weights::constants::WEIGHT_REF_TIME_PER_SECOND, PalletId, }; use frame_system::{EnsureRoot, EnsureSignedBy}; @@ -143,8 +143,8 @@ impl orml_asset_registry::Config for Runtime { } parameter_types! { - pub const ReservedXcmpWeight: Weight = WEIGHT_PER_SECOND.ref_time() / 4; - pub const ReservedDmpWeight: Weight = WEIGHT_PER_SECOND.ref_time() / 4; + pub const ReservedXcmpWeight: Weight = WEIGHT_REF_TIME_PER_SECOND / 4; + pub const ReservedDmpWeight: Weight = WEIGHT_REF_TIME_PER_SECOND / 4; } impl parachain_info::Config for Runtime {} diff --git a/auction/Cargo.toml b/auction/Cargo.toml index ee6b7bf7e..034d2d97b 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -12,16 +12,16 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/auction/src/lib.rs b/auction/src/lib.rs index 7874a28e8..2c9c3ec4b 100644 --- a/auction/src/lib.rs +++ b/auction/src/lib.rs @@ -127,6 +127,7 @@ pub mod module { /// /// The dispatch origin for this call must be `Signed` by the /// transactor. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::bid_collateral_auction())] pub fn bid(origin: OriginFor, id: T::AuctionId, #[pallet::compact] value: T::Balance) -> DispatchResult { let from = ensure_signed(origin)?; diff --git a/authority/Cargo.toml b/authority/Cargo.toml index 3a9aa7906..a2e0a527b 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -12,17 +12,18 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.145", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } [dev-dependencies] -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-root-testing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/authority/src/lib.rs b/authority/src/lib.rs index c140b6f15..506f96578 100644 --- a/authority/src/lib.rs +++ b/authority/src/lib.rs @@ -307,6 +307,7 @@ pub mod module { #[pallet::call] impl Pallet { /// Dispatch a dispatchable on behalf of other origin + #[pallet::call_index(0)] #[pallet::weight({ let info = call.get_dispatch_info(); (T::WeightInfo::dispatch_as().saturating_add(info.weight), info.class) @@ -324,6 +325,7 @@ pub mod module { /// Schedule a dispatchable to be dispatched at later block. /// This is the only way to dispatch a call with `DelayedOrigin`. + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::schedule_dispatch_without_delay())] pub fn schedule_dispatch( origin: OriginFor, @@ -375,6 +377,7 @@ pub mod module { } /// Fast track a scheduled dispatchable. + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::fast_track_scheduled_dispatch())] pub fn fast_track_scheduled_dispatch( origin: OriginFor, @@ -405,6 +408,7 @@ pub mod module { } /// Delay a scheduled dispatchable. + #[pallet::call_index(3)] #[pallet::weight(T::WeightInfo::delay_scheduled_dispatch())] pub fn delay_scheduled_dispatch( origin: OriginFor, @@ -432,6 +436,7 @@ pub mod module { } /// Cancel a scheduled dispatchable. + #[pallet::call_index(4)] #[pallet::weight(T::WeightInfo::cancel_scheduled_dispatch())] pub fn cancel_scheduled_dispatch( origin: OriginFor, @@ -448,6 +453,7 @@ pub mod module { Ok(()) } + #[pallet::call_index(5)] #[pallet::weight(T::WeightInfo::authorize_call())] pub fn authorize_call( origin: OriginFor, @@ -461,6 +467,7 @@ pub mod module { Ok(()) } + #[pallet::call_index(6)] #[pallet::weight(T::WeightInfo::remove_authorized_call())] pub fn remove_authorized_call(origin: OriginFor, hash: T::Hash) -> DispatchResult { let root_or_signed = @@ -481,6 +488,7 @@ pub mod module { }) } + #[pallet::call_index(7)] #[pallet::weight(( T::WeightInfo::trigger_call().saturating_add((*call_weight_bound).into()), DispatchClass::Operational, @@ -512,6 +520,7 @@ pub mod module { }) } + #[pallet::call_index(8)] #[pallet::weight(( T::WeightInfo::trigger_call().saturating_add(*call_weight_bound), DispatchClass::Operational, diff --git a/authority/src/mock.rs b/authority/src/mock.rs index 1301ba0cc..5709698ff 100644 --- a/authority/src/mock.rs +++ b/authority/src/mock.rs @@ -79,6 +79,8 @@ impl pallet_scheduler::Config for Runtime { type Preimages = Preimage; } +impl pallet_root_testing::Config for Runtime {} + #[derive(Clone, Encode, Decode, Eq, PartialEq, Ord, PartialOrd, Debug, TypeInfo)] pub enum MockAsOriginId { Root, @@ -182,6 +184,7 @@ frame_support::construct_runtime!( Authority: authority::{Pallet, Call, Origin, Event}, Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event}, Preimage: pallet_preimage::{Pallet, Call, Storage, Event}, + RootTesting: pallet_root_testing::{Pallet, Call}, } ); diff --git a/authority/src/tests.rs b/authority/src/tests.rs index c4bd784d6..148bfdf97 100644 --- a/authority/src/tests.rs +++ b/authority/src/tests.rs @@ -20,7 +20,7 @@ use sp_runtime::{traits::BadOrigin, Perbill}; #[test] fn dispatch_as_work() { ExtBuilder::default().build().execute_with(|| { - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::one() }); + let ensure_root_call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::one() }); let ensure_signed_call = RuntimeCall::System(frame_system::Call::remark { remark: vec![] }); assert_ok!(Authority::dispatch_as( RuntimeOrigin::root(), @@ -59,7 +59,7 @@ fn dispatch_as_work() { #[test] fn schedule_dispatch_at_work() { ExtBuilder::default().build().execute_with(|| { - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { + let ensure_root_call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::from_percent(50), }); let call = RuntimeCall::Authority(authority::Call::dispatch_as { @@ -129,7 +129,7 @@ fn schedule_dispatch_at_work() { #[test] fn schedule_dispatch_after_work() { ExtBuilder::default().build().execute_with(|| { - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { + let ensure_root_call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::from_percent(50), }); let call = RuntimeCall::Authority(authority::Call::dispatch_as { @@ -200,7 +200,7 @@ fn schedule_dispatch_after_work() { fn fast_track_scheduled_dispatch_work() { ExtBuilder::default().build().execute_with(|| { System::set_block_number(1); - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { + let ensure_root_call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::from_percent(50), }); let call = RuntimeCall::Authority(authority::Call::dispatch_as { @@ -279,7 +279,7 @@ fn fast_track_scheduled_dispatch_work() { fn delay_scheduled_dispatch_work() { ExtBuilder::default().build().execute_with(|| { System::set_block_number(1); - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { + let ensure_root_call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::from_percent(50), }); let call = RuntimeCall::Authority(authority::Call::dispatch_as { @@ -357,7 +357,7 @@ fn delay_scheduled_dispatch_work() { #[test] fn cancel_scheduled_dispatch_work() { ExtBuilder::default().build().execute_with(|| { - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { + let ensure_root_call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::from_percent(50), }); let call = RuntimeCall::Authority(authority::Call::dispatch_as { @@ -442,7 +442,7 @@ fn call_size_limit() { fn authorize_call_works() { ExtBuilder::default().build().execute_with(|| { run_to_block(1); - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { + let ensure_root_call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::from_percent(50), }); let call = RuntimeCall::Authority(authority::Call::dispatch_as { @@ -481,7 +481,7 @@ fn authorize_call_works() { fn trigger_call_works() { ExtBuilder::default().build().execute_with(|| { run_to_block(1); - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { + let ensure_root_call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::from_percent(50), }); let call = RuntimeCall::Authority(authority::Call::dispatch_as { @@ -559,7 +559,7 @@ fn trigger_call_works() { fn remove_authorized_call_works() { ExtBuilder::default().build().execute_with(|| { run_to_block(1); - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { + let ensure_root_call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::from_percent(50), }); let call = RuntimeCall::Authority(authority::Call::dispatch_as { @@ -612,7 +612,7 @@ fn remove_authorized_call_works() { #[test] fn trigger_call_should_be_free_and_operational() { ExtBuilder::default().build().execute_with(|| { - let call = RuntimeCall::System(frame_system::Call::fill_block { + let call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::from_percent(50), }); let hash = ::Hashing::hash_of(&call); @@ -654,7 +654,7 @@ fn trigger_call_should_be_free_and_operational() { #[test] fn trigger_old_call_should_be_free_and_operational() { ExtBuilder::default().build().execute_with(|| { - let call = RuntimeCall::System(frame_system::Call::fill_block { + let call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::from_percent(50), }); let hash = ::Hashing::hash_of(&call); diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index bb4b16b1f..c18a02313 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -26,18 +26,18 @@ hash-db = { version = "0.15.2", default-features = false, optional = true } bencher-procedural = { path = "bencher-procedural", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.33" } -sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["wasmtime"], optional = true , branch = "polkadot-v0.9.33" } -sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.33" } -sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["rocksdb"], optional = true , branch = "polkadot-v0.9.33" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.33" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.36" } +sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.36" } +sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.36" } +sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["rocksdb"], optional = true , branch = "polkadot-v0.9.36" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.36" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/bencher/test/Cargo.toml b/bencher/test/Cargo.toml index 2ab6fb22b..af39d8675 100644 --- a/bencher/test/Cargo.toml +++ b/bencher/test/Cargo.toml @@ -15,16 +15,16 @@ required-features = ["bench"] serde = { version = "1.0.136", optional = true } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } orml-bencher = { path = "..", default-features = false } orml-weight-meter = { path = "../../weight-meter", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/bencher/test/src/lib.rs b/bencher/test/src/lib.rs index ed81c5f44..7881e2ea7 100644 --- a/bencher/test/src/lib.rs +++ b/bencher/test/src/lib.rs @@ -38,6 +38,7 @@ pub mod pallet { #[pallet::call] impl Pallet { + #[pallet::call_index(0)] #[pallet::weight(0)] #[orml_weight_meter::start(ModuleWeights::::set_value())] pub fn set_value(origin: OriginFor, n: u32) -> DispatchResultWithPostInfo { @@ -49,6 +50,7 @@ pub mod pallet { Ok(Some(orml_weight_meter::used_weight()).into()) } + #[pallet::call_index(1)] #[pallet::weight(0)] pub fn dummy(origin: OriginFor, _n: u32) -> DispatchResult { let _sender = frame_system::ensure_none(origin)?; @@ -85,4 +87,4 @@ pub mod pallet { _ = Bar::::clear(10, None); } } -} +} \ No newline at end of file diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index db092525e..2aa6d5be4 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -14,19 +14,19 @@ paste = "1.0.7" scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } [dev-dependencies] hex-literal = "0.3.4" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = [ "std" ] diff --git a/benchmarking/src/tests.rs b/benchmarking/src/tests.rs index 15c827918..89ee0e7ff 100644 --- a/benchmarking/src/tests.rs +++ b/benchmarking/src/tests.rs @@ -34,6 +34,7 @@ pub mod test { #[pallet::call] impl Pallet { + #[pallet::call_index(0)] #[pallet::weight(0)] pub fn set_value(origin: OriginFor, n: u32) -> DispatchResult { let _sender = frame_system::ensure_signed(origin)?; @@ -41,6 +42,7 @@ pub mod test { Ok(()) } + #[pallet::call_index(1)] #[pallet::weight(0)] pub fn dummy(origin: OriginFor, _n: u32) -> DispatchResult { let _sender = frame_system::ensure_none(origin)?; diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index fe977c8c7..b5263b85c 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -12,18 +12,18 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" } diff --git a/currencies/src/lib.rs b/currencies/src/lib.rs index b60c2573f..a7594f9c4 100644 --- a/currencies/src/lib.rs +++ b/currencies/src/lib.rs @@ -126,6 +126,7 @@ pub mod module { /// /// The dispatch origin for this call must be `Signed` by the /// transactor. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::transfer_non_native_currency())] pub fn transfer( origin: OriginFor, @@ -142,6 +143,7 @@ pub mod module { /// /// The dispatch origin for this call must be `Signed` by the /// transactor. + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::transfer_native_currency())] pub fn transfer_native_currency( origin: OriginFor, @@ -156,6 +158,7 @@ pub mod module { /// update amount of account `who` under `currency_id`. /// /// The dispatch origin of this call must be _Root_. + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::update_balance_non_native_currency())] pub fn update_balance( origin: OriginFor, diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index 54a8c8919..5a91690bd 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -12,12 +12,12 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/gradually-update/src/lib.rs b/gradually-update/src/lib.rs index ff34cea19..0371b0fa2 100644 --- a/gradually-update/src/lib.rs +++ b/gradually-update/src/lib.rs @@ -162,6 +162,7 @@ pub mod module { #[pallet::call] impl Pallet { /// Add gradually_update to adjust numeric parameter. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::gradually_update())] pub fn gradually_update(origin: OriginFor, update: GraduallyUpdateOf) -> DispatchResult { T::DispatchOrigin::try_origin(origin).map(|_| ()).or_else(ensure_root)?; @@ -202,6 +203,7 @@ pub mod module { } /// Cancel gradually_update to adjust numeric parameter. + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::cancel_gradually_update())] pub fn cancel_gradually_update(origin: OriginFor, key: StorageKeyBytes) -> DispatchResult { T::DispatchOrigin::try_origin(origin).map(|_| ()).or_else(ensure_root)?; diff --git a/nft/Cargo.toml b/nft/Cargo.toml index 804ab5127..5c24f821d 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -12,14 +12,14 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index b68e4dd18..9edb37cec 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -12,18 +12,18 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml index 98f5a0df7..09100a4d8 100644 --- a/oracle/rpc/Cargo.toml +++ b/oracle/rpc/Cargo.toml @@ -12,8 +12,8 @@ jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } tracing = { version = "0.1.29" } tracing-core = { version = "0.1.28" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } orml-oracle-rpc-runtime-api = { path = "runtime-api", version = "0.4.1-dev" } diff --git a/oracle/rpc/runtime-api/Cargo.toml b/oracle/rpc/runtime-api/Cargo.toml index 406c03a3f..183a8a10c 100644 --- a/oracle/rpc/runtime-api/Cargo.toml +++ b/oracle/rpc/runtime-api/Cargo.toml @@ -8,8 +8,8 @@ description = "Runtime API module for orml-oracle-rpc." [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs index a44ba200d..1d2513197 100644 --- a/oracle/src/lib.rs +++ b/oracle/src/lib.rs @@ -155,6 +155,7 @@ pub mod module { /// Feed the external value. /// /// Require authorized operator. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::feed_values(values.len() as u32))] pub fn feed_values( origin: OriginFor, diff --git a/payments/Cargo.toml b/payments/Cargo.toml index 033a2de92..ecc2ab0d7 100644 --- a/payments/Cargo.toml +++ b/payments/Cargo.toml @@ -14,18 +14,18 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = log = { version = "0.4.17", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } orml-traits = {path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] serde = { version = "1.0.136" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } orml-tokens = { path = "../tokens", version = "0.4.1-dev", default-features = false } diff --git a/payments/src/lib.rs b/payments/src/lib.rs index 810839d30..8a66cbee6 100644 --- a/payments/src/lib.rs +++ b/payments/src/lib.rs @@ -280,6 +280,7 @@ pub mod pallet { /// the option to add a remark, this remark can then be used to run /// custom logic and trigger alternate payment flows. the specified /// amount. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::pay(T::MaxRemarkLength::get()))] pub fn pay( origin: OriginFor, @@ -314,6 +315,7 @@ pub mod pallet { /// Release any created payment, this will transfer the reserved amount /// from the creator of the payment to the assigned recipient + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::release())] pub fn release(origin: OriginFor, to: T::AccountId) -> DispatchResultWithPostInfo { let from = ensure_signed(origin)?; @@ -332,6 +334,7 @@ pub mod pallet { /// Cancel a payment in created state, this will release the reserved /// back to creator of the payment. This extrinsic can only be called by /// the recipient of the payment + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::cancel())] pub fn cancel(origin: OriginFor, creator: T::AccountId) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; @@ -354,6 +357,7 @@ pub mod pallet { /// recipient of the payment. /// This extrinsic allows the assigned judge to /// cancel/release/partial_release the payment. + #[pallet::call_index(3)] #[pallet::weight(T::WeightInfo::resolve_payment())] pub fn resolve_payment( origin: OriginFor, @@ -389,6 +393,7 @@ pub mod pallet { /// Allow the creator of a payment to initiate a refund that will return /// the funds after a configured amount of time that the reveiver has to /// react and opose the request + #[pallet::call_index(4)] #[pallet::weight(T::WeightInfo::request_refund())] pub fn request_refund(origin: OriginFor, recipient: T::AccountId) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; @@ -436,6 +441,7 @@ pub mod pallet { /// payment creator This does not cancel the request, instead sends the /// payment to a NeedsReview state The assigned resolver account can /// then change the state of the payment after review. + #[pallet::call_index(5)] #[pallet::weight(T::WeightInfo::dispute_refund())] pub fn dispute_refund(origin: OriginFor, creator: T::AccountId) -> DispatchResultWithPostInfo { use PaymentState::*; @@ -482,6 +488,7 @@ pub mod pallet { // using the `accept_and_pay` extrinsic. The payment will be in // PaymentRequested State and can only be modified by the `accept_and_pay` // extrinsic. + #[pallet::call_index(6)] #[pallet::weight(T::WeightInfo::request_payment())] pub fn request_payment( origin: OriginFor, @@ -510,6 +517,7 @@ pub mod pallet { // This extrinsic allows the sender to fulfill a payment request created by a // recipient. The amount will be transferred to the recipient and payment // removed from storage + #[pallet::call_index(7)] #[pallet::weight(T::WeightInfo::accept_and_pay())] pub fn accept_and_pay(origin: OriginFor, to: T::AccountId) -> DispatchResultWithPostInfo { let from = ensure_signed(origin)?; diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index ed456b3e8..dad1b52c5 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -12,17 +12,17 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index 643895693..2c2bd59d6 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -12,18 +12,18 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/tokens/rpc/Cargo.toml b/tokens/rpc/Cargo.toml index ca361beb2..b396f57bd 100644 --- a/tokens/rpc/Cargo.toml +++ b/tokens/rpc/Cargo.toml @@ -12,11 +12,11 @@ jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } tracing = { version = "0.1.29" } tracing-core = { version = "0.1.28" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } orml-tokens-rpc-runtime-api = { version = "0.4.1-dev", path = "./runtime-api" } diff --git a/tokens/rpc/runtime-api/Cargo.toml b/tokens/rpc/runtime-api/Cargo.toml index 2fd46ef79..3d8491ce8 100644 --- a/tokens/rpc/runtime-api/Cargo.toml +++ b/tokens/rpc/runtime-api/Cargo.toml @@ -8,9 +8,9 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } orml-tokens = { default-features = false, path = "../../../tokens" } [features] diff --git a/tokens/src/impls.rs b/tokens/src/impls.rs index f5a53d52e..1de2a979f 100644 --- a/tokens/src/impls.rs +++ b/tokens/src/impls.rs @@ -67,6 +67,10 @@ where B::can_withdraw(asset, who, amount) } } + + fn asset_exists(_asset: Self::AssetId) -> bool { + true + } } impl fungibles::Transfer for Combiner diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs index b1d30c822..7570fc7ad 100644 --- a/tokens/src/lib.rs +++ b/tokens/src/lib.rs @@ -462,6 +462,7 @@ pub mod module { /// - `dest`: The recipient of the transfer. /// - `currency_id`: currency type. /// - `amount`: free balance amount to tranfer. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::transfer())] pub fn transfer( origin: OriginFor, @@ -493,6 +494,7 @@ pub mod module { /// the sender account to be killed (false), or transfer everything /// except at least the existential deposit, which will guarantee to /// keep the sender account alive (true). + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::transfer_all())] pub fn transfer_all( origin: OriginFor, @@ -519,6 +521,7 @@ pub mod module { /// - `dest`: The recipient of the transfer. /// - `currency_id`: currency type. /// - `amount`: free balance amount to tranfer. + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::transfer_keep_alive())] pub fn transfer_keep_alive( origin: OriginFor, @@ -541,6 +544,7 @@ pub mod module { /// - `dest`: The recipient of the transfer. /// - `currency_id`: currency type. /// - `amount`: free balance amount to tranfer. + #[pallet::call_index(3)] #[pallet::weight(T::WeightInfo::force_transfer())] pub fn force_transfer( origin: OriginFor, @@ -563,6 +567,7 @@ pub mod module { /// existential deposit, it will reap the `AccountInfo`. /// /// The dispatch origin for this call is `root`. + #[pallet::call_index(4)] #[pallet::weight(T::WeightInfo::set_balance())] pub fn set_balance( origin: OriginFor, @@ -1744,6 +1749,10 @@ impl fungibles::Inspect for Pallet { ) -> WithdrawConsequence { Self::withdraw_consequence(who, asset_id, amount, &Self::accounts(who, asset_id)) } + + fn asset_exists(_asset: Self::AssetId) -> bool { + true + } } impl fungibles::Mutate for Pallet { diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 96f7592ca..9ebb88a84 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -14,10 +14,10 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = num-traits = { version = "0.2.14", default-features = false } impl-trait-for-tuples = "0.2.2" -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index 9897291f5..c33a6cca7 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -12,18 +12,18 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index cc889d2c8..be4e2dae5 100644 --- a/utilities/Cargo.toml +++ b/utilities/Cargo.toml @@ -12,15 +12,15 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive" serde = { version = "1.0.136", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } [dev-dependencies] serde_json = "1.0.64" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index 0ae17860d..6c8ac5109 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -12,15 +12,15 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/vesting/src/lib.rs b/vesting/src/lib.rs index 96dab8fb6..8ca778c34 100644 --- a/vesting/src/lib.rs +++ b/vesting/src/lib.rs @@ -244,6 +244,7 @@ pub mod module { #[pallet::call] impl Pallet { + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::claim((::MaxVestingSchedules::get() / 2) as u32))] pub fn claim(origin: OriginFor) -> DispatchResult { let who = ensure_signed(origin)?; @@ -256,6 +257,7 @@ pub mod module { Ok(()) } + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::vested_transfer())] pub fn vested_transfer( origin: OriginFor, @@ -282,6 +284,7 @@ pub mod module { Ok(()) } + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::update_vesting_schedules(vesting_schedules.len() as u32))] pub fn update_vesting_schedules( origin: OriginFor, @@ -297,6 +300,7 @@ pub mod module { Ok(()) } + #[pallet::call_index(3)] #[pallet::weight(T::WeightInfo::claim((::MaxVestingSchedules::get() / 2) as u32))] pub fn claim_for(origin: OriginFor, dest: ::Source) -> DispatchResult { let _ = ensure_signed(origin)?; diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml index 901d98945..a6b76278c 100644 --- a/weight-meter/Cargo.toml +++ b/weight-meter/Cargo.toml @@ -10,19 +10,19 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } weight-meter-procedural = { path = "weight-meter-procedural", default-features = false } [dev-dependencies] serde = { version = "1.0.136" } codec = { package = "parity-scale-codec", version = "3.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/weight-meter/src/mock.rs b/weight-meter/src/mock.rs index dee781d26..8126a377f 100644 --- a/weight-meter/src/mock.rs +++ b/weight-meter/src/mock.rs @@ -19,6 +19,7 @@ pub mod test_module { #[pallet::call] impl Pallet { + #[pallet::call_index(0)] #[pallet::weight(50_000)] #[orml_weight_meter::start] pub fn expect_100(origin: OriginFor) -> DispatchResultWithPostInfo { @@ -29,6 +30,7 @@ pub mod test_module { Ok(Some(orml_weight_meter::used_weight()).into()) } + #[pallet::call_index(1)] #[pallet::weight(50_000)] #[orml_weight_meter::start] pub fn expect_500(origin: OriginFor) -> DispatchResultWithPostInfo { @@ -43,6 +45,7 @@ pub mod test_module { Ok(Some(orml_weight_meter::used_weight()).into()) } + #[pallet::call_index(2)] #[pallet::weight(50_000)] #[orml_weight_meter::start] pub fn expect_max_weight(origin: OriginFor) -> DispatchResultWithPostInfo { @@ -54,6 +57,7 @@ pub mod test_module { Ok(Some(orml_weight_meter::used_weight()).into()) } + #[pallet::call_index(3)] #[pallet::weight(50_000)] #[orml_weight_meter::start] pub fn expect_100_or_200(origin: OriginFor, branch: bool) -> DispatchResultWithPostInfo { @@ -68,6 +72,7 @@ pub mod test_module { Ok(Some(orml_weight_meter::used_weight()).into()) } + #[pallet::call_index(4)] #[pallet::weight(50_000)] #[orml_weight_meter::start] pub fn nested_inner_methods(origin: OriginFor) -> DispatchResultWithPostInfo { @@ -78,6 +83,7 @@ pub mod test_module { Ok(Some(orml_weight_meter::used_weight()).into()) } + #[pallet::call_index(5)] #[pallet::weight(50_000)] #[orml_weight_meter::start] pub fn nested_extrinsic(origin: OriginFor) -> DispatchResultWithPostInfo { diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index d00c46562..e87c0c4b4 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -10,9 +10,9 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index 1c5b6ab21..ffbaf2255 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -11,9 +11,9 @@ edition = "2021" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } diff --git a/xcm/src/lib.rs b/xcm/src/lib.rs index 61607a5b4..40057f889 100644 --- a/xcm/src/lib.rs +++ b/xcm/src/lib.rs @@ -50,6 +50,7 @@ pub mod module { #[pallet::call] impl Pallet { /// Send an XCM message as parachain sovereign. + #[pallet::call_index(0)] #[pallet::weight(100_000_000)] pub fn send_as_sovereign( origin: OriginFor, diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index 8fc7881cb..2306556c6 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -7,20 +7,30 @@ version = "0.4.1-dev" authors = ["Acala Developers"] edition = "2021" +[package.metadata.deppatcher.originals.dependencies] +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } + +[package.metadata.deppatcher.originals.dev-dependencies] +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } + [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false , branch = "polkadot-v0.9.33" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false , branch = "draft-polkadot-v0.9.36" } # polkadot pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } @@ -33,15 +43,15 @@ orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] # substrate -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } # cumulus -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } # polkadot polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } diff --git a/xtokens/src/lib.rs b/xtokens/src/lib.rs index 89ad16bff..e75585d31 100644 --- a/xtokens/src/lib.rs +++ b/xtokens/src/lib.rs @@ -199,6 +199,7 @@ pub mod module { /// received. Receiving depends on if the XCM message could be delivered /// by the network, and if the receiving chain would handle /// messages correctly. + #[pallet::call_index(0)] #[pallet::weight(Pallet::::weight_of_transfer(currency_id.clone(), *amount, dest))] pub fn transfer( origin: OriginFor, @@ -224,6 +225,7 @@ pub mod module { /// received. Receiving depends on if the XCM message could be delivered /// by the network, and if the receiving chain would handle /// messages correctly. + #[pallet::call_index(1)] #[pallet::weight(Pallet::::weight_of_transfer_multiasset(asset, dest))] pub fn transfer_multiasset( origin: OriginFor, @@ -258,6 +260,7 @@ pub mod module { /// received. Receiving depends on if the XCM message could be delivered /// by the network, and if the receiving chain would handle /// messages correctly. + #[pallet::call_index(2)] #[pallet::weight(Pallet::::weight_of_transfer(currency_id.clone(), *amount, dest))] pub fn transfer_with_fee( origin: OriginFor, @@ -294,6 +297,7 @@ pub mod module { /// received. Receiving depends on if the XCM message could be delivered /// by the network, and if the receiving chain would handle /// messages correctly. + #[pallet::call_index(3)] #[pallet::weight(Pallet::::weight_of_transfer_multiasset(asset, dest))] pub fn transfer_multiasset_with_fee( origin: OriginFor, @@ -325,6 +329,7 @@ pub mod module { /// received. Receiving depends on if the XCM message could be delivered /// by the network, and if the receiving chain would handle /// messages correctly. + #[pallet::call_index(4)] #[pallet::weight(Pallet::::weight_of_transfer_multicurrencies(currencies, fee_item, dest))] pub fn transfer_multicurrencies( origin: OriginFor, @@ -354,6 +359,7 @@ pub mod module { /// received. Receiving depends on if the XCM message could be delivered /// by the network, and if the receiving chain would handle /// messages correctly. + #[pallet::call_index(5)] #[pallet::weight(Pallet::::weight_of_transfer_multiassets(assets, fee_item, dest))] pub fn transfer_multiassets( origin: OriginFor, diff --git a/xtokens/src/mock/para.rs b/xtokens/src/mock/para.rs index 6a91b6185..19f38d690 100644 --- a/xtokens/src/mock/para.rs +++ b/xtokens/src/mock/para.rs @@ -4,7 +4,7 @@ use crate as orml_xtokens; use frame_support::{ construct_runtime, match_types, parameter_types, traits::{ConstU128, ConstU32, ConstU64, Everything, Get, Nothing}, - weights::constants::WEIGHT_PER_SECOND, + weights::constants::WEIGHT_REF_TIME_PER_SECOND, }; use frame_system::EnsureRoot; use sp_core::H256; @@ -91,8 +91,8 @@ impl orml_tokens::Config for Runtime { } parameter_types! { - pub const ReservedXcmpWeight: Weight = WEIGHT_PER_SECOND.ref_time() / 4; - pub const ReservedDmpWeight: Weight = WEIGHT_PER_SECOND.ref_time() / 4; + pub const ReservedXcmpWeight: Weight = WEIGHT_REF_TIME_PER_SECOND / 4; + pub const ReservedDmpWeight: Weight = WEIGHT_REF_TIME_PER_SECOND / 4; } impl parachain_info::Config for Runtime {} diff --git a/xtokens/src/mock/para_relative_view.rs b/xtokens/src/mock/para_relative_view.rs index 357e5cd07..a44283438 100644 --- a/xtokens/src/mock/para_relative_view.rs +++ b/xtokens/src/mock/para_relative_view.rs @@ -4,7 +4,7 @@ use crate as orml_xtokens; use frame_support::{ construct_runtime, match_types, parameter_types, traits::{ConstU128, ConstU32, ConstU64, Everything, Nothing}, - weights::constants::WEIGHT_PER_SECOND, + weights::constants::WEIGHT_REF_TIME_PER_SECOND, }; use frame_system::EnsureRoot; use sp_core::H256; @@ -94,8 +94,8 @@ impl orml_tokens::Config for Runtime { } parameter_types! { - pub const ReservedXcmpWeight: Weight = WEIGHT_PER_SECOND.ref_time() / 4; - pub const ReservedDmpWeight: Weight = WEIGHT_PER_SECOND.ref_time() / 4; + pub const ReservedXcmpWeight: Weight = WEIGHT_REF_TIME_PER_SECOND / 4; + pub const ReservedDmpWeight: Weight = WEIGHT_REF_TIME_PER_SECOND / 4; } impl parachain_info::Config for Runtime {} diff --git a/xtokens/src/mock/para_teleport.rs b/xtokens/src/mock/para_teleport.rs index 01bc013e5..75fbd509c 100644 --- a/xtokens/src/mock/para_teleport.rs +++ b/xtokens/src/mock/para_teleport.rs @@ -4,7 +4,7 @@ use crate as orml_xtokens; use frame_support::{ construct_runtime, match_types, parameter_types, traits::{ConstU128, ConstU32, ConstU64, Everything, Get, Nothing}, - weights::constants::WEIGHT_PER_SECOND, + weights::constants::WEIGHT_REF_TIME_PER_SECOND, }; use frame_system::EnsureRoot; use sp_core::H256; @@ -92,8 +92,8 @@ impl orml_tokens::Config for Runtime { } parameter_types! { - pub const ReservedXcmpWeight: Weight = WEIGHT_PER_SECOND.ref_time() / 4; - pub const ReservedDmpWeight: Weight = WEIGHT_PER_SECOND.ref_time() / 4; + pub const ReservedXcmpWeight: Weight = WEIGHT_REF_TIME_PER_SECOND / 4; + pub const ReservedDmpWeight: Weight = WEIGHT_REF_TIME_PER_SECOND / 4; } impl parachain_info::Config for Runtime {} From 983e2759cf65f7a6e096ab859cddfa0543036532 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Tue, 20 Dec 2022 17:39:44 +0100 Subject: [PATCH 2/5] style: fix formatting Signed-off-by: Yaroslav Bolyukin --- authority/src/tests.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/authority/src/tests.rs b/authority/src/tests.rs index 148bfdf97..9aa301588 100644 --- a/authority/src/tests.rs +++ b/authority/src/tests.rs @@ -20,7 +20,8 @@ use sp_runtime::{traits::BadOrigin, Perbill}; #[test] fn dispatch_as_work() { ExtBuilder::default().build().execute_with(|| { - let ensure_root_call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::one() }); + let ensure_root_call = + RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { ratio: Perbill::one() }); let ensure_signed_call = RuntimeCall::System(frame_system::Call::remark { remark: vec![] }); assert_ok!(Authority::dispatch_as( RuntimeOrigin::root(), From a0e5ed97ddafed2f4fe40dd4286a2c58edcbbac6 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Tue, 20 Dec 2022 17:42:13 +0100 Subject: [PATCH 3/5] fix: polkadot dependency references Signed-off-by: Yaroslav Bolyukin --- asset-registry/Cargo.toml | 14 +++++++------- traits/Cargo.toml | 2 +- unknown-tokens/Cargo.toml | 2 +- xcm-support/Cargo.toml | 4 ++-- xcm/Cargo.toml | 6 +++--- xtokens/Cargo.toml | 14 +++++++------- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml index e61d6df31..38cb210af 100644 --- a/asset-registry/Cargo.toml +++ b/asset-registry/Cargo.toml @@ -26,10 +26,10 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } # orml orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } @@ -48,9 +48,9 @@ cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = " parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } # orml orml-tokens = { path = "../tokens" } diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 9ebb88a84..7a7fa01d0 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -19,7 +19,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", default-features = fa sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index c33a6cca7..e8a10eaaa 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -16,7 +16,7 @@ frame-support = { git = "https://github.com/paritytech/substrate", default-featu frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } orml-xcm-support = { path = "../xcm-support", default-features = false } diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index e87c0c4b4..c2ef881a0 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -14,8 +14,8 @@ frame-support = { git = "https://github.com/paritytech/substrate", default-featu sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index ffbaf2255..b96aef948 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -15,11 +15,11 @@ frame-support = { git = "https://github.com/paritytech/substrate", default-featu frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } [dev-dependencies] -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } [features] default = ["std"] diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index 2306556c6..070973fed 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -33,9 +33,9 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false , branch = "draft-polkadot-v0.9.36" } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.33" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } # orml orml-traits = { path = "../traits", default-features = false} @@ -54,10 +54,10 @@ cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branc parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } # orml orml-tokens = { path = "../tokens" } From 4edb69ff129d0b35a1fa3632866cfb9b44ff64b9 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Wed, 21 Dec 2022 19:02:50 +0100 Subject: [PATCH 4/5] build: use released cumulus Signed-off-by: Yaroslav Bolyukin --- Cargo.dev.toml | 10 +++++----- asset-registry/Cargo.toml | 17 +++++------------ xtokens/Cargo.toml | 22 ++++++---------------- 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/Cargo.dev.toml b/Cargo.dev.toml index a5d4bf947..e8d806294 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -84,11 +84,11 @@ sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491 sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "cb4f2491b00af7d7817f3a54209c26b20faa1f51" } [patch.'https://github.com/paritytech/cumulus'] -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "391a5d89880283dfd49b0be95dd214274d28de4d" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "391a5d89880283dfd49b0be95dd214274d28de4d" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "391a5d89880283dfd49b0be95dd214274d28de4d" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "391a5d89880283dfd49b0be95dd214274d28de4d" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "391a5d89880283dfd49b0be95dd214274d28de4d" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "d936c9f47fdb2aba41afb9e98a911ae311109ff0" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "d936c9f47fdb2aba41afb9e98a911ae311109ff0" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "d936c9f47fdb2aba41afb9e98a911ae311109ff0" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "d936c9f47fdb2aba41afb9e98a911ae311109ff0" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "d936c9f47fdb2aba41afb9e98a911ae311109ff0" } [patch.'https://github.com/paritytech/polkadot'] pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "dc25abc712e42b9b51d87ad1168e453a42b5f0bc" } diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml index 38cb210af..081d32885 100644 --- a/asset-registry/Cargo.toml +++ b/asset-registry/Cargo.toml @@ -7,13 +7,6 @@ version = "0.4.1-dev" authors = ["Interlay Ltd, etc"] edition = "2021" -[package.metadata.deppatcher.originals.dev-dependencies] -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } - [dependencies] scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } @@ -41,11 +34,11 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot- sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } # polkadot polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index 070973fed..e52bc661e 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -7,16 +7,6 @@ version = "0.4.1-dev" authors = ["Acala Developers"] edition = "2021" -[package.metadata.deppatcher.originals.dependencies] -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } - -[package.metadata.deppatcher.originals.dev-dependencies] -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } - [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } @@ -30,7 +20,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", default-features sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.36" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false , branch = "draft-polkadot-v0.9.36" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false , branch = "polkadot-v0.9.36" } # polkadot pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.36" } @@ -47,11 +37,11 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "p sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } # cumulus -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "draft-polkadot-v0.9.36" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36" } # polkadot polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" } From 3f70b9adb6c0599db7b8688abb49d0d459634b68 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Thu, 22 Dec 2022 14:44:32 +0100 Subject: [PATCH 5/5] fix: make asset_exists return false Signed-off-by: Yaroslav Bolyukin --- tokens/src/impls.rs | 2 +- tokens/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tokens/src/impls.rs b/tokens/src/impls.rs index 1de2a979f..dca977509 100644 --- a/tokens/src/impls.rs +++ b/tokens/src/impls.rs @@ -69,7 +69,7 @@ where } fn asset_exists(_asset: Self::AssetId) -> bool { - true + false } } diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs index 7570fc7ad..ffea8a501 100644 --- a/tokens/src/lib.rs +++ b/tokens/src/lib.rs @@ -1751,7 +1751,7 @@ impl fungibles::Inspect for Pallet { } fn asset_exists(_asset: Self::AssetId) -> bool { - true + false } }