diff --git a/bin/collator/src/rpc.rs b/bin/collator/src/rpc.rs index 04d86c97a3..d2302bc91e 100644 --- a/bin/collator/src/rpc.rs +++ b/bin/collator/src/rpc.rs @@ -48,7 +48,7 @@ use moonbeam_rpc_debug::{Debug, DebugServer}; use moonbeam_rpc_trace::{Trace, TraceServer}; // TODO: get rid of this completely now that it's part of frontier? #[cfg(feature = "evm-tracing")] -use moonbeam_rpc_txpool::{TxPool, TxPoolServer}; +use moonbeam_rpc_txpool::{TxPool as MoonbeamTxPool, TxPoolServer}; use astar_primitives::*; @@ -144,8 +144,8 @@ where C: sc_client_api::BlockBackend, C::Api: substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi - + ConvertTransactionRuntimeApi - + EthereumRuntimeRPCApi + + fp_rpc::ConvertTransactionRuntimeApi + + fp_rpc::EthereumRuntimeRPCApi + BlockBuilder + moonbeam_rpc_primitives_debug::DebugRuntimeApi + moonbeam_rpc_primitives_txpool::TxPoolRuntimeApi, @@ -161,7 +161,7 @@ where let mut io = create_full_rpc(deps, subscription_task_executor, pubsub_notification_sinks)?; if tracing_config.enable_txpool { - io.merge(TxPool::new(Arc::clone(&client), graph).into_rpc())?; + io.merge(MoonbeamTxPool::new(Arc::clone(&client), graph).into_rpc())?; } if let Some(trace_filter_requester) = tracing_config.tracing_requesters.trace { diff --git a/bin/collator/src/rpc/tracing.rs b/bin/collator/src/rpc/tracing.rs index 93e6a210f2..038d92403f 100644 --- a/bin/collator/src/rpc/tracing.rs +++ b/bin/collator/src/rpc/tracing.rs @@ -46,7 +46,7 @@ pub struct SpawnTasksParams<'a, B: BlockT, C, BE> { pub task_manager: &'a TaskManager, pub client: Arc, pub substrate_backend: Arc, - pub frontier_backend: Arc>, + pub frontier_backend: Arc + Send + Sync>, pub filter_pool: Option, pub overrides: Arc>, }