chore : cleanup

Author: 1xstj

Cargo.lock

@@ -351,7 +351,7 @@ signature = { version = "2.2", default-features = false }
 # EVM & Ethereum
 # (wasm)
 ethereum-types = { version = "0.14.1", default-features = false }
-ethereum = { version = "0.15.0", default-features = false, features = ["with-codec"] }
+ethereum = { version = "0.18.2", default-features = false, features = ["with-scale"] }
 evm = { version = "0.41.1", default-features = false }
 evm-gasometer = { version = "0.41.0", default-features = false }
 evm-runtime = { version = "0.41.0", default-features = false }
@@ -415,3 +415,5 @@ subxt-signer = { version = "0.39.0", default-features = false }
 
 [profile.release]
 panic = "unwind"
+
+

Cargo.toml

@@ -7,7 +7,7 @@ license = "GPL-3.0-only"
 repository = { workspace = true }
 
 [dependencies]
-ethereum = { workspace = true, features = [ "with-codec" ] }
+ethereum = { workspace = true, features = [ "with-scale" ] }
 ethereum-types = { workspace = true, features = [ "std" ] }
 futures = { workspace = true, features = [ "compat" ] }
 jsonrpsee = { workspace = true, features = [ "macros", "server" ] }

client/rpc-core/debug/Cargo.toml

@@ -7,7 +7,7 @@ license = "GPL-3.0-only"
 repository = { workspace = true }
 
 [dependencies]
-ethereum = { workspace = true, features = ["std", "with-codec"] }
+ethereum = { workspace = true, features = ["std", "with-scale"] }
 ethereum-types = { workspace = true, features = ["std"] }
 jsonrpsee = { workspace = true, features = ["macros", "server"] }
 serde = { workspace = true, features = ["derive"] }

client/rpc-core/txpool/Cargo.toml

@@ -28,7 +28,7 @@ sp-io = { workspace = true, features = ["std"] }
 sp-runtime = { workspace = true, features = ["std"] }
 
 # Frontier
-ethereum = { workspace = true, features = ["std", "with-codec"] }
+ethereum = { workspace = true, features = ["std", "with-scale"] }
 ethereum-types = { workspace = true, features = ["std"] }
 fc-db = { workspace = true }
 fc-rpc = { workspace = true, features = ["rpc-binary-search-estimate"] }

client/rpc/debug/Cargo.toml

@@ -23,5 +23,5 @@ sp-blockchain = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Frontier
-ethereum-types = { workspace = true, features = ["std"] }
+ethereum-types = { workspace = true, features = ["std", "serialize"] }
 fc-rpc = { workspace = true }

client/rpc/txpool/Cargo.toml

@@ -19,8 +19,8 @@ use ethereum_types::{H160, H256, U256};
 use fc_rpc::{internal_err, public_key};
 use jsonrpsee::core::RpcResult;
 pub use rpc_core_txpool::{GetT, Summary, Transaction, TransactionMap, TxPoolResult, TxPoolServer};
-use sc_transaction_pool::{ChainApi, Pool};
-use sc_transaction_pool_api::InPoolTransaction;
+use sc_transaction_pool::ChainApi;
+use sc_transaction_pool_api::TransactionPool as _;
 use serde::Serialize;
 use sha3::{Digest, Keccak256};
 use sp_api::{ApiExt, ProvideRuntimeApi};
@@ -30,19 +30,19 @@ use std::{marker::PhantomData, sync::Arc};
 
 use rpc_primitives_txpool::{Transaction as TransactionV2, TxPoolResponse, TxPoolRuntimeApi};
 
-pub struct TxPool<B: BlockT, C, A: ChainApi> {
+pub struct TxPool<B: BlockT, C, P> {
 	client: Arc<C>,
-	graph: Arc<Pool<A>>,
+	pool: Arc<P>,
 	_marker: PhantomData<B>,
 }
 
-impl<B, C, A> TxPool<B, C, A>
+impl<B, C, P> TxPool<B, C, P>
 where
 	C: ProvideRuntimeApi<B>,
 	C: HeaderMetadata<B, Error = BlockChainError> + HeaderBackend<B> + 'static,
 	C: Send + Sync + 'static,
 	B: BlockT<Hash = H256> + Send + Sync + 'static,
-	A: ChainApi<Block = B> + 'static,
+	P: sc_transaction_pool_api::TransactionPool<Block = B> + 'static,
 	C::Api: TxPoolRuntimeApi<B>,
 {
 	/// Use the transaction graph interface to get the extrinsics currently in the ready and future
@@ -53,19 +53,17 @@ where
 	{
 		// Collect transactions in the ready validated pool.
 		let txs_ready = self
-			.graph
-			.validated_pool()
+			.pool
 			.ready()
-			.map(|in_pool_tx| in_pool_tx.data().clone())
+			.map(|in_pool_tx| (**in_pool_tx.data()).clone())
 			.collect();
 
 		// Collect transactions in the future validated pool.
 		let txs_future = self
-			.graph
-			.validated_pool()
+			.pool
 			.futures()
-			.iter()
-			.map(|(_hash, extrinsic)| extrinsic.clone())
+			.into_iter()
+			.map(|in_pool_tx| (**in_pool_tx.data()).clone())
 			.collect();
 
 		// Use the runtime to match the (here) opaque extrinsics against ethereum transactions.
@@ -131,19 +129,19 @@ where
 	}
 }
 
-impl<B: BlockT, C, A: ChainApi> TxPool<B, C, A> {
-	pub fn new(client: Arc<C>, graph: Arc<Pool<A>>) -> Self {
-		Self { client, graph, _marker: PhantomData }
+impl<B: BlockT, C, P> TxPool<B, C, P> {
+	pub fn new(client: Arc<C>, pool: Arc<P>) -> Self {
+		Self { client, pool, _marker: PhantomData }
 	}
 }
 
-impl<B, C, A> TxPoolServer for TxPool<B, C, A>
+impl<B, C, P> TxPoolServer for TxPool<B, C, P>
 where
 	C: ProvideRuntimeApi<B>,
 	C: HeaderMetadata<B, Error = BlockChainError> + HeaderBackend<B>,
 	C: Send + Sync + 'static,
 	B: BlockT<Hash = H256> + Send + Sync + 'static,
-	A: ChainApi<Block = B> + 'static,
+	P: sc_transaction_pool_api::TransactionPool<Block = B> + 'static,
 	C::Api: TxPoolRuntimeApi<B>,
 {
 	fn content(&self) -> RpcResult<TxPoolResult<TransactionMap<Transaction>>> {
@@ -155,13 +153,13 @@ where
 	}
 
 	fn status(&self) -> RpcResult<TxPoolResult<U256>> {
-		let status = self.graph.validated_pool().status();
+		let status = self.pool.status();
 		Ok(TxPoolResult { pending: U256::from(status.ready), queued: U256::from(status.future) })
 	}
 }
 
-impl<B: BlockT, C, A: ChainApi> Clone for TxPool<B, C, A> {
+impl<B: BlockT, C, P> Clone for TxPool<B, C, P> {
 	fn clone(&self) -> Self {
-		Self::new(self.client.clone(), self.graph.clone())
+		Self::new(self.client.clone(), self.pool.clone())
 	}
 }

client/rpc/txpool/src/lib.rs

@@ -28,7 +28,7 @@ serde = { workspace = true, features = ["derive"], optional = true }
 hex = { workspace = true, features = ["alloc"] }
 
 # Optional dependencies for fuzzing
-ethereum = { workspace = true, features = ["with-codec"], optional = true }
+ethereum = { workspace = true, features = ["with-scale"], optional = true }
 ethers = { version = "2.0", optional = true }
 num_enum = { workspace = true, optional = true }
 hex-literal = { workspace = true, optional = true }
@@ -66,7 +66,7 @@ pallet-proxy = { workspace = true, optional = true }
 pallet-utility = { workspace = true, optional = true }
 
 [dev-dependencies]
-ethereum = { workspace = true, features = ["with-codec"] }
+ethereum = { workspace = true, features = ["with-scale"] }
 ethers = "2.0"
 num_enum = { workspace = true }
 hex-literal = { workspace = true }

pallets/multi-asset-delegation/Cargo.toml

@@ -29,7 +29,7 @@ hex = { workspace = true, features = ["alloc"] }
 pallet-multi-asset-delegation = { workspace = true, default-features = false, optional = true }
 
 [dev-dependencies]
-ethereum = { workspace = true, features = ["with-codec"] }
+ethereum = { workspace = true, features = ["with-scale"] }
 ethers = "2.0"
 num_enum = { workspace = true }
 hex-literal = { workspace = true }

pallets/rewards/Cargo.toml

@@ -27,7 +27,7 @@ hex = { workspace = true, features = ["alloc"] }
 k256 = { workspace = true }
 
 [dev-dependencies]
-ethereum = { workspace = true, features = ["with-codec"] }
+ethereum = { workspace = true, features = ["with-scale"] }
 hex = { workspace = true }
 num_enum = { workspace = true }
 hex-literal = { workspace = true }