From 7b313006a05cc5d384cbbf96afed3fd6e5b18121 Mon Sep 17 00:00:00 2001 From: devdanco Date: Tue, 11 Apr 2023 11:55:46 +0200 Subject: [PATCH 1/3] Upgrade polkadot to v0.9.40 --- Cargo.dev.toml | 128 +++++++++--------- asset-registry/Cargo.toml | 38 +++--- asset-registry/src/lib.rs | 1 - asset-registry/src/mock/para.rs | 4 +- auction/Cargo.toml | 12 +- auction/src/lib.rs | 1 - authority/Cargo.toml | 20 +-- authority/src/lib.rs | 1 - authority/src/mock.rs | 2 +- authority/src/tests.rs | 2 +- bencher/Cargo.toml | 24 ++-- bencher/src/bench_ext.rs | 9 +- bencher/test/Cargo.toml | 12 +- bencher/test/src/lib.rs | 1 - benchmarking/Cargo.toml | 18 +-- benchmarking/src/tests.rs | 1 - currencies/Cargo.toml | 14 +- gradually-update/Cargo.toml | 12 +- nft/Cargo.toml | 12 +- nft/src/lib.rs | 1 - oracle/Cargo.toml | 14 +- oracle/rpc/Cargo.toml | 10 +- oracle/rpc/runtime-api/Cargo.toml | 4 +- oracle/src/lib.rs | 1 - payments/Cargo.toml | 14 +- payments/src/lib.rs | 1 - payments/src/mock.rs | 2 +- rewards/Cargo.toml | 14 +- rewards/src/lib.rs | 1 - tokens/Cargo.toml | 16 +-- tokens/rpc/Cargo.toml | 16 +-- tokens/rpc/runtime-api/Cargo.toml | 6 +- tokens/src/lib.rs | 1 - traits/Cargo.toml | 12 +- unknown-tokens/Cargo.toml | 14 +- unknown-tokens/src/lib.rs | 1 - utilities/Cargo.toml | 10 +- vesting/Cargo.toml | 14 +- weight-gen/src/template.hbs | 2 +- weight-meter/Cargo.toml | 16 +-- weight-meter/src/mock.rs | 1 - weight-meter/src/tests.rs | 14 +- .../weight-meter-procedural/src/lib.rs | 4 +- xcm-support/Cargo.toml | 10 +- xcm/Cargo.toml | 12 +- xtokens/Cargo.toml | 40 +++--- xtokens/src/mock/para.rs | 4 +- xtokens/src/mock/para_relative_view.rs | 4 +- xtokens/src/mock/para_teleport.rs | 4 +- 49 files changed, 281 insertions(+), 294 deletions(-) diff --git a/Cargo.dev.toml b/Cargo.dev.toml index 9d2ae8a84..6f52513e2 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -37,71 +37,71 @@ resolver = "2" split-debuginfo = "unpacked" [patch.'https://github.com/paritytech/substrate'] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } -sp-weights = { git = "https://github.com/paritytech//substrate", rev = "1837f423b494254e1d27834b1c9da34b2c0c2375" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } +sp-weights = { git = "https://github.com/paritytech//substrate", rev = "76fed9b9082daade5392663f25ed8968f8e8c11c" } [patch.'https://github.com/paritytech/cumulus'] -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "00186468db997d3d632e4fb6f2a5ae4adc585e66" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "00186468db997d3d632e4fb6f2a5ae4adc585e66" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "00186468db997d3d632e4fb6f2a5ae4adc585e66" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "00186468db997d3d632e4fb6f2a5ae4adc585e66" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "00186468db997d3d632e4fb6f2a5ae4adc585e66" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "e05c8d7f71734ed71188337c6cb0d30715f6320f" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "e05c8d7f71734ed71188337c6cb0d30715f6320f" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "e05c8d7f71734ed71188337c6cb0d30715f6320f" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "e05c8d7f71734ed71188337c6cb0d30715f6320f" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "e05c8d7f71734ed71188337c6cb0d30715f6320f" } [patch.'https://github.com/paritytech/polkadot'] -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "e9bf067c68e806cdb272e0ce8065faa543cc0b5a" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "e9bf067c68e806cdb272e0ce8065faa543cc0b5a" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "e9bf067c68e806cdb272e0ce8065faa543cc0b5a" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "e9bf067c68e806cdb272e0ce8065faa543cc0b5a" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "e9bf067c68e806cdb272e0ce8065faa543cc0b5a" } -xcm = { git = "https://github.com/paritytech//polkadot", rev = "e9bf067c68e806cdb272e0ce8065faa543cc0b5a" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "e9bf067c68e806cdb272e0ce8065faa543cc0b5a" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "e9bf067c68e806cdb272e0ce8065faa543cc0b5a" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "e9bf067c68e806cdb272e0ce8065faa543cc0b5a" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "a2b62fb872ba22622aaf8e13f9dcd9a4adcc454f" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a2b62fb872ba22622aaf8e13f9dcd9a4adcc454f" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "a2b62fb872ba22622aaf8e13f9dcd9a4adcc454f" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "a2b62fb872ba22622aaf8e13f9dcd9a4adcc454f" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a2b62fb872ba22622aaf8e13f9dcd9a4adcc454f" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = "a2b62fb872ba22622aaf8e13f9dcd9a4adcc454f" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "a2b62fb872ba22622aaf8e13f9dcd9a4adcc454f" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "a2b62fb872ba22622aaf8e13f9dcd9a4adcc454f" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "a2b62fb872ba22622aaf8e13f9dcd9a4adcc454f" } diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml index ef5dbf248..d017f4834 100644 --- a/asset-registry/Cargo.toml +++ b/asset-registry/Cargo.toml @@ -13,37 +13,37 @@ serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } # orml orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] # substrate -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.39" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.39" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.39" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" } # orml orml-tokens = { path = "../tokens" } diff --git a/asset-registry/src/lib.rs b/asset-registry/src/lib.rs index e2d5cea20..c461cb317 100644 --- a/asset-registry/src/lib.rs +++ b/asset-registry/src/lib.rs @@ -136,7 +136,6 @@ pub mod module { const STORAGE_VERSION: StorageVersion = StorageVersion::new(2); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet(_); diff --git a/asset-registry/src/mock/para.rs b/asset-registry/src/mock/para.rs index c16ebea54..8e4a67603 100644 --- a/asset-registry/src/mock/para.rs +++ b/asset-registry/src/mock/para.rs @@ -145,8 +145,8 @@ impl orml_asset_registry::Config for Runtime { } parameter_types! { - pub const ReservedXcmpWeight: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4)); - pub const ReservedDmpWeight: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4)); + pub const ReservedXcmpWeight: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4), 0); + pub const ReservedDmpWeight: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4), 0); } impl parachain_info::Config for Runtime {} diff --git a/auction/Cargo.toml b/auction/Cargo.toml index 62fbc6757..08d2b7966 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.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } 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.39" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } [features] default = ["std"] diff --git a/auction/src/lib.rs b/auction/src/lib.rs index 5c4e00010..476863853 100644 --- a/auction/src/lib.rs +++ b/auction/src/lib.rs @@ -103,7 +103,6 @@ pub mod module { StorageDoubleMap<_, Twox64Concat, T::BlockNumber, Blake2_128Concat, T::AuctionId, (), OptionQuery>; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::hooks] diff --git a/authority/Cargo.toml b/authority/Cargo.toml index 85bf7b734..b23053ba4 100644 --- a/authority/Cargo.toml +++ b/authority/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.145", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } [dev-dependencies] -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -pallet-root-testing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +pallet-root-testing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } [features] default = ["std"] diff --git a/authority/src/lib.rs b/authority/src/lib.rs index f67310947..db94411ea 100644 --- a/authority/src/lib.rs +++ b/authority/src/lib.rs @@ -296,7 +296,6 @@ pub mod module { pub type SavedCalls = StorageMap<_, Identity, T::Hash, (CallOf, Option), OptionQuery>; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::without_storage_info] pub struct Pallet(_); diff --git a/authority/src/mock.rs b/authority/src/mock.rs index 5709698ff..d42ea175f 100644 --- a/authority/src/mock.rs +++ b/authority/src/mock.rs @@ -24,7 +24,7 @@ pub type BlockNumber = u64; parameter_types! { pub BlockWeights: frame_system::limits::BlockWeights = - frame_system::limits::BlockWeights::simple_max(Weight::from_ref_time(2_000_000_000_000).set_proof_size(u64::MAX)); + frame_system::limits::BlockWeights::simple_max(Weight::from_parts(2_000_000_000_000, 0).set_proof_size(u64::MAX)); } impl frame_system::Config for Runtime { diff --git a/authority/src/tests.rs b/authority/src/tests.rs index 7d3eccb6c..685fdcddb 100644 --- a/authority/src/tests.rs +++ b/authority/src/tests.rs @@ -510,7 +510,7 @@ fn trigger_call_works() { Authority::trigger_call( RuntimeOrigin::signed(1), hash, - call_weight_bound - Weight::from_ref_time(1) + call_weight_bound - Weight::from_parts(1, 0) ), Error::::WrongCallWeightBound ); diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index b582b3827..3bdfaa355 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.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.39" } -sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.39" } -sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.39" } -sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["rocksdb"], optional = true , branch = "polkadot-v0.9.39" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.39" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.39" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.40" } +sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.40" } +sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.40" } +sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["rocksdb"], optional = true , branch = "polkadot-v0.9.40" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.40" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.40" } [features] default = ["std"] diff --git a/bencher/src/bench_ext.rs b/bencher/src/bench_ext.rs index f80222a25..2cf6538d6 100644 --- a/bencher/src/bench_ext.rs +++ b/bencher/src/bench_ext.rs @@ -1,5 +1,4 @@ use core::any::{Any, TypeId}; -use hash_db::Hasher; use sp_externalities::{Extension, ExtensionStore, Externalities, MultiRemovalResults}; use sp_state_machine::{Backend, Ext}; use sp_std::sync::Arc; @@ -9,7 +8,7 @@ use super::tracker::BenchTracker; pub struct BenchExt<'a, H, B> where - H: Hasher, + H: sp_core::Hasher, B: 'a + Backend, { ext: Ext<'a, H, B>, @@ -18,7 +17,7 @@ where impl<'a, H, B> BenchExt<'a, H, B> where - H: Hasher, + H: sp_core::Hasher, B: 'a + Backend, { pub fn new(ext: Ext<'a, H, B>, tracker: Arc) -> Self { @@ -28,7 +27,7 @@ where impl<'a, H, B> Externalities for BenchExt<'a, H, B> where - H: Hasher, + H: sp_core::Hasher, B: 'a + Backend, H::Out: Ord + 'static + codec::Codec, { @@ -171,7 +170,7 @@ where impl<'a, H, B> ExtensionStore for BenchExt<'a, H, B> where - H: Hasher, + H: sp_core::Hasher, B: 'a + Backend, { fn extension_by_type_id(&mut self, type_id: TypeId) -> Option<&mut dyn Any> { diff --git a/bencher/test/Cargo.toml b/bencher/test/Cargo.toml index 7e305b09a..95beb2bc5 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.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } 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.39" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } [features] default = ["std"] diff --git a/bencher/test/src/lib.rs b/bencher/test/src/lib.rs index 892e9231f..4e191ecc1 100644 --- a/bencher/test/src/lib.rs +++ b/bencher/test/src/lib.rs @@ -21,7 +21,6 @@ pub mod pallet { impl Hooks for Pallet {} #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData); #[pallet::storage] diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index 8ae8187ec..0c0c01638 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.39" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } [dev-dependencies] hex-literal = "0.3.4" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } [features] default = [ "std" ] diff --git a/benchmarking/src/tests.rs b/benchmarking/src/tests.rs index 89ee0e7ff..1b2c5d3ec 100644 --- a/benchmarking/src/tests.rs +++ b/benchmarking/src/tests.rs @@ -29,7 +29,6 @@ pub mod test { pub(crate) type Value = StorageValue<_, u32, OptionQuery>; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::call] diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index f79fc0f36..33f56460d 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.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } 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.39" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" } diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index d41a86f86..7d9539690 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.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } [features] default = ["std"] diff --git a/nft/Cargo.toml b/nft/Cargo.toml index 5812aaf42..1c1f1154d 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.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } [features] default = ["std"] diff --git a/nft/src/lib.rs b/nft/src/lib.rs index 06ec47375..e7398928f 100644 --- a/nft/src/lib.rs +++ b/nft/src/lib.rs @@ -188,7 +188,6 @@ pub mod module { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::without_storage_info] pub struct Pallet(_); diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index 450ccb374..0734ea76f 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.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } 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.39" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } [features] default = ["std"] diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml index 87c153457..2bbaed96c 100644 --- a/oracle/rpc/Cargo.toml +++ b/oracle/rpc/Cargo.toml @@ -9,11 +9,11 @@ description = "RPC module for orml-oracle." [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0" } jsonrpsee = { version = "0.16.2", features = ["client", "server", "macros"] } -tracing = "0.1.29" -tracing-core = "0.1.28" +tracing = "0.1.29" +tracing-core = "0.1.28" -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } 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 0b407fe76..3b1c2d3f8 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.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } [features] default = ["std"] diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs index 1ee385602..42568d868 100644 --- a/oracle/src/lib.rs +++ b/oracle/src/lib.rs @@ -134,7 +134,6 @@ pub mod module { StorageValue<_, OrderedSet, ValueQuery>; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData<(T, I)>); #[pallet::hooks] diff --git a/payments/Cargo.toml b/payments/Cargo.toml index b52603f72..a611e79e2 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.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } orml-traits = {path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -serde = "1.0.136" +serde = "1.0.136" -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } 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 9f14d1927..fc012e4d6 100644 --- a/payments/src/lib.rs +++ b/payments/src/lib.rs @@ -128,7 +128,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::storage] diff --git a/payments/src/mock.rs b/payments/src/mock.rs index 53bc87e3c..7319c20cf 100644 --- a/payments/src/mock.rs +++ b/payments/src/mock.rs @@ -183,7 +183,7 @@ pub fn run_n_blocks(n: u64) -> u64 { }; // ensure the on_idle is executed >::register_extra_weight_unchecked( - Payment::on_idle(block_number, frame_support::weights::Weight::from_ref_time(idle_weight)), + Payment::on_idle(block_number, frame_support::weights::Weight::from_parts(idle_weight, 0)), DispatchClass::Mandatory, ); diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index af03ce298..5b65a24d8 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.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } 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.39" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } [features] default = ["std"] diff --git a/rewards/src/lib.rs b/rewards/src/lib.rs index f395f9506..b24063c39 100644 --- a/rewards/src/lib.rs +++ b/rewards/src/lib.rs @@ -112,7 +112,6 @@ pub mod module { >; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::without_storage_info] pub struct Pallet(_); diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index 1182bddea..751e442b9 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.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } 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.39" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } [features] default = ["std"] diff --git a/tokens/rpc/Cargo.toml b/tokens/rpc/Cargo.toml index cf6a7175a..a488c180c 100644 --- a/tokens/rpc/Cargo.toml +++ b/tokens/rpc/Cargo.toml @@ -9,14 +9,14 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0" } jsonrpsee = { version = "0.16.2", features = ["client", "server", "macros"] } -tracing = "0.1.29" -tracing-core = "0.1.28" +tracing = "0.1.29" +tracing-core = "0.1.28" -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } 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 3ebb110c4..15eb31365 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.39" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } orml-tokens = { default-features = false, path = "../../../tokens" } [features] diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs index 319d260af..fdcc09963 100644 --- a/tokens/src/lib.rs +++ b/tokens/src/lib.rs @@ -453,7 +453,6 @@ pub mod module { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::hooks] diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 52049646e..9887c83dc 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -14,13 +14,13 @@ 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.39" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } 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 bbacff904..2a293ecbc 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.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } hex-literal = "0.3.1" [features] diff --git a/unknown-tokens/src/lib.rs b/unknown-tokens/src/lib.rs index 2ed04fa77..c0ba1da7d 100644 --- a/unknown-tokens/src/lib.rs +++ b/unknown-tokens/src/lib.rs @@ -46,7 +46,6 @@ pub mod module { const STORAGE_VERSION: StorageVersion = StorageVersion::new(2); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet(_); diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index b00c3bc40..7eaf04142 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.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } [dev-dependencies] serde_json = "1.0.64" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } [features] default = ["std"] diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index 0cbda6815..ba54bece5 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.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } [features] default = ["std"] diff --git a/weight-gen/src/template.hbs b/weight-gen/src/template.hbs index 0f4233ebc..814dd60a8 100644 --- a/weight-gen/src/template.hbs +++ b/weight-gen/src/template.hbs @@ -17,7 +17,7 @@ impl ModuleWeights { // {{comment}} {{/each}} pub fn {{benchmark.name~}} () -> Weight { - Weight::from_ref_time({{underscore benchmark.weight}}) + Weight::from_parts({{underscore benchmark.weight}}, 0) {{#if (ne benchmark.reads 0)}} .saturating_add(T::DbWeight::get().reads({{benchmark.reads}})) {{/if}} diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml index b536b914d..d526dc0de 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.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } weight-meter-procedural = { path = "weight-meter-procedural", default-features = false } [dev-dependencies] -serde = "1.0.136" +serde = "1.0.136" codec = { package = "parity-scale-codec", version = "3.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } orml-bencher = { path = "../bencher" } diff --git a/weight-meter/src/mock.rs b/weight-meter/src/mock.rs index 8126a377f..9af9d26fa 100644 --- a/weight-meter/src/mock.rs +++ b/weight-meter/src/mock.rs @@ -7,7 +7,6 @@ pub mod test_module { pub trait Config: frame_system::Config {} #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData); #[pallet::hooks] diff --git a/weight-meter/src/tests.rs b/weight-meter/src/tests.rs index 3c261ee2e..eb95ce152 100644 --- a/weight-meter/src/tests.rs +++ b/weight-meter/src/tests.rs @@ -6,12 +6,12 @@ fn used_weight_works() { new_test_ext().execute_with(|| { let result: PostDispatchInfo = TestModule::expect_100(RuntimeOrigin::signed(100)).unwrap(); // Check used weight is correct - assert_eq!(Some(Weight::from_ref_time(100)), result.actual_weight); + assert_eq!(Some(Weight::from_parts(100, 0)), result.actual_weight); // Check that the method ran correctly assert_eq!(Some(100), TestModule::something()); let result: PostDispatchInfo = TestModule::expect_500(RuntimeOrigin::signed(100)).unwrap(); - assert_eq!(Some(Weight::from_ref_time(500)), result.actual_weight); + assert_eq!(Some(Weight::from_parts(500, 0)), result.actual_weight); assert_eq!(Some(600), TestModule::something()); }); } @@ -21,13 +21,13 @@ fn used_weight_branch_works() { new_test_ext().execute_with(|| { let result: PostDispatchInfo = TestModule::expect_100_or_200(RuntimeOrigin::signed(100), false).unwrap(); // Check used weight is correct - assert_eq!(Some(Weight::from_ref_time(100)), result.actual_weight); + assert_eq!(Some(Weight::from_parts(100, 0)), result.actual_weight); // Check that the method ran correctly assert_eq!(Some(100), TestModule::something()); let result: PostDispatchInfo = TestModule::expect_100_or_200(RuntimeOrigin::signed(100), true).unwrap(); // Check used weight is correct - assert_eq!(Some(Weight::from_ref_time(200)), result.actual_weight); + assert_eq!(Some(Weight::from_parts(200, 0)), result.actual_weight); // Check that the method ran correctly assert_eq!(Some(300), TestModule::something()); }); @@ -38,7 +38,7 @@ fn used_weight_nested_calls_works() { new_test_ext().execute_with(|| { let result: PostDispatchInfo = TestModule::nested_inner_methods(RuntimeOrigin::signed(100)).unwrap(); // Check used weight is correct - assert_eq!(Some(Weight::from_ref_time(300)), result.actual_weight); + assert_eq!(Some(Weight::from_parts(300, 0)), result.actual_weight); }); } @@ -47,7 +47,7 @@ fn exceed_max_weight_works() { new_test_ext().execute_with(|| { let result: PostDispatchInfo = TestModule::expect_max_weight(RuntimeOrigin::signed(100)).unwrap(); // Check used weight is correct - assert_eq!(Some(Weight::from_ref_time(u64::MAX)), result.actual_weight); + assert_eq!(Some(Weight::from_parts(u64::MAX, 0)), result.actual_weight); }); } @@ -55,6 +55,6 @@ fn exceed_max_weight_works() { fn nested_module_calls_works() { new_test_ext().execute_with(|| { let result = TestModule::nested_extrinsic(RuntimeOrigin::signed(0)).unwrap(); - assert_eq!(result.actual_weight, Some(Weight::from_ref_time(700))); + assert_eq!(result.actual_weight, Some(Weight::from_parts(700, 0))); }); } diff --git a/weight-meter/weight-meter-procedural/src/lib.rs b/weight-meter/weight-meter-procedural/src/lib.rs index a2abf3671..785e72023 100644 --- a/weight-meter/weight-meter-procedural/src/lib.rs +++ b/weight-meter/weight-meter-procedural/src/lib.rs @@ -14,7 +14,7 @@ pub fn start(attr: TokenStream, item: TokenStream) -> TokenStream { #(#attrs)* #[cfg_attr(feature = "bench", ::orml_bencher::benchmarkable)] #vis #sig { - ::orml_weight_meter::start(frame_support::weights::Weight::from_ref_time(#weight)); + ::orml_weight_meter::start(frame_support::weights::Weight::from_parts(#weight, 0)); let result = #block; ::orml_weight_meter::finish(); result @@ -31,7 +31,7 @@ pub fn weight(attr: TokenStream, item: TokenStream) -> TokenStream { #(#attrs)* #[cfg_attr(feature = "bench", ::orml_bencher::benchmarkable)] #vis #sig { - ::orml_weight_meter::using(frame_support::weights::Weight::from_ref_time(#weight)); + ::orml_weight_meter::using(frame_support::weights::Weight::from_parts(#weight, 0)); #block } }) diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index fc199ef39..2e5474104 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -10,12 +10,12 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index 7f9ef90db..285c4fb1a 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -11,15 +11,15 @@ edition = "2021" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } [dev-dependencies] -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.39" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" } [features] default = ["std"] diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index bd3aeb32b..21069e427 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -13,19 +13,19 @@ 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.39" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.39" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.40" } # cumulus -cumulus-primitives-core = { default-features = false , git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39" } +cumulus-primitives-core = { default-features = false , git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.39" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.40" } # orml orml-traits = { path = "../traits", default-features = false} @@ -33,21 +33,21 @@ orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] # substrate -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" } # cumulus -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.39" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.39" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.39" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.39" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.39" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" } # orml orml-tokens = { path = "../tokens" } diff --git a/xtokens/src/mock/para.rs b/xtokens/src/mock/para.rs index 881a4e02e..60666a0bf 100644 --- a/xtokens/src/mock/para.rs +++ b/xtokens/src/mock/para.rs @@ -91,8 +91,8 @@ impl orml_tokens::Config for Runtime { } parameter_types! { - pub const ReservedXcmpWeight: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4)); - pub const ReservedDmpWeight: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4)); + pub const ReservedXcmpWeight: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4), 0); + pub const ReservedDmpWeight: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4), 0); } 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 c230aa58e..57ad84734 100644 --- a/xtokens/src/mock/para_relative_view.rs +++ b/xtokens/src/mock/para_relative_view.rs @@ -94,8 +94,8 @@ impl orml_tokens::Config for Runtime { } parameter_types! { - pub const ReservedXcmpWeight: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4)); - pub const ReservedDmpWeight: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4)); + pub const ReservedXcmpWeight: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4), 0); + pub const ReservedDmpWeight: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4), 0); } impl parachain_info::Config for Runtime {} diff --git a/xtokens/src/mock/para_teleport.rs b/xtokens/src/mock/para_teleport.rs index 454abf579..defd1ff57 100644 --- a/xtokens/src/mock/para_teleport.rs +++ b/xtokens/src/mock/para_teleport.rs @@ -92,8 +92,8 @@ impl orml_tokens::Config for Runtime { } parameter_types! { - pub const ReservedXcmpWeight: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4)); - pub const ReservedDmpWeight: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4)); + pub const ReservedXcmpWeight: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4), 0); + pub const ReservedDmpWeight: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_div(4), 0); } impl parachain_info::Config for Runtime {} From c258e13338b30ca9416de6686b99f559bf44bb90 Mon Sep 17 00:00:00 2001 From: devdanco Date: Tue, 11 Apr 2023 13:00:50 +0200 Subject: [PATCH 2/3] add import for Hasher --- bencher/src/bench_ext.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bencher/src/bench_ext.rs b/bencher/src/bench_ext.rs index 2cf6538d6..3c94b222c 100644 --- a/bencher/src/bench_ext.rs +++ b/bencher/src/bench_ext.rs @@ -1,4 +1,5 @@ use core::any::{Any, TypeId}; +use sp_core::Hasher; use sp_externalities::{Extension, ExtensionStore, Externalities, MultiRemovalResults}; use sp_state_machine::{Backend, Ext}; use sp_std::sync::Arc; @@ -8,7 +9,7 @@ use super::tracker::BenchTracker; pub struct BenchExt<'a, H, B> where - H: sp_core::Hasher, + H: Hasher, B: 'a + Backend, { ext: Ext<'a, H, B>, @@ -17,7 +18,7 @@ where impl<'a, H, B> BenchExt<'a, H, B> where - H: sp_core::Hasher, + H: Hasher, B: 'a + Backend, { pub fn new(ext: Ext<'a, H, B>, tracker: Arc) -> Self { @@ -27,7 +28,7 @@ where impl<'a, H, B> Externalities for BenchExt<'a, H, B> where - H: sp_core::Hasher, + H: Hasher, B: 'a + Backend, H::Out: Ord + 'static + codec::Codec, { @@ -170,7 +171,7 @@ where impl<'a, H, B> ExtensionStore for BenchExt<'a, H, B> where - H: sp_core::Hasher, + H: Hasher, B: 'a + Backend, { fn extension_by_type_id(&mut self, type_id: TypeId) -> Option<&mut dyn Any> { From e630e8f088bda62c9bc9c3c62e0fa5c8568542d0 Mon Sep 17 00:00:00 2001 From: devdanco Date: Wed, 12 Apr 2023 09:36:04 +0200 Subject: [PATCH 3/3] replace from_ref_time to from_parts --- auction/src/weights.rs | 6 ++-- authority/src/weights.rs | 18 ++++++------ bencher/test/src/weights.rs | 10 +++---- currencies/src/default_weight.rs | 10 +++---- currencies/src/weights.rs | 10 +++---- gradually-update/src/default_weight.rs | 8 +++--- oracle/src/weights.rs | 6 ++-- payments/src/weights.rs | 38 +++++++++++++------------- tokens/src/weights.rs | 10 +++---- vesting/src/default_weight.rs | 10 +++---- vesting/src/weights.rs | 10 +++---- 11 files changed, 68 insertions(+), 68 deletions(-) diff --git a/auction/src/weights.rs b/auction/src/weights.rs index 96fa19293..92af4c258 100644 --- a/auction/src/weights.rs +++ b/auction/src/weights.rs @@ -37,14 +37,14 @@ pub trait WeightInfo { /// Default weights. impl WeightInfo for () { fn bid_collateral_auction() -> Weight { - Weight::from_ref_time(108_000_000) + Weight::from_parts(108_000_000, 0) .saturating_add(RocksDbWeight::get().reads(8 as u64)) .saturating_add(RocksDbWeight::get().writes(9 as u64)) } fn on_finalize(c: u32, ) -> Weight { - Weight::from_ref_time(9_779_000) + Weight::from_parts(9_779_000, 0) // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(57_962_000).saturating_mul(c as u64)) + .saturating_add(Weight::from_parts(57_962_000, 0).saturating_mul(c as u64)) .saturating_add(RocksDbWeight::get().reads(10 as u64)) .saturating_add(RocksDbWeight::get().reads((3 as u64).saturating_mul(c as u64))) .saturating_add(RocksDbWeight::get().writes(7 as u64)) diff --git a/authority/src/weights.rs b/authority/src/weights.rs index cc4dd2db5..728d7593b 100644 --- a/authority/src/weights.rs +++ b/authority/src/weights.rs @@ -43,44 +43,44 @@ pub trait WeightInfo { /// Default weights. impl WeightInfo for () { fn dispatch_as() -> Weight { - Weight::from_ref_time(12_000_000) + Weight::from_parts(12_000_000, 0) } fn schedule_dispatch_without_delay() -> Weight { - Weight::from_ref_time(30_000_000) + Weight::from_parts(30_000_000, 0) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn schedule_dispatch_with_delay() -> Weight { - Weight::from_ref_time(32_000_000) + Weight::from_parts(32_000_000, 0) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn fast_track_scheduled_dispatch() -> Weight { - Weight::from_ref_time(42_000_000) + Weight::from_parts(42_000_000, 0) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn delay_scheduled_dispatch() -> Weight { - Weight::from_ref_time(42_000_000) + Weight::from_parts(42_000_000, 0) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn cancel_scheduled_dispatch() -> Weight { - Weight::from_ref_time(29_000_000) + Weight::from_parts(29_000_000, 0) .saturating_add(RocksDbWeight::get().reads(2 as u64)) .saturating_add(RocksDbWeight::get().writes(2 as u64)) } fn authorize_call() -> Weight { - Weight::from_ref_time(14_000_000) + Weight::from_parts(14_000_000, 0) .saturating_add(RocksDbWeight::get().writes(1 as u64)) } fn remove_authorized_call() -> Weight { - Weight::from_ref_time(16_000_000) + Weight::from_parts(16_000_000, 0) .saturating_add(RocksDbWeight::get().reads(1 as u64)) .saturating_add(RocksDbWeight::get().writes(1 as u64)) } fn trigger_call() -> Weight { - Weight::from_ref_time(29_000_000) + Weight::from_parts(29_000_000, 0) .saturating_add(RocksDbWeight::get().reads(1 as u64)) .saturating_add(RocksDbWeight::get().writes(1 as u64)) } diff --git a/bencher/test/src/weights.rs b/bencher/test/src/weights.rs index 8882be9cf..100178d15 100644 --- a/bencher/test/src/weights.rs +++ b/bencher/test/src/weights.rs @@ -14,7 +14,7 @@ impl ModuleWeights { // // Test::Bar (r: 0, w: 1) pub fn whitelist() -> Weight { - Weight::from_ref_time(5_356_000) + Weight::from_parts(5_356_000, 0) .saturating_add(T::DbWeight::get().writes(1)) } // Storage access info @@ -22,7 +22,7 @@ impl ModuleWeights { // Test::Value (r: 1, w: 1) // Unknown 0x3a7472616e73616374696f6e5f6c6576656c3a (r: 1, w: 1) pub fn set_value() -> Weight { - Weight::from_ref_time(3_919_000) + Weight::from_parts(3_919_000, 0) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -32,20 +32,20 @@ impl ModuleWeights { // Test::Foo (r: 0, w: 1) // Test::Value (r: 0, w: 1) pub fn set_foo() -> Weight { - Weight::from_ref_time(5_133_000) + Weight::from_parts(5_133_000, 0) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(4)) } // Storage access info // pub fn remove_all_bar() -> Weight { - Weight::from_ref_time(1_533_000) + Weight::from_parts(1_533_000, 0) } // Storage access info // // Test::Bar (r: 0, w: 10) pub fn remove_all_bar_with_limit() -> Weight { - Weight::from_ref_time(1_600_000) + Weight::from_parts(1_600_000, 0) .saturating_add(T::DbWeight::get().writes(10)) } } diff --git a/currencies/src/default_weight.rs b/currencies/src/default_weight.rs index 2054fd152..c0fb92770 100644 --- a/currencies/src/default_weight.rs +++ b/currencies/src/default_weight.rs @@ -8,22 +8,22 @@ use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; impl crate::WeightInfo for () { fn transfer_non_native_currency() -> Weight { - Weight::from_ref_time(172_011_000) + Weight::from_parts(172_011_000, 0) .saturating_add(DbWeight::get().reads(5 as u64)) .saturating_add(DbWeight::get().writes(2 as u64)) } fn transfer_native_currency() -> Weight { - Weight::from_ref_time(43_023_000) + Weight::from_parts(43_023_000, 0) } fn update_balance_non_native_currency() -> Weight { - Weight::from_ref_time(137_440_000) + Weight::from_parts(137_440_000, 0) .saturating_add(DbWeight::get().reads(5 as u64)) .saturating_add(DbWeight::get().writes(2 as u64)) } fn update_balance_native_currency_creating() -> Weight { - Weight::from_ref_time(64_432_000) + Weight::from_parts(64_432_000, 0) } fn update_balance_native_currency_killing() -> Weight { - Weight::from_ref_time(62_595_000) + Weight::from_parts(62_595_000, 0) } } diff --git a/currencies/src/weights.rs b/currencies/src/weights.rs index 619190ddb..d6119781f 100644 --- a/currencies/src/weights.rs +++ b/currencies/src/weights.rs @@ -40,27 +40,27 @@ pub trait WeightInfo { /// Default weights. impl WeightInfo for () { fn transfer_non_native_currency() -> Weight { - Weight::from_ref_time(60_000_000) + Weight::from_parts(60_000_000, 0) .saturating_add(RocksDbWeight::get().reads(5 as u64)) .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn transfer_native_currency() -> Weight { - Weight::from_ref_time(60_000_000) + Weight::from_parts(60_000_000, 0) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(2 as u64)) } fn update_balance_non_native_currency() -> Weight { - Weight::from_ref_time(29_000_000) + Weight::from_parts(29_000_000, 0) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn update_balance_native_currency_creating() -> Weight { - Weight::from_ref_time(31_000_000) + Weight::from_parts(31_000_000, 0) .saturating_add(RocksDbWeight::get().reads(1 as u64)) .saturating_add(RocksDbWeight::get().writes(1 as u64)) } fn update_balance_native_currency_killing() -> Weight { - Weight::from_ref_time(37_000_000) + Weight::from_parts(37_000_000, 0) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(2 as u64)) } diff --git a/gradually-update/src/default_weight.rs b/gradually-update/src/default_weight.rs index 995666607..e2c0f35c4 100644 --- a/gradually-update/src/default_weight.rs +++ b/gradually-update/src/default_weight.rs @@ -8,18 +8,18 @@ use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; impl crate::WeightInfo for () { fn gradually_update() -> Weight { - Weight::from_ref_time(57_922_000) + Weight::from_parts(57_922_000, 0) .saturating_add(DbWeight::get().reads(2 as u64)) .saturating_add(DbWeight::get().writes(1 as u64)) } fn cancel_gradually_update() -> Weight { - Weight::from_ref_time(66_687_000) + Weight::from_parts(66_687_000, 0) .saturating_add(DbWeight::get().reads(1 as u64)) .saturating_add(DbWeight::get().writes(1 as u64)) } fn on_finalize(u: u32) -> Weight { - Weight::from_ref_time(37_067_000) - .saturating_add(Weight::from_ref_time(20_890_000).saturating_mul(u as u64)) + Weight::from_parts(37_067_000, 0) + .saturating_add(Weight::from_parts(20_890_000, 0).saturating_mul(u as u64)) .saturating_add(DbWeight::get().reads(3 as u64)) .saturating_add(DbWeight::get().writes(3 as u64)) } diff --git a/oracle/src/weights.rs b/oracle/src/weights.rs index b1458bb3c..32bf28792 100644 --- a/oracle/src/weights.rs +++ b/oracle/src/weights.rs @@ -37,15 +37,15 @@ pub trait WeightInfo { /// Default weights. impl WeightInfo for () { fn feed_values(c: u32, ) -> Weight { - Weight::from_ref_time(16_800_000) + Weight::from_parts(16_800_000, 0) // Standard Error: 84_000 - .saturating_add(Weight::from_ref_time(3_600_000).saturating_mul(c as u64)) + .saturating_add(Weight::from_parts(3_600_000, 0).saturating_mul(c as u64)) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(1 as u64)) .saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(c as u64))) } fn on_finalize() -> Weight { - Weight::from_ref_time(3_000_000) + Weight::from_parts(3_000_000, 0) .saturating_add(RocksDbWeight::get().writes(1 as u64)) } } diff --git a/payments/src/weights.rs b/payments/src/weights.rs index 857953482..242210142 100644 --- a/payments/src/weights.rs +++ b/payments/src/weights.rs @@ -51,14 +51,14 @@ impl WeightInfo for SubstrateWeight { // Storage: Assets Accounts (r:2 w:2) // Storage: System Account (r:1 w:1) fn pay(_x: u32, ) -> Weight { - Weight::from_ref_time(55_900_000) + Weight::from_parts(55_900_000, 0) .saturating_add(T::DbWeight::get().reads(5 as u64)) .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Payment Payment (r:1 w:1) // Storage: Assets Accounts (r:2 w:2) fn release() -> Weight { - Weight::from_ref_time(36_000_000) + Weight::from_parts(36_000_000, 0) .saturating_add(T::DbWeight::get().reads(3 as u64)) .saturating_add(T::DbWeight::get().writes(3 as u64)) } @@ -66,35 +66,35 @@ impl WeightInfo for SubstrateWeight { // Storage: Assets Accounts (r:2 w:2) // Storage: System Account (r:1 w:0) fn cancel() -> Weight { - Weight::from_ref_time(48_000_000) + Weight::from_parts(48_000_000, 0) .saturating_add(T::DbWeight::get().reads(4 as u64)) .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Payment Payment (r:1 w:1) // Storage: Assets Accounts (r:2 w:2) fn resolve_payment() -> Weight { - Weight::from_ref_time(35_000_000) + Weight::from_parts(35_000_000, 0) .saturating_add(T::DbWeight::get().reads(3 as u64)) .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Payment Payment (r:1 w:1) // Storage: Payment ScheduledTasks (r:1 w:1) fn request_refund() -> Weight { - Weight::from_ref_time(20_000_000) + Weight::from_parts(20_000_000, 0) .saturating_add(T::DbWeight::get().reads(2 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Payment Payment (r:1 w:1) // Storage: Payment ScheduledTasks (r:1 w:1) fn dispute_refund() -> Weight { - Weight::from_ref_time(21_000_000) + Weight::from_parts(21_000_000, 0) .saturating_add(T::DbWeight::get().reads(2 as u64)) .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Payment Payment (r:1 w:1) // Storage: Sudo Key (r:1 w:0) fn request_payment() -> Weight { - Weight::from_ref_time(17_000_000) + Weight::from_parts(17_000_000, 0) .saturating_add(T::DbWeight::get().reads(2 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } @@ -102,13 +102,13 @@ impl WeightInfo for SubstrateWeight { // Storage: Assets Accounts (r:2 w:2) // Storage: System Account (r:1 w:1) fn accept_and_pay() -> Weight { - Weight::from_ref_time(58_000_000) + Weight::from_parts(58_000_000, 0) .saturating_add(T::DbWeight::get().reads(4 as u64)) .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Payment ScheduledTasks (r:1 w:1) fn remove_task() -> Weight { - Weight::from_ref_time(4_000_000) + Weight::from_parts(4_000_000, 0) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } @@ -121,14 +121,14 @@ impl WeightInfo for () { // Storage: Assets Accounts (r:2 w:2) // Storage: System Account (r:1 w:1) fn pay(_x: u32, ) -> Weight { - Weight::from_ref_time(55_900_000) + Weight::from_parts(55_900_000, 0) .saturating_add(RocksDbWeight::get().reads(5 as u64)) .saturating_add(RocksDbWeight::get().writes(4 as u64)) } // Storage: Payment Payment (r:1 w:1) // Storage: Assets Accounts (r:2 w:2) fn release() -> Weight { - Weight::from_ref_time(36_000_000) + Weight::from_parts(36_000_000, 0) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } @@ -136,35 +136,35 @@ impl WeightInfo for () { // Storage: Assets Accounts (r:2 w:2) // Storage: System Account (r:1 w:0) fn cancel() -> Weight { - Weight::from_ref_time(48_000_000) + Weight::from_parts(48_000_000, 0) .saturating_add(RocksDbWeight::get().reads(4 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } // Storage: Payment Payment (r:1 w:1) // Storage: Assets Accounts (r:2 w:2) fn resolve_payment() -> Weight { - Weight::from_ref_time(35_000_000) + Weight::from_parts(35_000_000, 0) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } // Storage: Payment Payment (r:1 w:1) // Storage: Payment ScheduledTasks (r:1 w:1) fn request_refund() -> Weight { - Weight::from_ref_time(20_000_000) + Weight::from_parts(20_000_000, 0) .saturating_add(RocksDbWeight::get().reads(2 as u64)) .saturating_add(RocksDbWeight::get().writes(2 as u64)) } // Storage: Payment Payment (r:1 w:1) // Storage: Payment ScheduledTasks (r:1 w:1) fn dispute_refund() -> Weight { - Weight::from_ref_time(21_000_000) + Weight::from_parts(21_000_000, 0) .saturating_add(RocksDbWeight::get().reads(2 as u64)) .saturating_add(RocksDbWeight::get().writes(2 as u64)) } // Storage: Payment Payment (r:1 w:1) // Storage: Sudo Key (r:1 w:0) fn request_payment() -> Weight { - Weight::from_ref_time(17_000_000) + Weight::from_parts(17_000_000, 0) .saturating_add(RocksDbWeight::get().reads(2 as u64)) .saturating_add(RocksDbWeight::get().writes(1 as u64)) } @@ -172,14 +172,14 @@ impl WeightInfo for () { // Storage: Assets Accounts (r:2 w:2) // Storage: System Account (r:1 w:1) fn accept_and_pay() -> Weight { - Weight::from_ref_time(58_000_000) + Weight::from_parts(58_000_000, 0) .saturating_add(RocksDbWeight::get().reads(4 as u64)) .saturating_add(RocksDbWeight::get().writes(4 as u64)) } // Storage: Payment ScheduledTasks (r:1 w:1) fn remove_task() -> Weight { - Weight::from_ref_time(4_000_000) + Weight::from_parts(4_000_000, 0) .saturating_add(RocksDbWeight::get().reads(1 as u64)) .saturating_add(RocksDbWeight::get().writes(1 as u64)) } -} \ No newline at end of file +} diff --git a/tokens/src/weights.rs b/tokens/src/weights.rs index 22c7867e3..8f5637160 100644 --- a/tokens/src/weights.rs +++ b/tokens/src/weights.rs @@ -39,27 +39,27 @@ pub trait WeightInfo { /// Default weights. impl WeightInfo for () { fn transfer() -> Weight { - Weight::from_ref_time(69_000_000) + Weight::from_parts(69_000_000, 0) .saturating_add(RocksDbWeight::get().reads(5 as u64)) .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn transfer_all() -> Weight { - Weight::from_ref_time(69_000_000) + Weight::from_parts(69_000_000, 0) .saturating_add(RocksDbWeight::get().reads(5 as u64)) .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn transfer_keep_alive() -> Weight { - Weight::from_ref_time(38_000_000) + Weight::from_parts(38_000_000, 0) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn force_transfer() -> Weight { - Weight::from_ref_time(45_000_000) + Weight::from_parts(45_000_000, 0) .saturating_add(RocksDbWeight::get().reads(4 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn set_balance() -> Weight { - Weight::from_ref_time(34_000_000) + Weight::from_parts(34_000_000, 0) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } diff --git a/vesting/src/default_weight.rs b/vesting/src/default_weight.rs index d716ab759..42da01846 100644 --- a/vesting/src/default_weight.rs +++ b/vesting/src/default_weight.rs @@ -8,19 +8,19 @@ use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; impl crate::WeightInfo for () { fn vested_transfer() -> Weight { - Weight::from_ref_time(310_862_000) + Weight::from_parts(310_862_000, 0) .saturating_add(DbWeight::get().reads(4 as u64)) .saturating_add(DbWeight::get().writes(4 as u64)) } fn claim(i: u32) -> Weight { - Weight::from_ref_time(158_614_000) - .saturating_add(Weight::from_ref_time(958_000).saturating_mul(i as u64)) + Weight::from_parts(158_614_000, 0) + .saturating_add(Weight::from_parts(958_000, 0).saturating_mul(i as u64)) .saturating_add(DbWeight::get().reads(3 as u64)) .saturating_add(DbWeight::get().writes(3 as u64)) } fn update_vesting_schedules(i: u32) -> Weight { - Weight::from_ref_time(119_811_000) - .saturating_add(Weight::from_ref_time(2_320_000).saturating_mul(i as u64)) + Weight::from_parts(119_811_000, 0) + .saturating_add(Weight::from_parts(2_320_000, 0).saturating_mul(i as u64)) .saturating_add(DbWeight::get().reads(2 as u64)) .saturating_add(DbWeight::get().writes(3 as u64)) } diff --git a/vesting/src/weights.rs b/vesting/src/weights.rs index 49c11e2ed..be6eb9ac0 100644 --- a/vesting/src/weights.rs +++ b/vesting/src/weights.rs @@ -38,21 +38,21 @@ pub trait WeightInfo { /// Default weights. impl WeightInfo for () { fn vested_transfer() -> Weight { - Weight::from_ref_time(69_000_000) + Weight::from_parts(69_000_000, 0) .saturating_add(RocksDbWeight::get().reads(4 as u64)) .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn claim(i: u32, ) -> Weight { - Weight::from_ref_time(31_747_000) + Weight::from_parts(31_747_000, 0) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(63_000).saturating_mul(i as u64)) + .saturating_add(Weight::from_parts(63_000, 0).saturating_mul(i as u64)) .saturating_add(RocksDbWeight::get().reads(2 as u64)) .saturating_add(RocksDbWeight::get().writes(2 as u64)) } fn update_vesting_schedules(i: u32, ) -> Weight { - Weight::from_ref_time(29_457_000) + Weight::from_parts(29_457_000, 0) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(117_000).saturating_mul(i as u64)) + .saturating_add(Weight::from_parts(117_000, 0).saturating_mul(i as u64)) .saturating_add(RocksDbWeight::get().reads(2 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) }