Update provider to use NonceManagerMiddleware

Author: hpmaxi

core/src/deployer.rs

@@ -11,7 +11,9 @@ pub async fn deploy_oapp_contract(
     chain_client: &ChainClient,
 ) -> Result<Address> {
     let endpoint_address = chain.endpoint_address();
-    let delegator_address = chain_client.address();
+
+    let underlying_signer = chain_client.inner(); // returns &SignerMiddleware<Provider<Http>, LocalWallet>
+    let delegator_address = underlying_signer.signer().address();
 
     let deployed = MyOApp::deploy(chain_client.clone(), (endpoint_address, delegator_address))
         .map_err(|e| {

core/src/layer_zero.rs

@@ -64,7 +64,9 @@ pub async fn setup_peer_connections(
 
                 // oapp_contract
                 println!("Set peer for {} with value {}", chain_i, eid);
-                oapp_contract.set_peer(eid, peer_addr).send().await?;
+                let call = oapp_contract.set_peer(eid, peer_addr);
+                let _pending_tx = call.send().await?;
+                // pending_tx.confirmations(1).await?; // using nonce manager
             }
         }
     }
@@ -120,7 +122,9 @@ pub async fn send_cross_chain_message(
         .send(eid, message, adapter_params)
         .value(native_fee);
 
-    let tx_hash = tx.send().await?.tx_hash();
+    let receipt = tx.send().await?;
+    let tx_hash = receipt.tx_hash();
+    // receipt.confirmations(1).await?; // using nonce manager
 
     println!(
         "Message sent from {} to {}. Transaction hash: {:?}",
@@ -134,6 +138,7 @@ pub async fn send_cross_chain_message(
     Ok(tx_hash)
 }
 
+// TODO Is possible to parallelize this function but only for a given source chain fixed
 pub async fn send_messages_to_all_chains(
     deployer: &LocalWallet,
     addresses: &HashMap<SupportedChain, H160>,

core/src/provider.rs

@@ -1,5 +1,5 @@
 use dotenvy;
-use ethers::middleware::SignerMiddleware;
+use ethers::middleware::{NonceManagerMiddleware, SignerMiddleware};
 use ethers::providers::{Http, Middleware, Provider};
 use ethers::signers::{LocalWallet, Signer};
 use foundry_config::{Config, RpcEndpoint};
@@ -11,15 +11,14 @@ use crate::chain::SupportedChain;
 
 pub type ProviderHttp = Provider<Http>;
 pub type WalletLocal = LocalWallet;
-pub type ChainMiddleware = SignerMiddleware<ProviderHttp, WalletLocal>;
+pub type ChainMiddleware = NonceManagerMiddleware<SignerMiddleware<ProviderHttp, WalletLocal>>;
 pub type ChainClient = Arc<ChainMiddleware>;
 
 pub fn get_rpc_endpoints_from_foundry_config()
 -> anyhow::Result<HashMap<SupportedChain, RpcEndpoint>> {
     dotenvy::dotenv().ok(); // load .env
 
     let config = Config::load();
-    println!("Config {:?}", config);
 
     let mut rpc_endpoints = HashMap::new();
     for (alias, endpoint) in config.rpc_endpoints.iter() {
@@ -48,9 +47,11 @@ pub async fn build_chain_clients(
 
         let chain_id = provider.get_chainid().await?.as_u64();
 
-        let signer_middleware =
-            SignerMiddleware::new(provider, wallet.clone().with_chain_id(chain_id));
-        let arc_client = Arc::new(signer_middleware);
+        let signer = SignerMiddleware::new(provider, wallet.clone().with_chain_id(chain_id));
+        let address = signer.address();
+        let nonce_manager = NonceManagerMiddleware::new(signer, address);
+
+        let arc_client = Arc::new(nonce_manager);
 
         clients.insert(alias.clone(), arc_client);
     }