feat: resync nonce before each batch

omni-relayer/src/utils/nonce.rs

@@ -43,6 +43,17 @@ impl NonceManager {
         }
     }
 
+    pub async fn resync_nonce(&self) -> Result<()> {
+        let current_nonce = self.get_current_nonce().await?;
+        let mut local_nonce = self
+            .nonce
+            .lock()
+            .map_err(|_| anyhow::anyhow!("Mutex lock error during nonce update"))?;
+        *local_nonce = current_nonce;
+
+        Ok(())
+    }
+
     pub async fn reserve_nonce(&self) -> Result<u64> {
         let current_nonce = self.get_current_nonce().await?;
 
@@ -151,6 +162,20 @@ impl EvmNonceManagers {
         }
     }
 
+    pub async fn resync_nonces(&self) -> Result<()> {
+        if let Some(eth) = self.eth.as_ref() {
+            eth.resync_nonce().await?;
+        }
+        if let Some(base) = self.base.as_ref() {
+            base.resync_nonce().await?;
+        }
+        if let Some(arb) = self.arb.as_ref() {
+            arb.resync_nonce().await?;
+        }
+
+        Ok(())
+    }
+
     pub async fn reserve_nonce(&self, chain_kind: ChainKind) -> Result<u64> {
         match chain_kind {
             ChainKind::Eth => {

omni-relayer/src/workers/evm.rs

@@ -51,6 +51,10 @@ pub async fn finalize_transfer(
             continue;
         };
 
+        if let Err(err) = near_nonce.resync_nonce().await {
+            warn!("Failed to resync nonce: {}", err);
+        }
+
         let mut handlers = Vec::new();
 
         for (key, event) in events {

omni-relayer/src/workers/near.rs

@@ -56,7 +56,12 @@ pub async fn sign_transfer(
             continue;
         };
 
+        if let Err(err) = near_nonce.resync_nonce().await {
+            warn!("Failed to resync nonce: {}", err);
+        }
+
         let mut handlers = Vec::new();
+
         for (key, event) in events {
             if let Ok(init_transfer_with_timestamp) =
                 serde_json::from_str::<InitTransferWithTimestamp>(&event)
@@ -228,7 +233,12 @@ pub async fn finalize_transfer(
             continue;
         };
 
+        if let Err(err) = evm_nonces.resync_nonces().await {
+            warn!("Failed to resync nonces: {}", err);
+        }
+
         let mut handlers = Vec::new();
+
         for (key, event) in events {
             if let Ok(event) = serde_json::from_str::<OmniBridgeEvent>(&event) {
                 handlers.push(tokio::spawn({
@@ -417,6 +427,10 @@ pub async fn claim_fee(
             continue;
         };
 
+        if let Err(err) = near_nonce.resync_nonce().await {
+            warn!("Failed to resync nonce: {}", err);
+        }
+
         let mut handlers = Vec::new();
 
         for (key, event) in events {
@@ -686,6 +700,10 @@ pub async fn bind_token(
             continue;
         };
 
+        if let Err(err) = near_nonce.resync_nonce().await {
+            warn!("Failed to resync nonce: {}", err);
+        }
+
         let mut handlers = Vec::new();
 
         for (key, event) in events {

omni-relayer/src/workers/solana.rs

@@ -151,6 +151,10 @@ pub async fn finalize_transfer(
             continue;
         };
 
+        if let Err(err) = near_nonce.resync_nonce().await {
+            warn!("Failed to resync nonce: {}", err);
+        }
+
         let mut handlers = Vec::new();
 
         for (key, event) in events {