diff --git a/Cargo.lock b/Cargo.lock index 46957d67..ccd0218d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1390,9 +1390,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.10" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive", @@ -1400,9 +1400,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.9" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", @@ -2303,20 +2303,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "cumulus-primitives-timestamp" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771ef4a34f7bcd4e8782f73d8dbd0df031b1c1c82e54b06af69f88df2cddc316" -dependencies = [ - "cumulus-primitives-core", - "futures", - "parity-scale-codec", - "sp-inherents", - "sp-std 12.0.0", - "sp-timestamp", -] - [[package]] name = "cumulus-primitives-utility" version = "0.4.0" @@ -12956,7 +12942,6 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-ping", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -13890,7 +13875,6 @@ dependencies = [ "tempfile", "tokio", "trappist-runtime", - "try-runtime-cli", "wait-timeout", ] @@ -13905,9 +13889,7 @@ dependencies = [ "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", - "cumulus-ping", "cumulus-primitives-core", - "cumulus-primitives-timestamp", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -14079,7 +14061,6 @@ dependencies = [ "async-trait", "clap", "frame-remote-externalities", - "frame-try-runtime", "hex", "log", "parity-scale-codec", @@ -15411,9 +15392,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "0383266b19108dfc6314a56047aa545a1b4d1be60e799b4dbdd407b56402704b" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 970ada73..8a7bd17e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,7 +54,6 @@ trappist-runtime-benchmarks = { default-features = false, path = "pallets/benchm pallet-withdraw-teleport = { default-features = false, path = "pallets/withdraw-teleport" } # Substrate std -try-runtime-cli = "0.35.0" frame-benchmarking-cli = "29.0.0" frame-rpc-system = { version = "25.0.0", package = "substrate-frame-rpc-system", default-features = false } pallet-transaction-payment-rpc = "27.0.0" @@ -160,7 +159,6 @@ cumulus-pallet-xcm = { version = "0.4.0", default-features = false } cumulus-pallet-xcmp-queue = { version = "0.4.0", default-features = false } cumulus-ping = { version = "0.4.0", default-features = false } cumulus-primitives-core = { version = "0.4.0", default-features = false } -cumulus-primitives-timestamp = { version = "0.4.0", default-features = false } cumulus-primitives-utility = { version = "0.4.0", default-features = false } pallet-collator-selection = { version = "6.0.0", default-features = false } parachains-common = { version = "4.0.0", default-features = false } diff --git a/node/Cargo.toml b/node/Cargo.toml index c804f6b9..868feaed 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -64,7 +64,6 @@ sp-api = { workspace = true, features = ["std"] } sp-consensus-aura = { workspace = true, features = ["std"] } sc-sysinfo = { workspace = true } substrate-prometheus-endpoint = { workspace = true } -try-runtime-cli = { workspace = true, optional = true } sc-transaction-pool-api = { workspace = true } frame-system = { workspace = true } frame-rpc-system = { workspace = true } @@ -115,6 +114,5 @@ runtime-benchmarks = [ ] try-runtime = [ "trappist-runtime/try-runtime", - "try-runtime-cli/try-runtime" ] parameterized-consensus-hook = [] diff --git a/node/src/rpc.rs b/node/src/rpc.rs index 73ba05c6..58770c2a 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -21,7 +21,7 @@ use std::sync::Arc; use parachains_common::{AccountId, Balance, Block, Nonce}; use sc_client_api::AuxStore; -pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor}; +pub use sc_rpc::DenyUnsafe; use sc_transaction_pool_api::TransactionPool; use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder; diff --git a/node/src/service.rs b/node/src/service.rs index 1d518e84..d45bb04a 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -38,9 +38,7 @@ use cumulus_primitives_core::{ use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface}; use futures::lock::Mutex; use jsonrpsee::RpcModule; -pub use parachains_common::{ - AccountId, AssetIdForTrustBackedAssets as AssetId, Balance, Block, Hash, Header, Nonce, -}; +pub use parachains_common::{AccountId, Balance, Block, Hash, Header, Nonce}; use parity_scale_codec::Codec; use sc_consensus::{ import_queue::{BasicQueue, Verifier as VerifierT}, diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml index 4e0fd185..f0ea9080 100644 --- a/pallets/asset-registry/Cargo.toml +++ b/pallets/asset-registry/Cargo.toml @@ -19,8 +19,6 @@ sp-std = { workspace = true } frame-benchmarking = { workspace = true, optional = true } frame-support = { workspace = true } frame-system = { workspace = true } -pallet-assets = { workspace = true } -pallet-balances = { workspace = true } xcm = { workspace = true } @@ -30,7 +28,8 @@ xcm-primitives = { workspace = true } sp-core = { workspace = true } sp-io = { workspace = true } sp-runtime = { workspace = true } - +pallet-assets = { workspace = true } +pallet-balances = { workspace = true } xcm = { workspace = true } xcm-simulator = { workspace = true } @@ -53,8 +52,6 @@ std = [ "parity-scale-codec/std", "sp-runtime/std", "sp-std/std", - "pallet-assets/std", - "pallet-balances/std", "frame-benchmarking?/std", "frame-support/std", "frame-system/std", diff --git a/runtime/stout/Cargo.toml b/runtime/stout/Cargo.toml index 09ef8f8a..c315b7f0 100644 --- a/runtime/stout/Cargo.toml +++ b/runtime/stout/Cargo.toml @@ -75,7 +75,6 @@ cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } cumulus-ping = { workspace = true } cumulus-primitives-core = { workspace = true } -cumulus-primitives-timestamp = { workspace = true } cumulus-primitives-utility = { workspace = true } pallet-collator-selection = { workspace = true } parachains-common = { workspace = true } @@ -150,7 +149,6 @@ std = [ "cumulus-pallet-xcmp-queue/std", "cumulus-ping/std", "cumulus-primitives-core/std", - "cumulus-primitives-timestamp/std", "cumulus-primitives-utility/std", "cumulus-pallet-dmp-queue/std", "cumulus-pallet-session-benchmarking/std", diff --git a/runtime/stout/src/contracts.rs b/runtime/stout/src/contracts.rs index 1d2e58bb..3f6aaeaa 100644 --- a/runtime/stout/src/contracts.rs +++ b/runtime/stout/src/contracts.rs @@ -26,7 +26,6 @@ use frame_support::{ use pallet_contracts::{ weights::SubstrateWeight, Config, DebugInfo, DefaultAddressGenerator, Frame, Schedule, }; -pub use parachains_common::AVERAGE_ON_INITIALIZE_RATIO; use sp_core::ConstBool; use sp_runtime::Perbill; diff --git a/runtime/trappist/Cargo.toml b/runtime/trappist/Cargo.toml index 54bb120c..81523526 100644 --- a/runtime/trappist/Cargo.toml +++ b/runtime/trappist/Cargo.toml @@ -78,9 +78,7 @@ cumulus-pallet-dmp-queue = { workspace = true } cumulus-pallet-parachain-system = { workspace = true } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } -cumulus-ping = { workspace = true } cumulus-primitives-core = { workspace = true } -cumulus-primitives-timestamp = { workspace = true } cumulus-primitives-utility = { workspace = true } pallet-collator-selection = { workspace = true } parachains-common = { workspace = true } @@ -168,9 +166,7 @@ std = [ "cumulus-pallet-parachain-system/std", "cumulus-pallet-xcm/std", "cumulus-pallet-xcmp-queue/std", - "cumulus-ping/std", "cumulus-primitives-core/std", - "cumulus-primitives-timestamp/std", "cumulus-primitives-utility/std", "cumulus-pallet-dmp-queue/std", "parachain-info/std", diff --git a/runtime/trappist/src/contracts.rs b/runtime/trappist/src/contracts.rs index 03c56c04..354bb4fc 100644 --- a/runtime/trappist/src/contracts.rs +++ b/runtime/trappist/src/contracts.rs @@ -24,7 +24,6 @@ use frame_support::{ traits::{ConstBool, ConstU32, Nothing}, }; use pallet_contracts::{Config, DebugInfo, DefaultAddressGenerator, Frame, Schedule}; -pub use parachains_common::AVERAGE_ON_INITIALIZE_RATIO; use sp_runtime::Perbill; // Prints debug output of the `contracts` pallet to stdout if the node is