From 51232b085923683b5fea7ca023dd13d8fa80d0c9 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Mon, 02 Oct 2023 22:06:43 +0000 Subject: [PATCH] build: upgrade dependencies to polkadot v1.1.0 --- --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,6 @@ [workspace] default-members = ['client/*', 'node/*', 'runtime/opal'] +exclude = ['pallets/scheduler-v2'] members = [ 'client/*', 'crates/*', @@ -31,12 +32,10 @@ [workspace.dependencies] # Unique app-promotion-rpc = { path = "primitives/app_promotion_rpc", default-features = false } -evm-coder = { version = "0.4.2", default-features = false, features = [ - 'bondrewd', -] } +evm-coder = { version = "0.4.2", default-features = false, features = ['bondrewd'] } pallet-app-promotion = { path = "pallets/app-promotion", default-features = false } pallet-balances-adapter = { default-features = false, path = "pallets/balances-adapter" } -pallet-charge-transaction = { package = "pallet-template-transaction-payment", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.43" } +pallet-charge-transaction = { package = "pallet-template-transaction-payment", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v1.1.0" } pallet-collator-selection = { default-features = false, path = "pallets/collator-selection" } pallet-common = { default-features = false, path = "pallets/common" } pallet-configuration = { default-features = false, path = "pallets/configuration" } @@ -55,7 +54,7 @@ pallet-structure = { default-features = false, path = "pallets/structure" } pallet-test-utils = { default-features = false, path = "test-pallets/utils" } pallet-unique = { path = "pallets/unique", default-features = false } -pallet-unique-scheduler-v2 = { path = "pallets/scheduler-v2", default-features = false } +# pallet-unique-scheduler-v2 = { path = "pallets/scheduler-v2", default-features = false } precompile-utils-macro = { path = "runtime/common/ethereum/precompiles/utils/macro" } struct-versioning = { path = "crates/struct-versioning" } uc-rpc = { path = "client/rpc" } @@ -64,7 +63,7 @@ up-data-structs = { path = "primitives/data-structs", default-features = false } up-pov-estimate-rpc = { path = "primitives/pov-estimate-rpc", default-features = false } up-rpc = { path = "primitives/rpc", default-features = false } -up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.43" } +up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v1.1.0" } # Unique: Runtimes opal-runtime = { path = "runtime/opal" } @@ -72,132 +71,138 @@ unique-runtime = { path = "runtime/unique" } # Frontier (Unique patches over the Parity version) -fc-consensus = { git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } -fc-db = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } -fc-mapping-sync = { git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } -fc-rpc = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } -fc-rpc-core = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } -fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } -fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } -fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } -fp-storage = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } -pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } -pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } -pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } -pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.43" } +fc-api = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +fc-consensus = { git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +fc-db = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +fc-mapping-sync = { git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +fc-rpc = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +fc-rpc-core = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +fp-self-contained = { default-features = false, features = [ + "serde", +], git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +fp-storage = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +pallet-base-fee = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } +pallet-evm-precompile-simple = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v1.1.0" } # Parity -codec = { default-features = false, features = ['derive'], package = 'parity-scale-codec', version = "3.2.2" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-authorship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-collective = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-democracy = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-membership = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-preimage = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-ranked-collective = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-referenda = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-state-trie-migration = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-treasury = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -parachain-info = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -parity-scale-codec = { version = "3.2.2", features = ["derive"], default-features = false } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-session = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-staking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-trie = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-version = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } +codec = { default-features = false, features = ['derive'], package = 'parity-scale-codec', version = "3.6.5" } +cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-pallet-dmp-queue = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-pallet-parachain-system = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-pallet-xcmp-queue = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-core = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-parachain-inherent = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-timestamp = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-utility = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-executive = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-support = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-system = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-aura = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-authorship = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-collective = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-democracy = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-membership = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-preimage = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-ranked-collective = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-referenda = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-scheduler = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-session = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-state-trie-migration = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-sudo = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-treasury = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-utility = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +parachain-info = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +parity-scale-codec = { version = "3.6.5", features = ["derive"], default-features = false } +polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +scale-info = { version = "2.9.0", default-features = false, features = ["derive"] } +sp-api = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-block-builder = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-core = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-inherents = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-io = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-offchain = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-session = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-staking = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-std = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-trie = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-version = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-weights = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +staging-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +staging-xcm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +staging-xcm-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # Parity: Build utils -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # Parity: Benchmarking -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # Parity: Try Runtime -frame-try-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +frame-try-runtime = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +try-runtime-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # ORML -orml-tokens = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43" } -orml-traits = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43" } -orml-vesting = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43" } -orml-xcm-support = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43" } -orml-xtokens = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43" } +orml-tokens = { default-features = false, git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "upgrade-to-polkadot-v1.1.0" } +orml-traits = { default-features = false, git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "upgrade-to-polkadot-v1.1.0" } +orml-vesting = { default-features = false, git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "upgrade-to-polkadot-v1.1.0" } +orml-xcm-support = { default-features = false, git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "upgrade-to-polkadot-v1.1.0" } +orml-xtokens = { default-features = false, git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "upgrade-to-polkadot-v1.1.0" } # Other derivative = { version = "2.2.0", features = ["use_core"] } @@ -205,8 +210,8 @@ evm-core = { git = "https://github.com/rust-blockchain/evm", rev = "b7b82c7e1fc57b7449d6dfa6826600de37cc1e65", default-features = false } hex-literal = "0.4.1" impl-trait-for-tuples = "0.2.2" -jsonrpsee = { version = "0.16.2", features = ["macros", "server"] } -log = { version = "0.4.16", default-features = false } -num_enum = { version = "0.5.3", default-features = false } -serde = { default-features = false, features = ['derive'], version = "1.0.136" } -smallvec = "1.6.1" +jsonrpsee = { version = "0.16.3", features = ["macros", "server"] } +log = { version = "0.4.20", default-features = false } +num_enum = { version = "0.7.0", default-features = false } +serde = { default-features = false, features = ['derive'], version = "1.0.188" } +smallvec = "1.11.1" --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -5,14 +5,12 @@ version = "0.1.4" [dependencies] -anyhow = "1.0.57" -jsonrpsee = { version = "0.16.2", features = ["macros", "server"] } -trie-db = { version = "0.24.0", default-features = false } -zstd = { version = "0.11.2", default-features = false } +anyhow = "1.0.75" +jsonrpsee = { version = "0.16.3", features = ["macros", "server"] } +parity-scale-codec = { workspace = true } +trie-db = { version = "0.27.1", default-features = false } +zstd = { version = "0.12.4", default-features = false } -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - app-promotion-rpc = { workspace = true } up-common = { workspace = true } up-data-structs = { workspace = true } @@ -44,12 +42,8 @@ hex-literal = { workspace = true } [features] +all-runtimes = ['opal-runtime', 'quartz-runtime', 'unique-runtime'] default = ['opal-runtime'] -all-runtimes = [ - 'opal-runtime', - 'quartz-runtime', - 'unique-runtime', -] pov-estimate = [ 'opal-runtime/pov-estimate', 'quartz-runtime?/pov-estimate', --- a/crates/struct-versioning/Cargo.toml +++ b/crates/struct-versioning/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" [dependencies] -quote = "1.0.15" +quote = "1.0.33" syn = { version = "1.0", features = ["full"] } [lib] --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -20,23 +20,24 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] -clap = "4.1" +clap = "4.4" futures = '0.3.28' -tokio = { version = "1.24", features = ["time"] } serde_json = "1.0" +tokio = { version = "1.32", features = ["time"] } log = { workspace = true } -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } +parity-scale-codec = { workspace = true } cumulus-client-cli = { workspace = true } +cumulus-client-collator = { workspace = true } cumulus-client-consensus-aura = { workspace = true } cumulus-client-consensus-common = { workspace = true } +cumulus-client-consensus-proposer = { workspace = true } cumulus-client-network = { workspace = true } cumulus-client-service = { workspace = true } cumulus-primitives-core = { workspace = true } -cumulus-primitives-parachain-inherent = { workspace = true } +cumulus-primitives-parachain-inherent = { features = ["std"], workspace = true } cumulus-relay-chain-inprocess-interface = { workspace = true } cumulus-relay-chain-interface = { workspace = true } cumulus-relay-chain-minimal-node = { workspace = true } @@ -85,28 +86,57 @@ fc-consensus = { workspace = true } fc-db = { workspace = true } fc-mapping-sync = { workspace = true } -fc-rpc = { workspace = true } fc-rpc-core = { workspace = true } +fc-rpc.workspace = true fp-rpc = { workspace = true } app-promotion-rpc = { workspace = true } +fc-api.workspace = true +fp-storage.workspace = true +jsonrpsee.workspace = true +pallet-transaction-payment-rpc.workspace = true +sc-rpc-api.workspace = true +sc-rpc.workspace = true +sp-inherents.workspace = true uc-rpc = { workspace = true } -unique-rpc = { workspace = true } up-pov-estimate-rpc = { workspace = true } up-rpc = { workspace = true } -jsonrpsee.workspace = true -fp-storage.workspace = true -sc-rpc.workspace = true [build-dependencies] substrate-build-script-utils = { workspace = true } [features] +all-runtimes = ['opal-runtime', 'quartz-runtime', 'unique-runtime'] default = ["opal-runtime"] -all-runtimes = ['opal-runtime', 'quartz-runtime', 'unique-runtime'] -pov-estimate = ['opal-runtime/pov-estimate', 'quartz-runtime?/pov-estimate', 'uc-rpc/pov-estimate', 'unique-rpc/pov-estimate', 'unique-runtime?/pov-estimate'] -runtime-benchmarks = ['opal-runtime/runtime-benchmarks', 'polkadot-cli/runtime-benchmarks', 'polkadot-service/runtime-benchmarks', 'quartz-runtime?/runtime-benchmarks', 'sc-service/runtime-benchmarks', 'unique-runtime?/runtime-benchmarks'] +gov-test-timings = [ + 'opal-runtime/gov-test-timings', + 'quartz-runtime?/gov-test-timings', + 'unique-runtime?/gov-test-timings', +] +lookahead = [] +pov-estimate = [ + 'opal-runtime/pov-estimate', + 'quartz-runtime?/pov-estimate', + 'uc-rpc/pov-estimate', + 'unique-runtime?/pov-estimate', +] +runtime-benchmarks = [ + 'opal-runtime/runtime-benchmarks', + 'polkadot-cli/runtime-benchmarks', + 'polkadot-service/runtime-benchmarks', + 'quartz-runtime?/runtime-benchmarks', + 'sc-service/runtime-benchmarks', + 'unique-runtime?/runtime-benchmarks', +] sapphire-runtime = ['quartz-runtime', 'quartz-runtime/become-sapphire'] -try-runtime = ['opal-runtime?/try-runtime', 'quartz-runtime?/try-runtime', 'try-runtime-cli/try-runtime', 'unique-runtime?/try-runtime'] -session-test-timings = ['opal-runtime/session-test-timings', 'quartz-runtime?/session-test-timings', 'unique-runtime?/session-test-timings'] -gov-test-timings = ['opal-runtime/gov-test-timings', 'quartz-runtime?/gov-test-timings', 'unique-runtime?/gov-test-timings'] +session-test-timings = [ + 'opal-runtime/session-test-timings', + 'quartz-runtime?/session-test-timings', + 'unique-runtime?/session-test-timings', +] +try-runtime = [ + 'opal-runtime?/try-runtime', + 'quartz-runtime?/try-runtime', + 'try-runtime-cli/try-runtime', + 'unique-runtime?/try-runtime', +] --- a/node/rpc/Cargo.toml +++ b/node/rpc/Cargo.toml @@ -27,20 +27,20 @@ substrate-frame-rpc-system = { workspace = true } fc-db = { workspace = true } +fc-mapping-sync = { workspace = true } fc-rpc = { workspace = true } fc-rpc-core = { workspace = true } -fc-mapping-sync = { workspace = true } fp-rpc = { workspace = true } fp-storage = { workspace = true } app-promotion-rpc = { workspace = true } +pallet-ethereum.workspace = true serde = { workspace = true } uc-rpc = { workspace = true } up-common = { workspace = true } up-data-structs = { workspace = true } up-pov-estimate-rpc = { workspace = true, default-features = true } up-rpc = { workspace = true } -pallet-ethereum.workspace = true [features] default = [] --- a/pallets/app-promotion/Cargo.toml +++ b/pallets/app-promotion/Cargo.toml @@ -23,11 +23,11 @@ # 'pallet-unique/runtime-benchmarks', ] std = [ - 'codec/std', 'frame-benchmarking/std', 'frame-support/std', 'frame-system/std', 'pallet-evm/std', + 'parity-scale-codec/std', 'sp-core/std', 'sp-runtime/std', 'sp-std/std', @@ -39,9 +39,7 @@ ################################################################################ # Substrate Dependencies -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - +parity-scale-codec = { workspace = true } scale-info = { workspace = true } frame-benchmarking = { workspace = true, optional = true } @@ -68,4 +66,4 @@ ################################################################################ # Other -log = { version = "0.4.16", default-features = false } +log = { version = "0.4.20", default-features = false } --- a/pallets/balances-adapter/Cargo.toml +++ b/pallets/balances-adapter/Cargo.toml @@ -15,7 +15,7 @@ sp-std = { workspace = true } #Parity -codec = { workspace = true, package = "parity-scale-codec" } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } # Unique --- a/pallets/collator-selection/Cargo.toml +++ b/pallets/collator-selection/Cargo.toml @@ -12,11 +12,9 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - log = { workspace = true } -rand = { version = "0.8.5", features = ["std_rng"], default-features = false } +parity-scale-codec = { workspace = true } +rand = { version = "0.8.5", default-features = false } scale-info = { workspace = true } serde = { workspace = true } @@ -48,13 +46,13 @@ "frame-system/runtime-benchmarks", ] std = [ - "codec/std", "frame-benchmarking/std", "frame-support/std", "frame-system/std", "log/std", "pallet-authorship/std", "pallet-session/std", + "parity-scale-codec/std", "rand/std", "scale-info/std", "sp-consensus-aura/std", --- a/pallets/common/Cargo.toml +++ b/pallets/common/Cargo.toml @@ -5,9 +5,7 @@ version = "0.1.14" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - +parity-scale-codec = { workspace = true } scale-info = { workspace = true } bondrewd = { version = "0.1.14", features = ["derive"], default-features = false } @@ -21,6 +19,7 @@ sp-core = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-weights = { workspace = true } up-data-structs = { workspace = true } up-pov-estimate-rpc = { workspace = true } @@ -28,14 +27,15 @@ default = ["std"] runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks", "up-data-structs/runtime-benchmarks"] std = [ + "evm-coder/std", "frame-support/std", "frame-system/std", "pallet-evm/std", "sp-runtime/std", "sp-std/std", + "sp-weights/std", "up-data-structs/std", "up-pov-estimate-rpc/std", - "evm-coder/std", ] stubgen = ["evm-coder/stubgen", "up-data-structs/stubgen"] tests = [] --- a/pallets/configuration/Cargo.toml +++ b/pallets/configuration/Cargo.toml @@ -4,8 +4,7 @@ version = "0.2.0" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } +parity-scale-codec = { workspace = true } fp-evm = { workspace = true } frame-benchmarking = { workspace = true, optional = true } @@ -16,23 +15,26 @@ sp-arithmetic = { workspace = true } sp-core = { workspace = true } sp-io = { workspace = true } +sp-runtime = { workspace = true } sp-std = { workspace = true } +staging-xcm = { workspace = true } up-common = { workspace = true } -xcm = { workspace = true } hex-literal = { workspace = true } +log = { workspace = true } [features] default = ["std"] runtime-benchmarks = ["frame-benchmarking"] std = [ - "codec/std", "fp-evm/std", "frame-benchmarking/std", "frame-support/std", "frame-system/std", + "parity-scale-codec/std", "sp-arithmetic/std", "sp-core/std", + "sp-runtime/std", "sp-std/std", ] try-runtime = ["frame-support/try-runtime"] --- a/pallets/evm-coder-substrate/Cargo.toml +++ b/pallets/evm-coder-substrate/Cargo.toml @@ -5,8 +5,7 @@ version = "0.1.3" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } evm-coder = { workspace = true } @@ -18,10 +17,11 @@ pallet-evm = { workspace = true } sp-core = { workspace = true } sp-std = { workspace = true } +sp-weights = { workspace = true } up-data-structs = { workspace = true } evm-coder-substrate-procedural = { path = "./procedural" } -spez = "0.1.1" +spez = "0.1.2" [features] default = ["std"] @@ -33,6 +33,7 @@ "pallet-evm/std", "sp-core/std", "sp-std/std", + "sp-weights/std", 'frame-benchmarking/std', ] try-runtime = ["frame-support/try-runtime"] --- a/pallets/evm-contract-helpers/Cargo.toml +++ b/pallets/evm-contract-helpers/Cargo.toml @@ -18,13 +18,11 @@ up-sponsorship = { workspace = true } # Locals -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - evm-coder = { workspace = true } pallet-common = { workspace = true } pallet-evm-coder-substrate = { workspace = true } pallet-evm-transaction-payment = { workspace = true } +parity-scale-codec = { workspace = true } up-data-structs = { workspace = true, features = ['serde1'] } [features] --- a/pallets/evm-migration/Cargo.toml +++ b/pallets/evm-migration/Cargo.toml @@ -5,21 +5,27 @@ version = "0.1.1" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - ethereum = { workspace = true } frame-benchmarking = { workspace = true, optional = true } frame-support = { workspace = true } frame-system = { workspace = true } pallet-evm = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } sp-core = { workspace = true } +sp-io = { workspace = true } sp-std = { workspace = true } -sp-io = { workspace = true } [features] default = ["runtime-benchmarks", "std"] runtime-benchmarks = ["frame-benchmarking"] -std = ["frame-benchmarking/std", "frame-support/std", "frame-system/std", "pallet-evm/std", "sp-core/std", "sp-std/std", "sp-io/std"] +std = [ + "frame-benchmarking/std", + "frame-support/std", + "frame-system/std", + "pallet-evm/std", + "sp-core/std", + "sp-io/std", + "sp-std/std", +] try-runtime = ["frame-support/try-runtime"] --- a/pallets/evm-transaction-payment/Cargo.toml +++ b/pallets/evm-transaction-payment/Cargo.toml @@ -5,9 +5,7 @@ version = "0.1.1" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - +parity-scale-codec = { workspace = true } scale-info = { workspace = true } fp-evm = { workspace = true } --- a/pallets/foreign-assets/Cargo.toml +++ b/pallets/foreign-assets/Cargo.toml @@ -5,9 +5,7 @@ version = "0.1.0" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - +parity-scale-codec = { workspace = true } scale-info = { workspace = true } frame-benchmarking = { workspace = true, optional = true } @@ -18,18 +16,17 @@ pallet-balances = { features = ["insecure_zero_ed"], workspace = true } pallet-common = { workspace = true } pallet-fungible = { workspace = true } -serde = { workspace = true, optional = true } +serde = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +staging-xcm = { workspace = true } +staging-xcm-executor = { workspace = true } up-data-structs = { workspace = true } -xcm = { workspace = true } -xcm-executor = { workspace = true } [features] default = ["std"] runtime-benchmarks = ['frame-benchmarking', 'pallet-common/runtime-benchmarks'] std = [ - "codec/std", "frame-support/std", "frame-system/std", "log/std", @@ -37,11 +34,11 @@ "pallet-balances/std", "pallet-common/std", "pallet-fungible/std", + "parity-scale-codec/std", "scale-info/std", - "serde", "sp-runtime/std", "sp-std/std", + "staging-xcm-executor/std", "up-data-structs/std", - "xcm-executor/std" ] try-runtime = ["frame-support/try-runtime"] --- a/pallets/fungible/Cargo.toml +++ b/pallets/fungible/Cargo.toml @@ -5,9 +5,7 @@ version = "0.1.11" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - +parity-scale-codec = { workspace = true } scale-info = { workspace = true } evm-coder = { workspace = true } --- a/pallets/gov-origins/Cargo.toml +++ b/pallets/gov-origins/Cargo.toml @@ -23,9 +23,7 @@ ################################################################################ # Substrate Dependencies -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. parity-scale-codec = { workspace = true } - scale-info = { workspace = true } frame-support = { workspace = true } --- a/pallets/identity/Cargo.toml +++ b/pallets/identity/Cargo.toml @@ -13,10 +13,9 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec", features = ["max-encoded-len"] } +parity-scale-codec = { workspace = true, features = ["max-encoded-len"] } -enumflags2 = "0.7.4" +enumflags2 = "0.7.8" frame-benchmarking = { workspace = true, optional = true } frame-support = { workspace = true } frame-system = { workspace = true } @@ -38,14 +37,14 @@ "sp-runtime/runtime-benchmarks", ] std = [ - "codec/std", "frame-benchmarking?/std", "frame-support/std", "frame-system/std", + "pallet-balances/std", + "parity-scale-codec/std", "scale-info/std", "sp-io/std", "sp-runtime/std", "sp-std/std", - "pallet-balances/std", ] try-runtime = ["frame-support/try-runtime"] --- a/pallets/inflation/Cargo.toml +++ b/pallets/inflation/Cargo.toml @@ -18,20 +18,18 @@ default = ['std'] runtime-benchmarks = ['frame-benchmarking'] std = [ - 'codec/std', 'frame-benchmarking/std', 'frame-support/std', 'frame-system/std', 'pallet-balances/std', + 'parity-scale-codec/std', 'sp-runtime/std', 'sp-std/std', ] try-runtime = ["frame-support/try-runtime"] [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - +parity-scale-codec = { workspace = true } scale-info = { workspace = true } frame-benchmarking = { workspace = true, optional = true } --- a/pallets/maintenance/Cargo.toml +++ b/pallets/maintenance/Cargo.toml @@ -10,19 +10,27 @@ version = "0.1.0" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - +parity-scale-codec = { workspace = true } scale-info = { workspace = true } frame-benchmarking = { workspace = true, optional = true } frame-support = { workspace = true } frame-system = { workspace = true } sp-core = { workspace = true } +sp-runtime = { workspace = true } sp-std = { workspace = true } [features] default = ["std"] runtime-benchmarks = ["frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks"] -std = ["codec/std", "frame-benchmarking/std", "frame-support/std", "frame-system/std", "scale-info/std", "sp-core/std", "sp-std/std"] +std = [ + "frame-benchmarking/std", + "frame-support/std", + "frame-system/std", + "parity-scale-codec/std", + "scale-info/std", + "sp-core/std", + "sp-runtime/std", + "sp-std/std", +] try-runtime = ["frame-support/try-runtime"] --- a/pallets/nonfungible/Cargo.toml +++ b/pallets/nonfungible/Cargo.toml @@ -5,9 +5,6 @@ version = "0.1.14" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - evm-coder = { workspace = true } frame-benchmarking = { workspace = true, optional = true } frame-support = { workspace = true } @@ -16,6 +13,7 @@ pallet-evm = { workspace = true } pallet-evm-coder-substrate = { workspace = true } pallet-structure = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } sp-core = { workspace = true } sp-runtime = { workspace = true } --- a/pallets/refungible/Cargo.toml +++ b/pallets/refungible/Cargo.toml @@ -5,9 +5,7 @@ version = "0.2.13" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - +parity-scale-codec = { workspace = true } scale-info = { workspace = true } evm-coder = { workspace = true } --- a/pallets/structure/Cargo.toml +++ b/pallets/structure/Cargo.toml @@ -4,9 +4,7 @@ version = "0.1.2" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - +parity-scale-codec = { workspace = true } scale-info = { workspace = true } frame-benchmarking = { workspace = true, optional = true } @@ -15,6 +13,7 @@ log = { workspace = true } pallet-common = { workspace = true } pallet-evm = { workspace = true } +sp-runtime = { workspace = true } sp-std = { workspace = true } up-data-structs = { workspace = true } @@ -27,8 +26,9 @@ "frame-system/std", "pallet-common/std", "pallet-evm/std", - "codec/std", + "parity-scale-codec/std", "scale-info/std", + "sp-runtime/std", "sp-std/std", "up-data-structs/std", ] --- a/pallets/unique/Cargo.toml +++ b/pallets/unique/Cargo.toml @@ -19,7 +19,6 @@ limit-testing = ["up-data-structs/limit-testing"] runtime-benchmarks = ['frame-benchmarking', 'pallet-common/runtime-benchmarks'] std = [ - 'codec/std', 'evm-coder/std', 'frame-benchmarking/std', 'frame-support/std', @@ -29,6 +28,7 @@ 'pallet-evm-coder-substrate/std', 'pallet-evm/std', 'pallet-nonfungible/std', + 'parity-scale-codec/std', 'sp-runtime/std', 'sp-std/std', 'up-data-structs/std', @@ -39,8 +39,7 @@ ################################################################################ # Local Dependencies [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } +parity-scale-codec = { workspace = true } ethereum = { workspace = true } evm-coder = { workspace = true } --- a/primitives/app_promotion_rpc/Cargo.toml +++ b/primitives/app_promotion_rpc/Cargo.toml @@ -5,12 +5,12 @@ version = "0.1.0" [dependencies] -codec = { workspace = true } pallet-evm = { workspace = true } +parity-scale-codec = { workspace = true } sp-api = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } [features] default = ["std"] -std = ["codec/std", "sp-api/std", "sp-runtime/std", "sp-std/std"] +std = ["parity-scale-codec/std", "sp-api/std", "sp-runtime/std", "sp-std/std"] --- a/primitives/common/Cargo.toml +++ b/primitives/common/Cargo.toml @@ -13,6 +13,7 @@ std = [ 'cumulus-primitives-core/std', 'fp-rpc/std', + 'fp-self-contained/std', 'frame-support/std', 'pallet-evm/std', 'sp-consensus-aura/std', @@ -24,6 +25,7 @@ [dependencies] cumulus-primitives-core = { workspace = true } fp-rpc = { workspace = true } +fp-self-contained = { workspace = true } frame-support = { workspace = true } pallet-evm = { workspace = true } sp-consensus-aura = { workspace = true } --- a/primitives/data-structs/Cargo.toml +++ b/primitives/data-structs/Cargo.toml @@ -9,20 +9,18 @@ version = "0.2.2" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - +bondrewd = { version = "0.1.14", features = ["derive"], default-features = false } derivative = { workspace = true } +evm-coder = { workspace = true } frame-support = { workspace = true } pallet-evm = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } -serde = { workspace = true, optional = true } +serde = { workspace = true } sp-core = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } -bondrewd = { version = "0.1.14", features = ["derive"], default-features = false } struct-versioning = { workspace = true } -evm-coder = { workspace = true } [features] default = ["std"] @@ -30,9 +28,9 @@ runtime-benchmarks = [] serde1 = ["serde/alloc"] std = [ - "codec/std", "frame-support/std", "pallet-evm/std", + "parity-scale-codec/std", "serde/std", "serde1", "sp-core/std", --- a/primitives/pov-estimate-rpc/Cargo.toml +++ b/primitives/pov-estimate-rpc/Cargo.toml @@ -5,7 +5,7 @@ version = "0.1.0" [dependencies] -codec = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } serde = { workspace = true, optional = true } sp-api = { workspace = true } @@ -15,4 +15,12 @@ [features] default = ["std"] -std = ["codec/std", "scale-info/std", "serde/std", "sp-api/std", "sp-core/std", "sp-runtime/std", "sp-std/std"] +std = [ + "parity-scale-codec/std", + "scale-info/std", + "serde/std", + "sp-api/std", + "sp-core/std", + "sp-runtime/std", + "sp-std/std", +] --- a/primitives/rpc/Cargo.toml +++ b/primitives/rpc/Cargo.toml @@ -5,9 +5,9 @@ version = "0.1.3" [dependencies] -codec = { workspace = true } pallet-common = { workspace = true } pallet-evm = { workspace = true } +parity-scale-codec = { workspace = true } sp-api = { workspace = true } sp-core = { workspace = true } sp-runtime = { workspace = true } @@ -17,8 +17,8 @@ [features] default = ["std"] std = [ - "codec/std", "pallet-common/std", + "parity-scale-codec/std", "sp-api/std", "sp-core/std", "sp-runtime/std", --- a/runtime/common/ethereum/precompiles/utils/macro/Cargo.toml +++ b/runtime/common/ethereum/precompiles/utils/macro/Cargo.toml @@ -9,7 +9,7 @@ proc-macro = true [dependencies] -num_enum = { version = "0.5.3", default-features = false } +num_enum = { version = "0.7.0", default-features = false } proc-macro2 = "1.0" quote = "1.0" sha3 = "0.8" --- a/runtime/opal/Cargo.toml +++ b/runtime/opal/Cargo.toml @@ -38,8 +38,10 @@ 'pallet-app-promotion/runtime-benchmarks', 'pallet-balances/runtime-benchmarks', 'pallet-collator-selection/runtime-benchmarks', + 'pallet-collective/runtime-benchmarks', 'pallet-common/runtime-benchmarks', 'pallet-configuration/runtime-benchmarks', + 'pallet-democracy/runtime-benchmarks', 'pallet-ethereum/runtime-benchmarks', 'pallet-evm-coder-substrate/runtime-benchmarks', 'pallet-evm-migration/runtime-benchmarks', @@ -48,25 +50,21 @@ 'pallet-identity/runtime-benchmarks', 'pallet-inflation/runtime-benchmarks', 'pallet-maintenance/runtime-benchmarks', + 'pallet-membership/runtime-benchmarks', 'pallet-nonfungible/runtime-benchmarks', - 'pallet-democracy/runtime-benchmarks', - 'pallet-collective/runtime-benchmarks', 'pallet-ranked-collective/runtime-benchmarks', - 'pallet-membership/runtime-benchmarks', 'pallet-referenda/runtime-benchmarks', + 'pallet-refungible/runtime-benchmarks', 'pallet-scheduler/runtime-benchmarks', - 'pallet-refungible/runtime-benchmarks', 'pallet-structure/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', + 'pallet-unique/runtime-benchmarks', 'pallet-utility/runtime-benchmarks', - 'pallet-unique-scheduler-v2/runtime-benchmarks', - 'pallet-unique/runtime-benchmarks', 'pallet-xcm/runtime-benchmarks', 'sp-runtime/runtime-benchmarks', - 'xcm-builder/runtime-benchmarks', + 'staging-xcm-builder/runtime-benchmarks', ] std = [ - 'codec/std', 'cumulus-pallet-aura-ext/std', 'cumulus-pallet-parachain-system/std', 'cumulus-pallet-xcm/std', @@ -80,13 +78,14 @@ 'frame-try-runtime/std', 'pallet-aura/std', 'pallet-balances/std', + 'pallet-collective/std', 'pallet-democracy/std', - 'pallet-collective/std', + 'pallet-gov-origins/std', + 'pallet-membership/std', 'pallet-ranked-collective/std', - 'pallet-membership/std', 'pallet-referenda/std', - 'pallet-gov-origins/std', 'pallet-scheduler/std', + 'parity-scale-codec/std', # 'pallet-contracts/std', # 'pallet-contracts-primitives/std', # 'pallet-contracts-rpc-runtime-api/std', @@ -121,12 +120,11 @@ 'pallet-structure/std', 'pallet-sudo/std', 'pallet-timestamp/std', - 'pallet-utility/std', 'pallet-transaction-payment-rpc-runtime-api/std', 'pallet-transaction-payment/std', 'pallet-treasury/std', - 'pallet-unique-scheduler-v2/std', 'pallet-unique/std', + 'pallet-utility/std', 'parachain-info/std', 'serde', 'sp-api/std', @@ -140,14 +138,14 @@ 'sp-std/std', 'sp-transaction-pool/std', 'sp-version/std', + 'staging-xcm-builder/std', + 'staging-xcm-executor/std', + 'staging-xcm/std', 'up-common/std', 'up-data-structs/std', 'up-pov-estimate-rpc/std', 'up-rpc/std', 'up-sponsorship/std', - 'xcm-builder/std', - 'xcm-executor/std', - 'xcm/std', "orml-tokens/std", "orml-traits/std", @@ -187,9 +185,11 @@ 'pallet-base-fee/try-runtime', 'pallet-charge-transaction/try-runtime', 'pallet-collective/try-runtime', + 'pallet-collective/try-runtime', 'pallet-common/try-runtime', 'pallet-configuration/try-runtime', 'pallet-democracy/try-runtime', + 'pallet-democracy/try-runtime', 'pallet-ethereum/try-runtime', 'pallet-evm-coder-substrate/try-runtime', 'pallet-evm-contract-helpers/try-runtime', @@ -198,28 +198,25 @@ 'pallet-evm/try-runtime', 'pallet-foreign-assets/try-runtime', 'pallet-fungible/try-runtime', + 'pallet-gov-origins/try-runtime', 'pallet-inflation/try-runtime', 'pallet-maintenance/try-runtime', 'pallet-membership/try-runtime', + 'pallet-membership/try-runtime', 'pallet-nonfungible/try-runtime', - 'pallet-democracy/try-runtime', - 'pallet-collective/try-runtime', 'pallet-ranked-collective/try-runtime', - 'pallet-membership/try-runtime', 'pallet-referenda/try-runtime', - 'pallet-gov-origins/try-runtime', - 'pallet-scheduler/try-runtime', 'pallet-refungible/try-runtime', 'pallet-scheduler/try-runtime', + 'pallet-scheduler/try-runtime', 'pallet-structure/try-runtime', 'pallet-sudo/try-runtime', 'pallet-test-utils?/try-runtime', 'pallet-timestamp/try-runtime', - 'pallet-utility/try-runtime', 'pallet-transaction-payment/try-runtime', 'pallet-treasury/try-runtime', - 'pallet-unique-scheduler-v2/try-runtime', 'pallet-unique/try-runtime', + 'pallet-utility/try-runtime', 'pallet-xcm/try-runtime', 'parachain-info/try-runtime', ] @@ -227,20 +224,17 @@ app-promotion = [] collator-selection = [] foreign-assets = [] +gov-test-timings = [] governance = [] -gov-test-timings = [] preimage = [] refungible = [] +session-test-timings = [] unique-scheduler = [] -session-test-timings = [] ################################################################################ # local dependencies [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - cumulus-pallet-aura-ext = { workspace = true } cumulus-pallet-dmp-queue = { workspace = true } cumulus-pallet-parachain-system = { workspace = true } @@ -266,13 +260,14 @@ pallet-state-trie-migration = { workspace = true } pallet-sudo = { workspace = true } pallet-timestamp = { workspace = true } -pallet-utility = { workspace = true } pallet-transaction-payment = { workspace = true } pallet-transaction-payment-rpc-runtime-api = { workspace = true } pallet-treasury = { workspace = true } +pallet-utility = { workspace = true } pallet-xcm = { workspace = true } parachain-info = { workspace = true } -polkadot-parachain = { workspace = true } +parity-scale-codec = { workspace = true } +polkadot-parachain-primitives = { workspace = true } smallvec = { workspace = true } sp-api = { workspace = true } sp-arithmetic = { workspace = true } @@ -287,9 +282,9 @@ sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } -xcm = { workspace = true } -xcm-builder = { workspace = true } -xcm-executor = { workspace = true } +staging-xcm = { workspace = true } +staging-xcm-builder = { workspace = true } +staging-xcm-executor = { workspace = true } app-promotion-rpc = { workspace = true } derivative = { workspace = true } @@ -304,8 +299,10 @@ pallet-base-fee = { workspace = true } pallet-charge-transaction = { workspace = true } pallet-collator-selection = { workspace = true } +pallet-collective = { workspace = true } pallet-common = { workspace = true } pallet-configuration = { workspace = true } +pallet-democracy = { workspace = true } pallet-ethereum = { workspace = true } pallet-evm = { workspace = true } pallet-evm-coder-substrate = { workspace = true } @@ -315,18 +312,16 @@ pallet-evm-transaction-payment = { workspace = true } pallet-foreign-assets = { workspace = true } pallet-fungible = { workspace = true } +pallet-gov-origins = { workspace = true } pallet-identity = { workspace = true } pallet-inflation = { workspace = true } pallet-maintenance = { workspace = true } +pallet-membership = { workspace = true } pallet-nonfungible = { workspace = true } -pallet-democracy = { workspace = true } -pallet-collective = { workspace = true } pallet-ranked-collective = { workspace = true } -pallet-membership = { workspace = true } pallet-referenda = { workspace = true } -pallet-gov-origins = { workspace = true } +pallet-refungible = { workspace = true } pallet-scheduler = { workspace = true } -pallet-refungible = { workspace = true } pallet-structure = { workspace = true } pallet-unique = { workspace = true } precompile-utils-macro = { workspace = true } --- a/runtime/quartz/Cargo.toml +++ b/runtime/quartz/Cargo.toml @@ -32,9 +32,11 @@ 'pallet-balances/runtime-benchmarks', 'pallet-collator-selection/runtime-benchmarks', 'pallet-collective/runtime-benchmarks', + 'pallet-collective/runtime-benchmarks', 'pallet-common/runtime-benchmarks', 'pallet-configuration/runtime-benchmarks', 'pallet-democracy/runtime-benchmarks', + 'pallet-democracy/runtime-benchmarks', 'pallet-ethereum/runtime-benchmarks', 'pallet-evm-coder-substrate/runtime-benchmarks', 'pallet-evm-migration/runtime-benchmarks', @@ -44,25 +46,22 @@ 'pallet-inflation/runtime-benchmarks', 'pallet-maintenance/runtime-benchmarks', 'pallet-membership/runtime-benchmarks', + 'pallet-membership/runtime-benchmarks', 'pallet-nonfungible/runtime-benchmarks', - 'pallet-democracy/runtime-benchmarks', - 'pallet-collective/runtime-benchmarks', 'pallet-ranked-collective/runtime-benchmarks', - 'pallet-membership/runtime-benchmarks', 'pallet-referenda/runtime-benchmarks', - 'pallet-scheduler/runtime-benchmarks', 'pallet-refungible/runtime-benchmarks', 'pallet-scheduler/runtime-benchmarks', + 'pallet-scheduler/runtime-benchmarks', 'pallet-structure/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', + 'pallet-unique/runtime-benchmarks', 'pallet-utility/runtime-benchmarks', - 'pallet-unique/runtime-benchmarks', 'pallet-xcm/runtime-benchmarks', 'sp-runtime/runtime-benchmarks', - 'xcm-builder/runtime-benchmarks', + 'staging-xcm-builder/runtime-benchmarks', ] std = [ - 'codec/std', 'cumulus-pallet-aura-ext/std', 'cumulus-pallet-parachain-system/std', 'cumulus-pallet-xcm/std', @@ -81,6 +80,7 @@ 'pallet-democracy/std', 'pallet-membership/std', 'pallet-scheduler/std', + 'parity-scale-codec/std', # 'pallet-contracts/std', # 'pallet-contracts-primitives/std', # 'pallet-contracts-rpc-runtime-api/std', @@ -99,8 +99,10 @@ 'pallet-base-fee/std', 'pallet-charge-transaction/std', 'pallet-collator-selection/std', + 'pallet-collective/std', 'pallet-common/std', 'pallet-configuration/std', + 'pallet-democracy/std', 'pallet-ethereum/std', 'pallet-evm-coder-substrate/std', 'pallet-evm-contract-helpers/std', @@ -108,24 +110,22 @@ 'pallet-evm-transaction-payment/std', 'pallet-evm/std', 'pallet-fungible/std', + 'pallet-gov-origins/std', 'pallet-inflation/std', + 'pallet-membership/std', 'pallet-nonfungible/std', - 'pallet-democracy/std', - 'pallet-collective/std', 'pallet-ranked-collective/std', - 'pallet-membership/std', 'pallet-referenda/std', - 'pallet-gov-origins/std', + 'pallet-refungible/std', 'pallet-scheduler/std', - 'pallet-refungible/std', 'pallet-structure/std', 'pallet-sudo/std', 'pallet-timestamp/std', - 'pallet-utility/std', 'pallet-transaction-payment-rpc-runtime-api/std', 'pallet-transaction-payment/std', 'pallet-treasury/std', 'pallet-unique/std', + 'pallet-utility/std', 'parachain-info/std', 'serde', 'sp-api/std', @@ -139,14 +139,14 @@ 'sp-std/std', 'sp-transaction-pool/std', 'sp-version/std', + 'staging-xcm-builder/std', + 'staging-xcm-executor/std', + 'staging-xcm/std', 'up-common/std', 'up-data-structs/std', 'up-pov-estimate-rpc/std', 'up-rpc/std', 'up-sponsorship/std', - 'xcm-builder/std', - 'xcm-executor/std', - 'xcm/std', "orml-tokens/std", "orml-traits/std", @@ -181,8 +181,10 @@ 'pallet-balances-adapter/try-runtime', 'pallet-balances/try-runtime', 'pallet-charge-transaction/try-runtime', + 'pallet-collective/try-runtime', 'pallet-common/try-runtime', 'pallet-configuration/try-runtime', + 'pallet-democracy/try-runtime', 'pallet-ethereum/try-runtime', 'pallet-evm-coder-substrate/try-runtime', 'pallet-evm-contract-helpers/try-runtime', @@ -191,24 +193,22 @@ 'pallet-evm/try-runtime', 'pallet-foreign-assets/try-runtime', 'pallet-fungible/try-runtime', + 'pallet-gov-origins/try-runtime', 'pallet-inflation/try-runtime', 'pallet-maintenance/try-runtime', + 'pallet-membership/try-runtime', 'pallet-nonfungible/try-runtime', - 'pallet-democracy/try-runtime', - 'pallet-collective/try-runtime', 'pallet-ranked-collective/try-runtime', - 'pallet-membership/try-runtime', 'pallet-referenda/try-runtime', - 'pallet-gov-origins/try-runtime', + 'pallet-refungible/try-runtime', 'pallet-scheduler/try-runtime', - 'pallet-refungible/try-runtime', 'pallet-structure/try-runtime', 'pallet-sudo/try-runtime', 'pallet-timestamp/try-runtime', - 'pallet-utility/try-runtime', 'pallet-transaction-payment/try-runtime', 'pallet-treasury/try-runtime', 'pallet-unique/try-runtime', + 'pallet-utility/try-runtime', 'pallet-xcm/try-runtime', 'parachain-info/try-runtime', ] @@ -216,20 +216,17 @@ app-promotion = [] collator-selection = [] foreign-assets = [] +gov-test-timings = [] governance = [] preimage = [] refungible = [] -unique-scheduler = [] -gov-test-timings = [] session-test-timings = [] +unique-scheduler = [] ################################################################################ # local dependencies [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - cumulus-pallet-aura-ext = { workspace = true } cumulus-pallet-dmp-queue = { workspace = true } cumulus-pallet-parachain-system = { workspace = true } @@ -255,13 +252,14 @@ pallet-state-trie-migration = { workspace = true } pallet-sudo = { workspace = true } pallet-timestamp = { workspace = true } -pallet-utility = { workspace = true } pallet-transaction-payment = { workspace = true } pallet-transaction-payment-rpc-runtime-api = { workspace = true } pallet-treasury = { workspace = true } +pallet-utility = { workspace = true } pallet-xcm = { workspace = true } parachain-info = { workspace = true } -polkadot-parachain = { workspace = true } +parity-scale-codec = { workspace = true } +polkadot-parachain-primitives = { workspace = true } smallvec = { workspace = true } sp-api = { workspace = true } sp-arithmetic = { workspace = true } @@ -276,9 +274,9 @@ sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } -xcm = { workspace = true } -xcm-builder = { workspace = true } -xcm-executor = { workspace = true } +staging-xcm = { workspace = true } +staging-xcm-builder = { workspace = true } +staging-xcm-executor = { workspace = true } app-promotion-rpc = { workspace = true } derivative = { workspace = true } @@ -287,20 +285,20 @@ pallet-app-promotion = { workspace = true } pallet-balances-adapter = { workspace = true } pallet-collator-selection = { workspace = true } +pallet-collective = { workspace = true } pallet-common = { workspace = true } pallet-configuration = { workspace = true } +pallet-democracy = { workspace = true } pallet-fungible = { workspace = true } +pallet-gov-origins = { workspace = true } pallet-identity = { workspace = true } pallet-inflation = { workspace = true } +pallet-membership = { workspace = true } pallet-nonfungible = { workspace = true } -pallet-democracy = { workspace = true } -pallet-collective = { workspace = true } pallet-ranked-collective = { workspace = true } -pallet-membership = { workspace = true } pallet-referenda = { workspace = true } -pallet-gov-origins = { workspace = true } +pallet-refungible = { workspace = true } pallet-scheduler = { workspace = true } -pallet-refungible = { workspace = true } pallet-structure = { workspace = true } pallet-unique = { workspace = true } scale-info = { workspace = true } @@ -312,7 +310,7 @@ evm-coder = { workspace = true } fp-rpc = { workspace = true } fp-self-contained = { workspace = true } -num_enum = { version = "0.5.3", default-features = false } +num_enum = { version = "0.7.0", default-features = false } pallet-base-fee = { workspace = true } pallet-charge-transaction = { workspace = true } pallet-ethereum = { workspace = true } --- a/runtime/tests/Cargo.toml +++ b/runtime/tests/Cargo.toml @@ -37,12 +37,12 @@ pallet-evm-coder-substrate = { workspace = true } -codec = { workspace = true, package = "parity-scale-codec" } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } evm-coder = { workspace = true } +staging-xcm = { workspace = true } up-sponsorship = { workspace = true } -xcm = { workspace = true } [dev-dependencies] pallet-common = { workspace = true, features = ["tests"] } --- a/runtime/unique/Cargo.toml +++ b/runtime/unique/Cargo.toml @@ -29,9 +29,11 @@ 'pallet-balances/runtime-benchmarks', 'pallet-collator-selection/runtime-benchmarks', 'pallet-collective/runtime-benchmarks', + 'pallet-collective/runtime-benchmarks', 'pallet-common/runtime-benchmarks', 'pallet-configuration/runtime-benchmarks', 'pallet-democracy/runtime-benchmarks', + 'pallet-democracy/runtime-benchmarks', 'pallet-ethereum/runtime-benchmarks', 'pallet-evm-coder-substrate/runtime-benchmarks', 'pallet-evm-migration/runtime-benchmarks', @@ -41,26 +43,23 @@ 'pallet-inflation/runtime-benchmarks', 'pallet-maintenance/runtime-benchmarks', 'pallet-membership/runtime-benchmarks', + 'pallet-membership/runtime-benchmarks', 'pallet-nonfungible/runtime-benchmarks', - 'pallet-democracy/runtime-benchmarks', - 'pallet-collective/runtime-benchmarks', 'pallet-ranked-collective/runtime-benchmarks', - 'pallet-membership/runtime-benchmarks', 'pallet-referenda/runtime-benchmarks', + 'pallet-refungible/runtime-benchmarks', 'pallet-scheduler/runtime-benchmarks', - 'pallet-refungible/runtime-benchmarks', 'pallet-scheduler/runtime-benchmarks', 'pallet-structure/runtime-benchmarks', 'pallet-timestamp/runtime-benchmarks', + 'pallet-unique/runtime-benchmarks', 'pallet-utility/runtime-benchmarks', - 'pallet-unique/runtime-benchmarks', 'pallet-xcm/runtime-benchmarks', 'sp-runtime/runtime-benchmarks', + 'staging-xcm-builder/runtime-benchmarks', 'up-data-structs/runtime-benchmarks', - 'xcm-builder/runtime-benchmarks', ] std = [ - 'codec/std', 'cumulus-pallet-aura-ext/std', 'cumulus-pallet-parachain-system/std', 'cumulus-pallet-xcm/std', @@ -78,6 +77,7 @@ 'pallet-democracy/std', 'pallet-membership/std', 'pallet-scheduler/std', + 'parity-scale-codec/std', # 'pallet-contracts/std', # 'pallet-contracts-primitives/std', # 'pallet-contracts-rpc-runtime-api/std', @@ -97,8 +97,10 @@ 'pallet-base-fee/std', 'pallet-charge-transaction/std', 'pallet-collator-selection/std', + 'pallet-collective/std', 'pallet-common/std', 'pallet-configuration/std', + 'pallet-democracy/std', 'pallet-ethereum/std', 'pallet-evm-coder-substrate/std', 'pallet-evm-contract-helpers/std', @@ -106,24 +108,22 @@ 'pallet-evm-transaction-payment/std', 'pallet-evm/std', 'pallet-fungible/std', + 'pallet-gov-origins/std', 'pallet-inflation/std', + 'pallet-membership/std', 'pallet-nonfungible/std', - 'pallet-democracy/std', - 'pallet-collective/std', 'pallet-ranked-collective/std', - 'pallet-membership/std', 'pallet-referenda/std', - 'pallet-gov-origins/std', - 'pallet-scheduler/std', 'pallet-refungible/std', + 'pallet-scheduler/std', 'pallet-structure/std', 'pallet-sudo/std', 'pallet-timestamp/std', - 'pallet-utility/std', 'pallet-transaction-payment-rpc-runtime-api/std', 'pallet-transaction-payment/std', 'pallet-treasury/std', 'pallet-unique/std', + 'pallet-utility/std', 'parachain-info/std', 'sp-api/std', 'sp-block-builder/std', @@ -136,14 +136,14 @@ 'sp-std/std', 'sp-transaction-pool/std', 'sp-version/std', + 'staging-xcm-builder/std', + 'staging-xcm-executor/std', + 'staging-xcm/std', 'up-common/std', 'up-data-structs/std', 'up-pov-estimate-rpc/std', 'up-rpc/std', 'up-sponsorship/std', - 'xcm-builder/std', - 'xcm-executor/std', - 'xcm/std', "orml-tokens/std", "orml-traits/std", @@ -180,9 +180,11 @@ 'pallet-balances/try-runtime', 'pallet-charge-transaction/try-runtime', 'pallet-collective/try-runtime', + 'pallet-collective/try-runtime', 'pallet-common/try-runtime', 'pallet-configuration/try-runtime', 'pallet-democracy/try-runtime', + 'pallet-democracy/try-runtime', 'pallet-ethereum/try-runtime', 'pallet-evm-coder-substrate/try-runtime', 'pallet-evm-contract-helpers/try-runtime', @@ -191,26 +193,24 @@ 'pallet-evm/try-runtime', 'pallet-foreign-assets/try-runtime', 'pallet-fungible/try-runtime', + 'pallet-gov-origins/try-runtime', 'pallet-inflation/try-runtime', 'pallet-maintenance/try-runtime', 'pallet-membership/try-runtime', + 'pallet-membership/try-runtime', 'pallet-nonfungible/try-runtime', - 'pallet-democracy/try-runtime', - 'pallet-collective/try-runtime', 'pallet-ranked-collective/try-runtime', - 'pallet-membership/try-runtime', 'pallet-referenda/try-runtime', - 'pallet-gov-origins/try-runtime', - 'pallet-scheduler/try-runtime', 'pallet-refungible/try-runtime', 'pallet-scheduler/try-runtime', + 'pallet-scheduler/try-runtime', 'pallet-structure/try-runtime', 'pallet-sudo/try-runtime', 'pallet-timestamp/try-runtime', - 'pallet-utility/try-runtime', 'pallet-transaction-payment/try-runtime', 'pallet-treasury/try-runtime', 'pallet-unique/try-runtime', + 'pallet-utility/try-runtime', 'pallet-xcm/try-runtime', 'parachain-info/try-runtime', ] @@ -219,20 +219,17 @@ app-promotion = [] collator-selection = [] foreign-assets = [] +gov-test-timings = [] governance = [] preimage = [] refungible = [] -unique-scheduler = [] -gov-test-timings = [] session-test-timings = [] +unique-scheduler = [] ################################################################################ # local dependencies [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - cumulus-pallet-aura-ext = { workspace = true } cumulus-pallet-dmp-queue = { workspace = true } cumulus-pallet-parachain-system = { workspace = true } @@ -258,13 +255,14 @@ pallet-state-trie-migration = { workspace = true } pallet-sudo = { workspace = true } pallet-timestamp = { workspace = true } -pallet-utility = { workspace = true } pallet-transaction-payment = { workspace = true } pallet-transaction-payment-rpc-runtime-api = { workspace = true } pallet-treasury = { workspace = true } +pallet-utility = { workspace = true } pallet-xcm = { workspace = true } parachain-info = { workspace = true } -polkadot-parachain = { workspace = true } +parity-scale-codec = { workspace = true } +polkadot-parachain-primitives = { workspace = true } smallvec = { workspace = true } sp-api = { workspace = true } sp-arithmetic = { workspace = true } @@ -279,9 +277,9 @@ sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } -xcm = { workspace = true } -xcm-builder = { workspace = true } -xcm-executor = { workspace = true } +staging-xcm = { workspace = true } +staging-xcm-builder = { workspace = true } +staging-xcm-executor = { workspace = true } app-promotion-rpc = { workspace = true } derivative = { workspace = true } @@ -289,20 +287,20 @@ pallet-app-promotion = { workspace = true } pallet-balances-adapter = { workspace = true } pallet-collator-selection = { workspace = true } +pallet-collective = { workspace = true } pallet-common = { workspace = true } pallet-configuration = { workspace = true } +pallet-democracy = { workspace = true } pallet-fungible = { workspace = true } +pallet-gov-origins = { workspace = true } pallet-identity = { workspace = true } pallet-inflation = { workspace = true } +pallet-membership = { workspace = true } pallet-nonfungible = { workspace = true } -pallet-democracy = { workspace = true } -pallet-collective = { workspace = true } pallet-ranked-collective = { workspace = true } -pallet-membership = { workspace = true } pallet-referenda = { workspace = true } -pallet-gov-origins = { workspace = true } +pallet-refungible = { workspace = true } pallet-scheduler = { workspace = true } -pallet-refungible = { workspace = true } pallet-structure = { workspace = true } pallet-unique = { workspace = true } scale-info = { workspace = true } --- a/test-pallets/utils/Cargo.toml +++ b/test-pallets/utils/Cargo.toml @@ -6,21 +6,21 @@ version = "0.1.0" [dependencies] -# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it. -codec = { workspace = true, package = "parity-scale-codec" } - frame-support = { workspace = true } frame-system = { workspace = true } +parity-scale-codec = { workspace = true } scale-info = { workspace = true } +sp-runtime = { workspace = true } sp-std = { workspace = true } [features] default = ["std"] std = [ - "codec/std", "frame-support/std", "frame-system/std", + "parity-scale-codec/std", "scale-info/std", + "sp-runtime/std", "sp-std/std", ] -try-runtime = ["frame-support/try-runtime", "pallet-unique-scheduler-v2/try-runtime"] +try-runtime = ["frame-support/try-runtime"] -- gitstuff