Refactor: use workspace dependencies

Cargo.toml

@@ -76,11 +76,13 @@ parking_lot = "0.12.1"
 rlp = { version = "0.5", default-features = false }
 scale-codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive"] }
 scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1.0.101", default-features = false, features = ["derive", "alloc"] }
 serde_json = "1.0"
+sha3 = "0.10"
 sqlx = { version = "0.7.0-alpha.3", default-features = false, features = ["macros"] }
 thiserror = "1.0"
 tokio = "1.13"
+tracing = "0.1.34"
 # Substrate Client
 sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" }
 sc-block-builder = { version = "0.10.0-dev", git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" }
@@ -146,6 +148,9 @@ pallet-transaction-payment = { version = "4.0.0-dev", git = "https://github.com/
 pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" }
 pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43", default-features = false }
 pallet-utility = { version = "4.0.0-dev", git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43", default-features = false }
+parity-scale-codec = { version = "3.2.2", default-features = false, features = [
+	"derive",
+] }
 # Substrate Utility
 frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.10.0-dev", git = "https://github.com/bifrost-platform/bifrost-substrate", branch = "bifrost-polkadot-v0.9.43" }

client/bifrost/evm-tracing/Cargo.toml

@@ -2,20 +2,20 @@
 name = "fc-evm-tracing"
 authors = ["bifrost-platform"]
 edition = "2021"
-homepage = "https://thebifrost.io"
+homepage = "https://www.bifrostnetwork.com"
 license = "Apache-2.0"
 repository = "https://github.com/bifrost-platform/bifrost-frontier"
 version = "0.1.0"
 
 [dependencies]
-ethereum-types = { version = "0.14", features = ["std"] }
-hex = { version = "0.4.3", features = ["serde"] }
-serde = { version = "1.0.101", features = ["derive", "std"] }
-serde_json = { version = "1.0" }
+ethereum-types = { workspace = true, features = ["std"] }
+hex = { workspace = true, features = ["serde"] }
+serde = { workspace = true, features = ["derive", "std"] }
+serde_json = { workspace = true }
 
 fp-rpc-debug = { workspace = true, features = ["std"] }
 fp-rpc-evm-tracing-events = { workspace = true, features = ["std"] }
 
 # Substrate
-codec = { package = "parity-scale-codec", version = "3.2.2", features = ["std"] }
+parity-scale-codec = { workspace = true, features = ["std"] }
 sp-std = { workspace = true, features = ["std"] }

client/bifrost/evm-tracing/src/formatters/blockscout.rs

@@ -6,8 +6,8 @@ use crate::{
 		CallResult, CallType, CreateResult,
 	},
 };
-use codec::{Decode, Encode};
 use ethereum_types::{H160, U256};
+use parity_scale_codec::{Decode, Encode};
 use serde::Serialize;
 
 pub struct Formatter;

client/bifrost/evm-tracing/src/formatters/call_tracer.rs

@@ -9,8 +9,8 @@ use crate::listeners::call_list::Listener;
 use crate::types::serialization::*;
 use serde::Serialize;
 
-use codec::{Decode, Encode};
 use ethereum_types::{H160, U256};
+use parity_scale_codec::{Decode, Encode};
 use sp_std::{cmp::Ordering, vec::Vec};
 
 pub struct Formatter;

client/bifrost/evm-tracing/src/types/block.rs

@@ -3,8 +3,8 @@
 use super::serialization::*;
 use serde::Serialize;
 
-use codec::{Decode, Encode};
 use ethereum_types::{H160, H256, U256};
+use parity_scale_codec::{Decode, Encode};
 use sp_std::vec::Vec;
 
 #[derive(Clone, Eq, PartialEq, Debug, Encode, Decode, Serialize)]

client/bifrost/evm-tracing/src/types/mod.rs

@@ -2,8 +2,8 @@
 
 extern crate alloc;
 
-use codec::{Decode, Encode};
 use ethereum_types::{H160, H256};
+use parity_scale_codec::{Decode, Encode};
 use sp_std::vec::Vec;
 
 pub mod block;

client/bifrost/evm-tracing/src/types/single.rs

@@ -6,8 +6,8 @@
 use super::serialization::*;
 use serde::Serialize;
 
-use codec::{Decode, Encode};
 use ethereum_types::{H256, U256};
+use parity_scale_codec::{Decode, Encode};
 use sp_std::{collections::btree_map::BTreeMap, vec::Vec};
 
 #[derive(Clone, Eq, PartialEq, Debug, Encode, Decode, Serialize)]

client/bifrost/rpc-core/debug/Cargo.toml

@@ -2,18 +2,21 @@
 name = "fc-rpc-core-debug"
 authors = ["bifrost-platform"]
 edition = "2021"
-homepage = "https://thebifrost.io"
+homepage = "https://www.bifrostnetwork.com"
 license = "Apache-2.0"
 repository = "https://github.com/bifrost-platform/bifrost-frontier"
 version = "0.1.0"
 
 [dependencies]
-ethereum-types = { version = "0.14", features = ["std"] }
-fc-evm-tracing = { workspace = true }
-fc-rpc-core-types = { workspace = true }
-futures = { version = "0.3.21", features = ["compat"] }
-jsonrpsee = { version = "0.16.2", default-features = false, features = ["macros", "server"] }
-serde = { version = "1.0.101", features = ["derive"] }
-serde_json = { version = "1.0" }
+ethereum-types = { workspace = true, features = ["std"] }
+futures = { workspace = true, features = ["compat"] }
+jsonrpsee = { workspace = true, features = ["macros", "server"] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 
+# Substrate
 sp-core = { workspace = true, features = ["std"] }
+
+# Frontier
+fc-evm-tracing = { workspace = true }
+fc-rpc-core-types = { workspace = true }

client/bifrost/rpc-core/trace/Cargo.toml

@@ -1,17 +1,19 @@
 [package]
 name = "fc-rpc-core-trace"
-authors = [ "bifrost-platform" ]
+authors = ["bifrost-platform"]
 edition = "2021"
-homepage = "https://thebifrost.io"
+homepage = "https://www.bifrostnetwork.com"
 license = "Apache-2.0"
 repository = "https://github.com/bifrost-platform/bifrost-frontier"
 version = "0.6.0"
 
 [dependencies]
-ethereum-types = "0.14"
-futures = { version = "0.3.1", features = [ "compat" ] }
-jsonrpsee = { version = "0.16.2", default-features = false, features = [ "macros", "server" ] }
+ethereum-types = { workspace = true, features = ["std"] }
+futures = { workspace = true, features = ["compat"] }
+jsonrpsee = { workspace = true, features = ["macros", "server"] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+
+# Frontier
 fc-evm-tracing = { workspace = true }
 fc-rpc-core-types = { workspace = true }
-serde = { version = "1.0", features = [ "derive" ] }
-serde_json = "1.0"

client/bifrost/rpc-core/txpool/Cargo.toml

@@ -1,17 +1,18 @@
 [package]
 name = "fc-rpc-core-txpool"
-authors = [ "bifrost-platform" ]
+authors = ["bifrost-platform"]
 edition = "2021"
-homepage = "https://thebifrost.io"
+homepage = "https://www.bifrostnetwork.com"
 license = "Apache-2.0"
 repository = "https://github.com/bifrost-platform/bifrost-frontier"
 version = "0.6.0"
 
 [dependencies]
-ethereum = { version = "0.14.0", default-features = false, features = [ "with-codec" ] }
-ethereum-types = "0.14"
-jsonrpsee = { version = "0.16.2", default-features = false, features = [ "macros", "server" ] }
-serde = { version = "1.0", features = [ "derive" ] }
-serde_json = "1.0"
+ethereum = { workspace = true, features = ["std", "with-codec"] }
+ethereum-types = { workspace = true, features = ["std"] }
+jsonrpsee = { workspace = true, features = ["macros", "server"] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 
-fc-rpc-core = { workspace = true }
+# Frontier
+fc-rpc-core = { workspace = true }

client/bifrost/rpc-core/types/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "fc-rpc-core-types"
-authors = [ "bifrost-platform" ]
+authors = ["bifrost-platform"]
 edition = "2021"
-homepage = "https://thebifrost.io"
+homepage = "https://www.bifrostnetwork.com"
 license = "Apache-2.0"
 repository = "https://github.com/bifrost-platform/bifrost-frontier"
 version = "0.1.0"
 
 [dependencies]
-ethereum-types = "0.14"
-serde = { version = "1.0", features = [ "derive" ] }
-serde_json = "1.0"
+ethereum-types = { workspace = true, features = ["std"] }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }

client/bifrost/rpc/debug/Cargo.toml

@@ -2,18 +2,18 @@
 name = "fc-rpc-debug"
 authors = ["bifrost-platform"]
 edition = "2021"
-homepage = "https://thebifrost.io"
+homepage = "https://www.bifrostnetwork.com"
 license = "Apache-2.0"
 repository = "https://github.com/bifrost-platform/bifrost-frontier"
 version = "0.1.0"
 
 [dependencies]
-futures = { version = "0.3.21", features = ["compat"] }
-hex-literal = "0.3.4"
-jsonrpsee = { version = "0.16.2", features = ["macros", "server"] }
-tokio = { version = "1.13", features = ["sync", "time"] }
+futures = { workspace = true, features = ["compat"] }
+hex-literal = { workspace = true }
+jsonrpsee = { workspace = true, features = ["macros", "server"] }
+tokio = { workspace = true, features = ["sync", "time"] }
 
-# BIFROST
+# Bifrost
 fc-evm-tracing = { workspace = true }
 fc-rpc-core-debug = { workspace = true }
 fc-rpc-core-types = { workspace = true }
@@ -30,8 +30,8 @@ sp-io = { workspace = true, features = ["std"] }
 sp-runtime = { workspace = true, features = ["std"] }
 
 # Frontier
-ethereum = { version = "0.14.0", default-features = false, features = ["std", "with-codec"] }
-ethereum-types = { version = "0.14", features = ["std"] }
+ethereum = { workspace = true, features = ["std", "with-codec"] }
+ethereum-types = { workspace = true, features = ["std"] }
 fc-consensus = { workspace = true }
 fc-db = { workspace = true }
 fc-rpc = { workspace = true, features = ["rpc-binary-search-estimate"] }

client/bifrost/rpc/trace/Cargo.toml

@@ -2,22 +2,21 @@
 name = "fc-rpc-trace"
 authors = ["bifrost-platform"]
 edition = "2021"
-homepage = "https://thebifrost.io"
+homepage = "https://www.bifrostnetwork.com"
 license = "Apache-2.0"
 repository = "https://github.com/bifrost-platform/bifrost-frontier"
 version = "0.6.0"
 
 [dependencies]
-ethereum = { version = "0.14.0", features = ["with-codec"] }
-ethereum-types = "0.14"
-futures = { version = "0.3" }
-jsonrpsee = { version = "0.16.2", default-features = false, features = ["macros", "server"] }
+ethereum = { workspace = true, features = ["with-codec"] }
+ethereum-types = { workspace = true }
+futures = { workspace = true }
+jsonrpsee = { workspace = true, features = ["macros", "server"] }
 log = { workspace = true }
-serde = { version = "1.0", features = ["derive"] }
-sha3 = "0.10"
-substrate-prometheus-endpoint = { workspace = true }
-tokio = { version = "1.10", features = ["sync", "time"] }
-tracing = "0.1.34"
+serde = { workspace = true, features = ["derive"] }
+sha3 = { workspace = true }
+tokio = { workspace = true, features = ["sync", "time"] }
+tracing = { workspace = true }
 
 fc-evm-tracing = { workspace = true }
 fc-rpc-core-trace = { workspace = true }
@@ -35,6 +34,7 @@ sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 sp-transaction-pool = { workspace = true }
+substrate-prometheus-endpoint = { workspace = true }
 
 # Frontier
 fc-consensus = { workspace = true }

client/bifrost/rpc/txpool/Cargo.toml

@@ -1,20 +1,20 @@
 [package]
 name = "fc-rpc-txpool"
-authors = [ "bifrost-platform" ]
+authors = ["bifrost-platform"]
 edition = "2021"
-homepage = "https://thebifrost.io"
+homepage = "https://www.bifrostnetwork.com"
 license = "Apache-2.0"
 repository = "https://github.com/bifrost-platform/bifrost-frontier"
 version = "0.6.0"
 
 [dependencies]
-jsonrpsee = { version = "0.16.2", default-features = false, features = [ "macros", "server" ] }
-rlp = "0.5"
-serde = { version = "1.0", features = [ "derive" ] }
-sha3 = "0.10"
+jsonrpsee = { workspace = true, features = ["macros", "server"] }
+rlp = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+sha3 = { workspace = true }
 
 fc-rpc-core-txpool = { workspace = true }
-fp-rpc-txpool = { workspace = true }
+fp-rpc-txpool = { workspace = true, features = ["std"] }
 
 # Substrate
 frame-system = { workspace = true }
@@ -27,5 +27,5 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 # Frontier
-ethereum-types = "0.14"
-fc-rpc = { workspace = true, features = [ "rpc-binary-search-estimate" ] }
+ethereum-types = { workspace = true, features = ["std"] }
+fc-rpc = { workspace = true, features = ["rpc-binary-search-estimate"] }

primitives/bifrost/ext/Cargo.toml

@@ -1,31 +1,31 @@
 [package]
 name = "fp-ext"
-authors = [ "bifrost-platform" ]
+authors = ["bifrost-platform"]
 edition = "2021"
-homepage = "https://thebifrost.io"
+homepage = "https://www.bifrostnetwork.com"
 license = "Apache-2.0"
 repository = "https://github.com/bifrost-platform/bifrost-frontier"
 version = "0.1.0"
 
 [dependencies]
-ethereum-types = { version = "0.14", default-features = false }
+ethereum-types = { workspace = true }
 
-# BIFROST
+# Frontier
 fp-rpc-evm-tracing-events = { workspace = true }
 
 # Substrate
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
+parity-scale-codec = { workspace = true }
 sp-externalities = { workspace = true }
 sp-runtime-interface = { workspace = true }
 sp-std = { workspace = true }
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
-	"codec/std",
+	"parity-scale-codec/std",
 	"ethereum-types/std",
 	"fp-rpc-evm-tracing-events/std",
 	"sp-externalities/std",
 	"sp-runtime-interface/std",
 	"sp-std/std",
-]
+]

primitives/bifrost/ext/src/lib.rs

@@ -9,7 +9,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 use sp_runtime_interface::runtime_interface;
 
-use codec::Decode;
+use parity_scale_codec::Decode;
 use sp_std::vec::Vec;
 
 use fp_rpc_evm_tracing_events::{Event, EvmEvent, GasometerEvent, RuntimeEvent, StepEventFilter};