Skip to content

Commit 41eeef6

Browse files
authored
fix: use next available nonce for tx (#61)
Depends on #60 Closes #39
1 parent 683237d commit 41eeef6

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

crates/wallet/src/lib.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use jsonrpsee::{
2929
use metrics::Counter;
3030
use metrics_derive::Metrics;
3131
use reth_primitives::{revm_primitives::Bytecode, BlockId};
32-
use reth_rpc_eth_api::helpers::{EthCall, EthState, EthTransactions, FullEthApi, LoadFee};
32+
use reth_rpc_eth_api::helpers::{EthCall, EthTransactions, FullEthApi, LoadFee, LoadState};
3333
use reth_storage_api::{StateProvider, StateProviderFactory};
3434
use serde::{Deserialize, Serialize};
3535
use std::sync::Arc;
@@ -273,17 +273,16 @@ where
273273
let _permit = self.inner.permit.lock().await;
274274

275275
// set nonce
276-
let tx_count = EthState::transaction_count(
276+
let next_nonce = LoadState::next_available_nonce(
277277
&self.inner.eth_api,
278278
NetworkWallet::<Ethereum>::default_signer_address(&self.inner.wallet),
279-
Some(BlockId::pending()),
280279
)
281280
.await
282281
.map_err(|err| {
283282
self.inner.metrics.invalid_send_transaction_calls.increment(1);
284283
err.into()
285284
})?;
286-
request.nonce = Some(tx_count.to());
285+
request.nonce = Some(next_nonce);
287286

288287
// set chain id
289288
request.chain_id = Some(self.chain_id());

0 commit comments

Comments
 (0)