@atomiqlabs/chain-evm 1.0.0-dev.92 → 1.0.0-dev.94

package/dist/chains/botanix/BotanixInitializer.js

@@ -84,11 +84,10 @@ function initializeBotanix(options, bitcoinRpc, network) {
     const Fees = options.fees ?? new EVMFees_1.EVMFees(provider, 2n * 1000000000n, 1000000n);
     const chainInterface = new EVMChainInterface_1.EVMChainInterface("BOTANIX", chainId, provider, {
         safeBlockTag: "finalized",
-        maxLogsBlockRange: 950,
-        maxLogTopics: 64,
-        maxParallelLogRequests: 5,
-        maxParallelCalls: 5,
-        ...options?.evmConfig
+        maxLogsBlockRange: options?.evmConfig?.maxLogsBlockRange ?? 950,
+        maxLogTopics: options?.evmConfig?.maxLogTopics ?? 64,
+        maxParallelLogRequests: options?.evmConfig?.maxParallelLogRequests ?? 5,
+        maxParallelCalls: options?.evmConfig?.maxParallelCalls ?? 5
     }, options.retryPolicy, Fees);
     const btcRelay = new EVMBtcRelay_1.EVMBtcRelay(chainInterface, bitcoinRpc, network, options.btcRelayContract ?? defaultContractAddresses.btcRelayContract, options.btcRelayDeploymentHeight ?? defaultContractAddresses.btcRelayDeploymentHeight);
     const swapContract = new EVMSwapContract_1.EVMSwapContract(chainInterface, btcRelay, options.swapContract ?? defaultContractAddresses.swapContract, {

package/dist/chains/citrea/CitreaInitializer.js

@@ -90,11 +90,10 @@ function initializeCitrea(options, bitcoinRpc, network) {
     const Fees = options.fees ?? new CitreaFees_1.CitreaFees(provider, 2n * 1000000000n, 1000000n);
     const chainInterface = new EVMChainInterface_1.EVMChainInterface("CITREA", chainId, provider, {
         safeBlockTag: "latest",
-        maxLogsBlockRange: 950,
-        maxLogTopics: 64,
-        maxParallelLogRequests: 5,
-        maxParallelCalls: 5,
-        ...options?.evmConfig
+        maxLogsBlockRange: options?.evmConfig?.maxLogsBlockRange ?? 950,
+        maxLogTopics: options?.evmConfig?.maxLogTopics ?? 64,
+        maxParallelLogRequests: options?.evmConfig?.maxParallelLogRequests ?? 5,
+        maxParallelCalls: options?.evmConfig?.maxParallelCalls ?? 5
     }, options.retryPolicy, Fees);
     chainInterface.Tokens = new CitreaTokens_1.CitreaTokens(chainInterface); //Override with custom token module allowing l1 state diff based fee calculation
     const btcRelay = new CitreaBtcRelay_1.CitreaBtcRelay(chainInterface, bitcoinRpc, network, options.btcRelayContract ?? defaultContractAddresses.btcRelayContract, options.btcRelayDeploymentHeight ?? defaultContractAddresses.btcRelayDeploymentHeight);

package/dist/evm/chain/modules/EVMTransactions.js

@@ -32,15 +32,34 @@ class EVMTransactions extends EVMModule_1.EVMModule {
         this.onBeforeTxReplace(txReplaceListener);
         let state = "pending";
         let confirmedTxId = null;
-        while (state === "pending" || state === "not_found") {
+        while (state === "pending") {
             await (0, Utils_1.timeoutPromise)(3000, abortSignal);
+            const latestConfirmedNonce = this.latestConfirmedNonces[tx.from];
+            const snapshot = [...checkTxns]; //Iterate over a snapshot
+            const totalTxnCount = snapshot.length;
+            let notFoundTxns = 0;
             for (let txId of checkTxns) {
-                state = await this.getTxIdStatus(txId);
-                if (state === "reverted" || state === "success") {
+                let _state = await this.getTxIdStatus(txId);
+                if (_state === "not_found")
+                    notFoundTxns++;
+                if (_state === "reverted" || _state === "success") {
                     confirmedTxId = txId;
+                    state = _state;
                     break;
                 }
             }
+            if (notFoundTxns === totalTxnCount) { //All not found, check the latest account nonce
+                if (latestConfirmedNonce != null && latestConfirmedNonce > tx.nonce) {
+                    //Confirmed nonce is already higher than the TX nonce, meaning the TX got replaced
+                    throw new Error("Transaction failed - replaced!");
+                }
+                this.logger.warn("confirmTransaction(): All transactions not found, fetching the latest account nonce...");
+                const _latestConfirmedNonce = this.latestConfirmedNonces[tx.from];
+                const currentLatestNonce = await this.provider.getTransactionCount(tx.from, this.root.config.safeBlockTag);
+                if (_latestConfirmedNonce == null || _latestConfirmedNonce < currentLatestNonce) {
+                    this.latestConfirmedNonces[tx.from] = currentLatestNonce;
+                }
+            }
         }
         this.offBeforeTxReplace(txReplaceListener);
         const nextAccountNonce = tx.nonce + 1;
@@ -160,17 +179,19 @@ class EVMTransactions extends EVMModule_1.EVMModule {
                 if (currentPendingNonce == null || nextAccountNonce > currentPendingNonce) {
                     this.latestPendingNonces[tx.from] = nextAccountNonce;
                 }
-                if (waitForConfirmation)
-                    promises.push(this.confirmTransaction(tx, abortSignal));
-                txIds.push(tx.hash);
+                promises.push(this.confirmTransaction(tx, abortSignal));
+                if (!waitForConfirmation)
+                    txIds.push(tx.hash);
                 this.logger.debug("sendAndConfirm(): transaction sent (" + (i + 1) + "/" + signedTxs.length + "): " + tx.hash);
                 if (promises.length >= MAX_UNCONFIRMED_TXNS) {
-                    await Promise.all(promises);
+                    if (waitForConfirmation)
+                        txIds.push(...await Promise.all(promises));
                     promises = [];
                 }
             }
-            if (promises.length > 0)
-                txIds = await Promise.all(promises);
+            if (waitForConfirmation && promises.length > 0) {
+                txIds.push(...await Promise.all(promises));
+            }
         }
         else {
             for (let i = 0; i < txs.length; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "1.0.0-dev.92",
+  "version": "1.0.0-dev.94",
   "description": "EVM specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/chains/botanix/BotanixInitializer.ts

@@ -121,11 +121,10 @@ export function initializeBotanix(
 
     const chainInterface = new EVMChainInterface("BOTANIX", chainId, provider, {
         safeBlockTag: "finalized",
-        maxLogsBlockRange: 950,
-        maxLogTopics: 64,
-        maxParallelLogRequests: 5,
-        maxParallelCalls: 5,
-        ...options?.evmConfig
+        maxLogsBlockRange: options?.evmConfig?.maxLogsBlockRange ?? 950,
+        maxLogTopics: options?.evmConfig?.maxLogTopics ?? 64,
+        maxParallelLogRequests: options?.evmConfig?.maxParallelLogRequests ?? 5,
+        maxParallelCalls: options?.evmConfig?.maxParallelCalls ?? 5
     }, options.retryPolicy, Fees);
 
     const btcRelay = new EVMBtcRelay(

package/src/chains/citrea/CitreaInitializer.ts

@@ -127,11 +127,10 @@ export function initializeCitrea(
 
     const chainInterface = new EVMChainInterface("CITREA", chainId, provider, {
         safeBlockTag: "latest",
-        maxLogsBlockRange: 950,
-        maxLogTopics: 64,
-        maxParallelLogRequests: 5,
-        maxParallelCalls: 5,
-        ...options?.evmConfig
+        maxLogsBlockRange: options?.evmConfig?.maxLogsBlockRange ?? 950,
+        maxLogTopics: options?.evmConfig?.maxLogTopics ?? 64,
+        maxParallelLogRequests: options?.evmConfig?.maxParallelLogRequests ?? 5,
+        maxParallelCalls: options?.evmConfig?.maxParallelCalls ?? 5
     }, options.retryPolicy, Fees);
     chainInterface.Tokens = new CitreaTokens(chainInterface); //Override with custom token module allowing l1 state diff based fee calculation
 

package/src/evm/chain/modules/EVMTransactions.ts

@@ -50,15 +50,34 @@ export class EVMTransactions extends EVMModule<any> {
 
         let state = "pending";
         let confirmedTxId: string = null;
-        while(state==="pending" || state==="not_found") {
+        while(state==="pending") {
             await timeoutPromise(3000, abortSignal);
+            const latestConfirmedNonce = this.latestConfirmedNonces[tx.from];
+
+            const snapshot = [...checkTxns]; //Iterate over a snapshot
+            const totalTxnCount = snapshot.length;
+            let notFoundTxns = 0;
             for(let txId of checkTxns) {
-                state = await this.getTxIdStatus(txId);
-                if(state==="reverted" || state==="success") {
+                let _state = await this.getTxIdStatus(txId);
+                if(_state==="not_found") notFoundTxns++;
+                if(_state==="reverted" || _state==="success") {
                     confirmedTxId = txId;
+                    state = _state;
                     break;
                 }
             }
+            if(notFoundTxns===totalTxnCount) { //All not found, check the latest account nonce
+                if(latestConfirmedNonce!=null && latestConfirmedNonce>tx.nonce) {
+                    //Confirmed nonce is already higher than the TX nonce, meaning the TX got replaced
+                    throw new Error("Transaction failed - replaced!");
+                }
+                this.logger.warn("confirmTransaction(): All transactions not found, fetching the latest account nonce...");
+                const _latestConfirmedNonce = this.latestConfirmedNonces[tx.from];
+                const currentLatestNonce = await this.provider.getTransactionCount(tx.from, this.root.config.safeBlockTag);
+                if(_latestConfirmedNonce==null || _latestConfirmedNonce < currentLatestNonce) {
+                    this.latestConfirmedNonces[tx.from] = currentLatestNonce;
+                }
+            }
         }
 
         this.offBeforeTxReplace(txReplaceListener);
@@ -193,15 +212,17 @@ export class EVMTransactions extends EVMModule<any> {
                     this.latestPendingNonces[tx.from] = nextAccountNonce;
                 }
 
-                if(waitForConfirmation) promises.push(this.confirmTransaction(tx, abortSignal));
-                txIds.push(tx.hash);
+                promises.push(this.confirmTransaction(tx, abortSignal));
+                if(!waitForConfirmation) txIds.push(tx.hash);
                 this.logger.debug("sendAndConfirm(): transaction sent ("+(i+1)+"/"+signedTxs.length+"): "+tx.hash);
                 if(promises.length >= MAX_UNCONFIRMED_TXNS) {
-                    await Promise.all(promises);
+                    if(waitForConfirmation) txIds.push(...await Promise.all(promises));
                     promises = [];
                 }
             }
-            if(promises.length>0) txIds = await Promise.all(promises);
+            if(waitForConfirmation && promises.length>0) {
+                txIds.push(...await Promise.all(promises));
+            }
         } else {
             for(let i=0;i<txs.length;i++) {
                 let tx: TransactionResponse | Transaction;