@@ -11,7 +11,7 @@ use askama::Template;
11
11
use axum:: { extract:: State , routing:: get, Form , Router } ;
12
12
use bech32:: Hrp ;
13
13
use ethers:: {
14
- middleware:: { nonce_manager :: NonceManagerError , NonceManagerMiddleware , SignerMiddleware } ,
14
+ middleware:: { signer :: SignerMiddlewareError , SignerMiddleware } ,
15
15
providers:: { Http , Middleware , Provider } ,
16
16
signers:: LocalWallet ,
17
17
types:: { Address , TransactionRequest , H256 } ,
@@ -34,13 +34,13 @@ struct Home {
34
34
enum RequestStatus {
35
35
Sent ( H256 ) ,
36
36
AddrErr ( anyhow:: Error ) ,
37
- SendErr ( NonceManagerError < SignerMiddleware < Provider < Http > , LocalWallet > > ) ,
37
+ SendErr ( SignerMiddlewareError < Provider < Http > , LocalWallet > ) ,
38
38
RateLimitErr ( Duration ) ,
39
39
}
40
40
41
41
async fn home_inner ( State ( state) : State < Arc < AppState > > , status : Option < RequestStatus > ) -> Home {
42
42
Home {
43
- from_addr : to_checksum ( & state. provider . inner ( ) . address ( ) , None ) ,
43
+ from_addr : to_checksum ( & state. provider . address ( ) , None ) ,
44
44
native_token_symbol : state. config . native_token_symbol . clone ( ) ,
45
45
amount : state. config . eth_amount . clone ( ) ,
46
46
explorer_url : state. config . explorer_url . clone ( ) ,
@@ -210,7 +210,7 @@ impl Config {
210
210
}
211
211
212
212
struct AppState {
213
- provider : NonceManagerMiddleware < SignerMiddleware < Provider < Http > , LocalWallet > > ,
213
+ provider : SignerMiddleware < Provider < Http > , LocalWallet > ,
214
214
config : Config ,
215
215
last_request : Mutex < HashMap < Address , Instant > > ,
216
216
}
@@ -222,8 +222,6 @@ async fn main() -> Result<()> {
222
222
let provider = Provider :: try_from ( & config. rpc_url ) ?;
223
223
let wallet: LocalWallet = config. private_key . parse ( ) ?;
224
224
let provider = SignerMiddleware :: new_with_provider_chain ( provider, wallet) . await ?;
225
- let address = provider. address ( ) ;
226
- let provider = NonceManagerMiddleware :: new ( provider, address) ;
227
225
228
226
let addr = ( "0.0.0.0" . parse :: < IpAddr > ( ) ?, config. http_port ) ;
229
227
let state = Arc :: new ( AppState {
0 commit comments