jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

reafctor: improve tx count (#10889)

Browse Source 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
malik
2024-09-17 11:27:34 +01:00
committed by GitHub
parent c795389aae
commit abd4642d65
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
crates/rpc/rpc-eth-api/src/helpers/state.rs
View File

@ -269,25 +269,33 @@ pub trait LoadState: EthApiTypes {
Self: SpawnBlocking,
{
self.spawn_blocking_io(move |this| {
// first fetch the on chain nonce
let nonce = this
.state_at_block_id_or_latest(block_id)?
.account_nonce(address)
.map_err(Self::Error::from_eth_err)?
.unwrap_or_default();
if block_id == Some(BlockId::pending()) {
// for pending tag we need to find the highest nonce in the pool
let address_txs = this.pool().get_transactions_by_sender(address);
if let Some(highest_nonce) =
if let Some(highest_pool_nonce) =
address_txs.iter().map(|item| item.transaction.nonce()).max()
{
let tx_count = highest_nonce.checked_add(1).ok_or(Self::Error::from(
EthApiError::InvalidTransaction(RpcInvalidTransactionError::NonceMaxValue),
))?;
// and the corresponding txcount is nonce + 1
let next_nonce =
nonce.max(highest_pool_nonce).checked_add(1).ok_or_else(|| {
Self::Error::from(EthApiError::InvalidTransaction(
RpcInvalidTransactionError::NonceMaxValue,
))
})?;
let tx_count = nonce.max(next_nonce);
return Ok(U256::from(tx_count))
}
}
let state = this.state_at_block_id_or_latest(block_id)?;
Ok(U256::from(
state
.account_nonce(address)
.map_err(Self::Error::from_eth_err)?
.unwrap_or_default(),
))
Ok(U256::from(nonce))
})
}