github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-09 15:28:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore(rpc-eth-types): use FillTransaction from alloy (#19890)

Browse Source
This commit is contained in:
Mablr
2025-11-21 16:52:28 +01:00
committed by GitHub
parent 002e755dd4
commit b0494a158a
6 changed files with 96 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/rpc/rpc-eth-api/src/core.rs
View File

@@ -18,7 +18,7 @@ use alloy_serde::JsonStorageKey;
use jsonrpsee::{core::RpcResult, proc_macros::rpc};
use reth_primitives_traits::TxTy;
use reth_rpc_convert::RpcTxReq;
use reth_rpc_eth_types::FillTransactionResult;
use reth_rpc_eth_types::FillTransaction;
use reth_rpc_server_types::{result::internal_rpc_err, ToRpcResult};
use tracing::trace;
@@ -242,7 +242,7 @@ pub trait EthApi<
/// Fills the defaults on a given unsigned transaction.
#[method(name = "fillTransaction")]
async fn fill_transaction(&self, request: TxReq) -> RpcResult<FillTransactionResult<RawTx>>;
async fn fill_transaction(&self, request: TxReq) -> RpcResult<FillTransaction<RawTx>>;
/// Simulate arbitrary number of transactions at an arbitrary blockchain index, with the
/// optionality of state overrides
@@ -703,7 +703,7 @@ where
async fn fill_transaction(
&self,
request: RpcTxReq<T::NetworkTypes>,
) -> RpcResult<FillTransactionResult<TxTy<T::Primitives>>> {
) -> RpcResult<FillTransaction<TxTy<T::Primitives>>> {
trace!(target: "rpc::eth", ?request, "Serving eth_fillTransaction");
Ok(EthTransactions::fill_transaction(self, request).await?)
}

6
crates/rpc/rpc-eth-api/src/helpers/transaction.rs
View File

@@ -24,7 +24,7 @@ use reth_rpc_convert::{transaction::RpcConvert, RpcTxReq};
use reth_rpc_eth_types::{
utils::{binary_search, recover_raw_transaction},
EthApiError::{self, TransactionConfirmationTimeout},
FillTransactionResult, SignError, TransactionSource,
FillTransaction, SignError, TransactionSource,
};
use reth_storage_api::{
BlockNumReader, BlockReaderIdExt, ProviderBlock, ProviderReceipt, ProviderTx, ReceiptProvider,
@@ -450,7 +450,7 @@ pub trait EthTransactions: LoadTransaction<Provider: BlockReaderIdExt> {
fn fill_transaction(
&self,
mut request: RpcTxReq<Self::NetworkTypes>,
) -> impl Future<Output = Result<FillTransactionResult<TxTy<Self::Primitives>>, Self::Error>> + Send
) -> impl Future<Output = Result<FillTransaction<TxTy<Self::Primitives>>, Self::Error>> + Send
where
Self: EthApiSpec + LoadBlock + EstimateCall + LoadFee,
{
@@ -511,7 +511,7 @@ pub trait EthTransactions: LoadTransaction<Provider: BlockReaderIdExt> {
let raw = tx.encoded_2718().into();
Ok(FillTransactionResult { raw, tx })
Ok(FillTransaction { raw, tx })
}
}