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

fix: only +1 on the pool nonce (#11680)

Browse Source
This commit is contained in:
Matthias Seitz
2024-10-12 14:42:46 +02:00
committed by GitHub
parent 5c84daba11
commit 8ebf10b4ac
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,8 +284,8 @@ pub trait LoadState: EthApiTypes {
Self: SpawnBlocking,
{
self.spawn_blocking_io(move |this| {
// first fetch the on chain nonce
let nonce = this
// first fetch the on chain nonce of the account
let on_chain_account_nonce = this
.state_at_block_id_or_latest(block_id)?
.account_nonce(address)
.map_err(Self::Error::from_eth_err)?
@ -297,20 +297,24 @@ pub trait LoadState: EthApiTypes {
this.pool().get_highest_transaction_by_sender(address)
{
{
// and the corresponding txcount is nonce + 1
let next_nonce =
nonce.max(highest_pool_tx.nonce()).checked_add(1).ok_or_else(|| {
// and the corresponding txcount is nonce + 1 of the highest tx in the pool
// (on chain nonce is increased after tx)
let next_tx_nonce =
highest_pool_tx.nonce().checked_add(1).ok_or_else(|| {
Self::Error::from(EthApiError::InvalidTransaction(
RpcInvalidTransactionError::NonceMaxValue,
))
})?;
let tx_count = nonce.max(next_nonce);
// guard against drifts in the pool
let next_tx_nonce = on_chain_account_nonce.max(next_tx_nonce);
let tx_count = on_chain_account_nonce.max(next_tx_nonce);
return Ok(U256::from(tx_count));
}
}
}
Ok(U256::from(nonce))
Ok(U256::from(on_chain_account_nonce))
})
}