cargo: use global workspace dependencies

Cargo.toml

@@ -30,7 +30,22 @@ default-members = [
 ]
 
 [workspace.dependencies]
+anyhow = { version =  "1.0.86", default-features = false }
+async-channel = "1.9.0"
+async-stream = "0.3.5"
+async-trait = "0.1.80"
+clap = { version = "4.4.18", features = [ "derive" ] }
+env_logger = "0.11.3"
+futures = "0.3.30" 
+hex = "0.4.3"
 log = { version = "0.4.21", default-features = false }
+serde = { version = "1.0.203", default-features = false, features = [ "derive" ] }
+serde_json = { version = "1.0.117", default-features = false }
+tokio = "1.38.0"
+tracing = "0.1.40"
+
+scale-info = { version = "2.11.3", default-features = false, features = [ "derive" ] }
+scale-codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ "derive" ] }
 
 polkadot-sdk = { git = "https://github.com/Analog-Labs/polkadot-sdk", tag = "v1.13.0-patched", default-feature = false }
 

chronicle/Cargo.toml

@@ -9,34 +9,38 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
+anyhow.workspace = true
+async-trait.workspace = true
+clap.workspace = true
+futures.workspace = true
+hex.workspace = true 
+
+serde.workspace = true
+serde_json.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+
+rosetta-client.workspace = true
+rosetta-core.workspace = true
+rosetta-config-ethereum.workspace = true
+
 alloy-primitives = { version = "0.6.4" }
 alloy-sol-types = { version = "0.6.4" }
-anyhow = "1.0.75"
-async-trait = "0.1.73"
 bincode = "1.3.3"
-clap = { version = "4.4.18", features = ["derive"] }
-futures = "0.3.28"
-hex = "0.4"
 #peernet = "0.2.0"
-peernet = { git = "https://github.com/dvc94ch/peernet" }
+peernet = { git = "https://github.com/dvc94ch/peernet", rev = "f8ae1372178f5f23e714738701df2ce4c583e51e" }
 prometheus_exporter = { version = "0.8.5", default-features = false, features = ["logging"] }
-rosetta-client.workspace = true
-rosetta-core.workspace = true
-rosetta-config-ethereum.workspace = true
 schnorr-evm = { version = "0.1.0" }
-serde = "1.0.188"
-serde_json = "1.0.105"
 sha3 = { version = "0.10" }
-tc-subxt = { path = "../tc-subxt" }
-time-primitives = { path = "../primitives" }
-tokio = "1.32.0"
-tracing = "0.1.37"
 tracing-panic = "0.1.1"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+
+tc-subxt = { path = "../tc-subxt" }
+time-primitives = { path = "../primitives" }
 tss = { path = "../tss" }
 
 [dev-dependencies]
-env_logger = "0.10.0"
+env_logger.workspace = true
 log-panics = "2.1.0"
 lazy_static = "1.4.0"
 surf = { version = "2.3.2", default-features = false, features = [ "h1-client-rustls" ] }

node/Cargo.toml

@@ -23,95 +23,107 @@ targets = [ "x86_64-unknown-linux-gnu" ]
 name = "timechain-node"
 
 [dependencies]
-async-channel = "1.9.0"
-async-trait = "0.1.73"
-clap = { version = "4.4.4", features = [ "derive" ] }
-futures = "0.3.28"
+anyhow.workspace = true
+async-channel.workspace = true
+async-trait.workspace = true
+clap.workspace = true
+futures.workspace = true
+log.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+
+bincode = "1.3.3"
+convert_case = "0.6"
 hex-literal = "0.4.1"
-log = { workspace = true }
-serde = "1.0"
-serde_json = "1.0"
-
-frame-metadata-hash-extension = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched", default-features = false }
-frame-system = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-frame-system-rpc-runtime-api = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-pallet-im-online = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-pallet-transaction-payment = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-authority-discovery  = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-chain-spec = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-cli = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched", default-features = false }
-sc-client-api = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched", default-features = false }
-sc-consensus = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-consensus-babe = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-consensus-grandpa = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-consensus-slots = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-executor = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-network = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-network-sync = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-offchain = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-service = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched", default-features = false }
-sc-storage-monitor = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-sysinfo = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-telemetry = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-transaction-pool = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-transaction-pool-api = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-authority-discovery  = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-consensus = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-consensus-babe = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-consensus-grandpa = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-core = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-io = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-inherents = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-keyring = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-keystore = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-runtime = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-timestamp = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-transaction-storage-proof = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-
-# node 's RPCs deps
+
+polkadot-sdk = { workspace = true, features = [
+	"frame-benchmarking",
+	"frame-benchmarking-cli",
+	"frame-metadata-hash-extension",
+	"frame-system",
+	"frame-system-rpc-runtime-api",
+
+	"pallet-im-online",
+	"pallet-transaction-payment",
+	"pallet-transaction-payment-rpc",
+
+	"sc-authority-discovery",
+	"sc-basic-authorship",
+	"sc-chain-spec",
+	"sc-cli",
+	"sc-client-api",
+	"sc-consensus",
+	"sc-consensus-babe",
+	"sc-consensus-babe-rpc",
+	"sc-consensus-grandpa",
+	"sc-consensus-grandpa-rpc",
+	"sc-consensus-slots",
+	"sc-executor",
+	"sc-network",
+	"sc-network-sync",
+	"sc-offchain",
+	"sc-rpc",
+	"sc-rpc-api",
+	"sc-rpc-spec-v2",
+	"sc-service",
+	"sc-storage-monitor",
+	"sc-sync-state-rpc",
+	"sc-sysinfo",
+	"sc-telemetry",
+	"sc-transaction-pool",
+	"sc-transaction-pool-api",
+
+	"sp-api",
+	"sp-authority-discovery",
+	"sp-block-builder",
+	"sp-blockchain",
+	"sp-consensus",
+	"sp-consensus-babe",
+	"sp-consensus-grandpa",
+	"sp-core",
+	"sp-io",
+	"sp-inherents",
+	"sp-keyring",
+	"sp-keystore",
+	"sp-runtime",
+	"sp-timestamp",
+	"sp-transaction-storage-proof",
+
+	"staging-node-inspect",
+	"substrate-frame-rpc-system",
+	"substrate-state-trie-migration-rpc",
+] }
+
+# node's rpc dependencies
 jsonrpsee = { version = "0.22.1", features = [ "server" ] }
-pallet-transaction-payment-rpc = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-basic-authorship = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-rpc = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-rpc-api = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-rpc-spec-v2 = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-consensus-babe-rpc = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-consensus-grandpa-rpc = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sc-sync-state-rpc = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-api = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-block-builder = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-sp-blockchain = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-substrate-frame-rpc-system = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-substrate-state-trie-migration-rpc = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
-
-# These dependencies are used for runtime benchmarking
-frame-benchmarking = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched", default-features = false }
-frame-benchmarking-cli = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched", default-features = false }
-
-# Local Dependencies
+
+# node's local dependencies
 chronicle = { path = "../chronicle", optional = true }
 time-primitives = { path = "../primitives" }
 timechain-runtime = { path = "../runtime" }
 tc-subxt = { path = "../tc-subxt", optional = true }
 
-# CLI-specific dependencies
+# node's additional command line interfaces
 try-runtime-cli = { git = "https://github.com/paritytech/try-runtime-cli", tag = "v0.7.0", optional = true }
-staging-node-inspect = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched", default-features = false }
-anyhow = "1.0.79"
-bincode = "1.3.3"
-convert_case = "0.6"
-tokio = "1.35.1"
-tracing = "0.1.40"
 
 [build-dependencies]
-substrate-build-script-utils = { git = "https://github.com/analog-labs/polkadot-sdk", tag = "v1.13.0-patched" }
+polkadot-sdk = { workspace = true, features = [ "substrate-build-script-utils" ] }
 
 [features]
 default = []
 # Dependencies that are only required if runtime benchmarking should be build.
-runtime-benchmarks = ["frame-benchmarking-cli/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", "timechain-runtime/runtime-benchmarks"]
+runtime-benchmarks = [
+	"polkadot-sdk/runtime-benchmarks",
+	"timechain-runtime/runtime-benchmarks"
+]
 # Enable features that allow the runtime to be tried and debugged. Name might be subject to change
 # in the near future.
-try-runtime = ["timechain-runtime/try-runtime", "try-runtime-cli"]
+try-runtime = [
+	"polkadot-sdk/try-runtime",
+	"timechain-runtime/try-runtime",
+	"try-runtime-cli",
+]
 # runs chronicle with node
 chronicle = ["dep:chronicle", "dep:tc-subxt"]

node/build.rs

@@ -1,4 +1,4 @@
-use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
+use polkadot_sdk::substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
 
 fn main() {
 	generate_cargo_keys();

node/src/benchmarking.rs

@@ -4,6 +4,8 @@
 
 use crate::service::FullClient;
 
+use polkadot_sdk::*;
+
 use frame_system_rpc_runtime_api::AccountNonceApi;
 
 use sc_cli::Result;

node/src/chain_spec.rs

@@ -1,18 +1,24 @@
 use convert_case::{Case, Casing};
 use hex_literal::hex;
+use serde::{Deserialize, Serialize};
+
+use polkadot_sdk::*;
+
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 use sc_chain_spec::ChainSpecExtension;
 use sc_service::{config::TelemetryEndpoints, ChainType};
-use serde::{Deserialize, Serialize};
+
 use sp_authority_discovery::AuthorityId as DiscoveryId;
 use sp_consensus_babe::AuthorityId as BabeId;
 use sp_consensus_grandpa::AuthorityId as GrandpaId;
 use sp_core::{crypto::UncheckedInto, hex2array};
 use sp_keyring::{AccountKeyring, Ed25519Keyring};
 use sp_runtime::Perbill;
+
 use timechain_runtime::{
 	binaries, fast_binaries, AccountId, Balance, Block, StakerStatus, ANLOG, TOKEN_DECIMALS,
 };
+
 const SS_58_FORMAT: u32 = 12850;
 
 /// Total supply of token is 90_570_710.

node/src/cli.rs

@@ -1,3 +1,5 @@
+use polkadot_sdk::*;
+
 /// An overarching CLI command definition.
 #[derive(Debug, clap::Parser)]
 pub struct Cli {

node/src/command.rs

@@ -1,10 +1,13 @@
-use super::benchmarking::{inherent_benchmark_data, RemarkBuilder, TransferKeepAliveBuilder};
 use crate::{
+	benchmarking::{inherent_benchmark_data, RemarkBuilder, TransferKeepAliveBuilder},
 	chain_spec,
 	cli::{Cli, Subcommand},
 	service,
 	service::{new_partial, FullClient},
 };
+
+use polkadot_sdk::*;
+
 use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE};
 use sc_cli::SubstrateCli;
 use sc_service::PartialComponents;

node/src/main.rs

@@ -10,6 +10,8 @@ mod cli;
 mod command;
 mod rpc;
 
+use polkadot_sdk::*;
+
 fn main() -> sc_cli::Result<()> {
 	command::run()
 }

node/src/rpc.rs

@@ -6,9 +6,11 @@
 
 #![warn(missing_docs)]
 
+use jsonrpsee::RpcModule;
 use std::sync::Arc;
 
-use jsonrpsee::RpcModule;
+use polkadot_sdk::*;
+
 use sc_client_api::AuxStore;
 use sc_consensus_babe::BabeWorkerHandle;
 use sc_consensus_grandpa::{
@@ -17,8 +19,8 @@ use sc_consensus_grandpa::{
 pub use sc_rpc::SubscriptionTaskExecutor;
 pub use sc_rpc_api::DenyUnsafe;
 use sc_transaction_pool_api::TransactionPool;
+
 use sp_api::ProvideRuntimeApi;
-//use sp_application_crypto::RuntimeAppPublic;
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 use sp_consensus::SelectChain;

node/src/service.rs

@@ -1,8 +1,13 @@
 //! Service implementation. Specialized wrapper over substrate service.
 
 use crate::{cli, rpc};
-use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE;
+
 use futures::prelude::*;
+use std::{path::Path, sync::Arc};
+
+use polkadot_sdk::*;
+
+use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE;
 use sc_client_api::{Backend, BlockBackend};
 use sc_consensus_babe::{self, SlotProportion};
 use sc_consensus_grandpa;
@@ -14,7 +19,6 @@ use sc_service::{config::Configuration, error::Error as ServiceError, RpcHandler
 use sc_telemetry::{Telemetry, TelemetryWorker};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_runtime::traits::Block as BlockT;
-use std::{path::Path, sync::Arc};
 
 use timechain_runtime::{self, opaque::Block, RuntimeApi};