Skip to content

Commit a6ca0a7

Browse files
authored
(fix): remove the noncemaanger from eth-spout (#698)
1 parent 3687abd commit a6ca0a7

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

products/eth-spout/src/main.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use askama::Template;
1111
use axum::{extract::State, routing::get, Form, Router};
1212
use bech32::Hrp;
1313
use ethers::{
14-
middleware::{nonce_manager::NonceManagerError, NonceManagerMiddleware, SignerMiddleware},
14+
middleware::{signer::SignerMiddlewareError, SignerMiddleware},
1515
providers::{Http, Middleware, Provider},
1616
signers::LocalWallet,
1717
types::{Address, TransactionRequest, H256},
@@ -34,13 +34,13 @@ struct Home {
3434
enum RequestStatus {
3535
Sent(H256),
3636
AddrErr(anyhow::Error),
37-
SendErr(NonceManagerError<SignerMiddleware<Provider<Http>, LocalWallet>>),
37+
SendErr(SignerMiddlewareError<Provider<Http>, LocalWallet>),
3838
RateLimitErr(Duration),
3939
}
4040

4141
async fn home_inner(State(state): State<Arc<AppState>>, status: Option<RequestStatus>) -> Home {
4242
Home {
43-
from_addr: to_checksum(&state.provider.inner().address(), None),
43+
from_addr: to_checksum(&state.provider.address(), None),
4444
native_token_symbol: state.config.native_token_symbol.clone(),
4545
amount: state.config.eth_amount.clone(),
4646
explorer_url: state.config.explorer_url.clone(),
@@ -210,7 +210,7 @@ impl Config {
210210
}
211211

212212
struct AppState {
213-
provider: NonceManagerMiddleware<SignerMiddleware<Provider<Http>, LocalWallet>>,
213+
provider: SignerMiddleware<Provider<Http>, LocalWallet>,
214214
config: Config,
215215
last_request: Mutex<HashMap<Address, Instant>>,
216216
}
@@ -222,8 +222,6 @@ async fn main() -> Result<()> {
222222
let provider = Provider::try_from(&config.rpc_url)?;
223223
let wallet: LocalWallet = config.private_key.parse()?;
224224
let provider = SignerMiddleware::new_with_provider_chain(provider, wallet).await?;
225-
let address = provider.address();
226-
let provider = NonceManagerMiddleware::new(provider, address);
227225

228226
let addr = ("0.0.0.0".parse::<IpAddr>()?, config.http_port);
229227
let state = Arc::new(AppState {

0 commit comments

Comments
 (0)