diff --git a/Cargo.lock b/Cargo.lock index 6963b3a54..3f5886256 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -759,13 +759,11 @@ dependencies = [ "astar-primitives", "astar-xcm-benchmarks", "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "dapp-staking-v3-runtime-api", "fp-rpc", @@ -794,7 +792,6 @@ dependencies = [ "pallet-chain-extension-assets", "pallet-collator-selection 3.3.2", "pallet-contracts", - "pallet-dapp-staking-migration", "pallet-dapp-staking-v3", "pallet-dynamic-evm-base-fee", "pallet-ethereum", @@ -2537,24 +2534,6 @@ dependencies = [ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", ] -[[package]] -name = "cumulus-pallet-dmp-queue" -version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" -dependencies = [ - "cumulus-primitives-core", - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-io", - "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", - "staging-xcm", -] - [[package]] name = "cumulus-pallet-parachain-system" version = "0.7.0" @@ -2700,19 +2679,6 @@ dependencies = [ "sp-trie", ] -[[package]] -name = "cumulus-primitives-timestamp" -version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0#8c8edacf8942298c3807a2e192860da9e7e4996a" -dependencies = [ - "cumulus-primitives-core", - "futures 0.3.30", - "parity-scale-codec", - "sp-inherents", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.11.0)", - "sp-timestamp", -] - [[package]] name = "cumulus-primitives-utility" version = "0.7.0" @@ -14396,13 +14362,11 @@ dependencies = [ "astar-primitives", "astar-xcm-benchmarks", "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "dapp-staking-v3-runtime-api", "fp-rpc", @@ -14516,13 +14480,11 @@ dependencies = [ "astar-primitives", "astar-xcm-benchmarks", "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "dapp-staking-v3-runtime-api", "fp-rpc", @@ -14551,7 +14513,6 @@ dependencies = [ "pallet-chain-extension-assets", "pallet-collator-selection 3.3.2", "pallet-contracts", - "pallet-dapp-staking-migration", "pallet-dapp-staking-v3", "pallet-dynamic-evm-base-fee", "pallet-ethereum", diff --git a/Cargo.toml b/Cargo.toml index 11603e94c..b593673a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -88,7 +88,7 @@ derive_more = { version = "0.99" } proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0" } -ethers = { version = "2.0.9", default_features = false } +ethers = { version = "2.0.9", default-features = false } # Substrate # (wasm) @@ -224,12 +224,10 @@ fc-storage = { git = "https://github.com/AstarNetwork/frontier", branch = "polka # Cumulus # (wasm) cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } cumulus-primitives-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } parachain-info = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } parachains-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false } diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml index 14a5e3fcd..b31cda6b3 100644 --- a/runtime/astar/Cargo.toml +++ b/runtime/astar/Cargo.toml @@ -72,13 +72,11 @@ pallet-xcm-benchmarks = { workspace = true, optional = true } # cumulus dependencies cumulus-pallet-aura-ext = { workspace = true } -cumulus-pallet-dmp-queue = { workspace = true } cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } -cumulus-primitives-timestamp = { workspace = true } cumulus-primitives-utility = { workspace = true } parachain-info = { workspace = true } parachains-common = { workspace = true } @@ -109,7 +107,6 @@ frame-try-runtime = { workspace = true, optional = true } astar-primitives = { workspace = true } astar-xcm-benchmarks = { workspace = true, optional = true } pallet-collator-selection = { workspace = true } -pallet-dapp-staking-migration = { workspace = true } pallet-dapp-staking-v3 = { workspace = true } pallet-evm-precompile-assets-erc20 = { workspace = true } pallet-evm-precompile-dapp-staking-v3 = { workspace = true } @@ -170,7 +167,6 @@ std = [ "pallet-balances/std", "pallet-proxy/std", "pallet-dapp-staking-v3/std", - "pallet-dapp-staking-migration/std", "xcm-fee-payment-runtime-api/std", "dapp-staking-v3-runtime-api/std", "pallet-inflation/std", @@ -209,10 +205,8 @@ std = [ "cumulus-primitives-aura/std", "cumulus-primitives-core/std", "cumulus-primitives-utility/std", - "cumulus-primitives-timestamp/std", "cumulus-pallet-parachain-system/std", "cumulus-pallet-aura-ext/std", - "cumulus-pallet-dmp-queue/std", "cumulus-pallet-xcmp-queue/std", "pallet-message-queue/std", "parachains-common/std", @@ -251,7 +245,6 @@ runtime-benchmarks = [ 'pallet-timestamp/runtime-benchmarks', "pallet-ethereum/runtime-benchmarks", "pallet-dapp-staking-v3/runtime-benchmarks", - "pallet-dapp-staking-migration/runtime-benchmarks", "pallet-price-aggregator/runtime-benchmarks", "pallet-inflation/runtime-benchmarks", "pallet-membership/runtime-benchmarks", @@ -285,7 +278,6 @@ runtime-benchmarks = [ "polkadot-primitives/runtime-benchmarks", "polkadot-runtime-common/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "cumulus-pallet-dmp-queue/runtime-benchmarks", "cumulus-primitives-core/runtime-benchmarks", "parachains-common/runtime-benchmarks", "orml-oracle/runtime-benchmarks", @@ -301,7 +293,6 @@ try-runtime = [ "pallet-balances/try-runtime", "pallet-proxy/try-runtime", "pallet-dapp-staking-v3/try-runtime", - "pallet-dapp-staking-migration/try-runtime", "pallet-inflation/try-runtime", "pallet-sudo/try-runtime", "pallet-timestamp/try-runtime", @@ -321,7 +312,6 @@ try-runtime = [ "pallet-identity/try-runtime", "pallet-multisig/try-runtime", "cumulus-pallet-aura-ext/try-runtime", - "cumulus-pallet-dmp-queue/try-runtime", "cumulus-pallet-parachain-system/try-runtime", "cumulus-pallet-xcm/try-runtime", "cumulus-pallet-xcmp-queue/try-runtime", diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml index f6a87e05a..ea30fb6fe 100644 --- a/runtime/shibuya/Cargo.toml +++ b/runtime/shibuya/Cargo.toml @@ -78,13 +78,11 @@ pallet-vesting = { workspace = true } # cumulus dependencies cumulus-pallet-aura-ext = { workspace = true } -cumulus-pallet-dmp-queue = { workspace = true } cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } -cumulus-primitives-timestamp = { workspace = true } cumulus-primitives-utility = { workspace = true } parachain-info = { workspace = true } parachains-common = { workspace = true } @@ -233,10 +231,8 @@ std = [ "cumulus-primitives-aura/std", "cumulus-primitives-core/std", "cumulus-primitives-utility/std", - "cumulus-primitives-timestamp/std", "cumulus-pallet-parachain-system/std", "cumulus-pallet-aura-ext/std", - "cumulus-pallet-dmp-queue/std", "cumulus-pallet-xcmp-queue/std", "cumulus-pallet-xcm/std", "pallet-collator-selection/std", @@ -315,7 +311,6 @@ runtime-benchmarks = [ "polkadot-primitives/runtime-benchmarks", "polkadot-runtime-common/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "cumulus-pallet-dmp-queue/runtime-benchmarks", "cumulus-primitives-core/runtime-benchmarks", "parachains-common/runtime-benchmarks", "orml-oracle/runtime-benchmarks", @@ -358,7 +353,6 @@ try-runtime = [ "pallet-contracts/try-runtime", "pallet-evm-chain-id/try-runtime", "cumulus-pallet-aura-ext/try-runtime", - "cumulus-pallet-dmp-queue/try-runtime", "cumulus-pallet-parachain-system/try-runtime", "cumulus-pallet-xcm/try-runtime", "cumulus-pallet-xcmp-queue/try-runtime", diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml index 71c26c317..f896931ee 100644 --- a/runtime/shiden/Cargo.toml +++ b/runtime/shiden/Cargo.toml @@ -74,13 +74,11 @@ pallet-xcm-benchmarks = { workspace = true, optional = true } # cumulus dependencies cumulus-pallet-aura-ext = { workspace = true } -cumulus-pallet-dmp-queue = { workspace = true } cumulus-pallet-parachain-system = { workspace = true, features = ["parameterized-consensus-hook"] } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } -cumulus-primitives-timestamp = { workspace = true } cumulus-primitives-utility = { workspace = true } parachain-info = { workspace = true } parachains-common = { workspace = true } @@ -111,7 +109,6 @@ frame-try-runtime = { workspace = true, optional = true } astar-primitives = { workspace = true } astar-xcm-benchmarks = { workspace = true, optional = true } pallet-collator-selection = { workspace = true } -pallet-dapp-staking-migration = { workspace = true } pallet-dapp-staking-v3 = { workspace = true } pallet-evm-precompile-assets-erc20 = { workspace = true } pallet-evm-precompile-dapp-staking-v3 = { workspace = true } @@ -181,7 +178,6 @@ std = [ "xcm-fee-payment-runtime-api/std", "pallet-evm-precompile-sha3fips/std", "pallet-dapp-staking-v3/std", - "pallet-dapp-staking-migration/std", "dapp-staking-v3-runtime-api/std", "pallet-inflation/std", "pallet-evm-precompile-dapp-staking-v3/std", @@ -213,10 +209,8 @@ std = [ "cumulus-primitives-aura/std", "cumulus-primitives-core/std", "cumulus-primitives-utility/std", - "cumulus-primitives-timestamp/std", "cumulus-pallet-parachain-system/std", "cumulus-pallet-aura-ext/std", - "cumulus-pallet-dmp-queue/std", "cumulus-pallet-xcmp-queue/std", "cumulus-pallet-xcm/std", "pallet-collator-selection/std", @@ -252,7 +246,6 @@ runtime-benchmarks = [ "sp-runtime/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-dapp-staking-v3/runtime-benchmarks", - "pallet-dapp-staking-migration/runtime-benchmarks", "pallet-inflation/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", "pallet-ethereum/runtime-benchmarks", @@ -288,7 +281,6 @@ runtime-benchmarks = [ "polkadot-primitives/runtime-benchmarks", "polkadot-runtime-common/runtime-benchmarks", "xcm-executor/runtime-benchmarks", - "cumulus-pallet-dmp-queue/runtime-benchmarks", "cumulus-primitives-core/runtime-benchmarks", "pallet-message-queue/runtime-benchmarks", "parachains-common/runtime-benchmarks", @@ -308,7 +300,6 @@ try-runtime = [ "pallet-price-aggregator/try-runtime", "pallet-membership/try-runtime", "pallet-dapp-staking-v3/try-runtime", - "pallet-dapp-staking-migration/try-runtime", "pallet-inflation/try-runtime", "pallet-sudo/try-runtime", "pallet-timestamp/try-runtime", @@ -328,7 +319,6 @@ try-runtime = [ "pallet-insecure-randomness-collective-flip/try-runtime", "pallet-contracts/try-runtime", "cumulus-pallet-aura-ext/try-runtime", - "cumulus-pallet-dmp-queue/try-runtime", "cumulus-pallet-parachain-system/try-runtime", "cumulus-pallet-xcm/try-runtime", "cumulus-pallet-xcmp-queue/try-runtime",