@atomiqlabs/chain-evm 1.0.0-dev.68 → 1.0.0-dev.70

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

@@ -31,12 +31,15 @@ class EVMTransactions extends EVMModule_1.EVMModule {
         };
         this.onBeforeTxReplace(txReplaceListener);
         let state = "pending";
+        let confirmedTxId = null;
         while (state === "pending" || state === "not_found") {
             await (0, Utils_1.timeoutPromise)(3000, abortSignal);
             for (let txId of checkTxns) {
                 state = await this.getTxIdStatus(txId);
-                if (state === "reverted" || state === "success")
+                if (state === "reverted" || state === "success") {
+                    confirmedTxId = txId;
                     break;
+                }
             }
         }
         this.offBeforeTxReplace(txReplaceListener);
@@ -47,6 +50,7 @@ class EVMTransactions extends EVMModule_1.EVMModule {
         }
         if (state === "reverted")
             throw new Error("Transaction reverted!");
+        return confirmedTxId;
     }
     /**
      * Prepares starknet transactions, checks if the account is deployed, assigns nonces if needed & calls beforeTxSigned callback
@@ -138,7 +142,7 @@ class EVMTransactions extends EVMModule_1.EVMModule {
             }
         this.logger.debug("sendAndConfirm(): sending transactions, count: " + txs.length +
             " waitForConfirmation: " + waitForConfirmation + " parallel: " + parallel);
-        const txIds = [];
+        let txIds = [];
         if (parallel) {
             let promises = [];
             for (let i = 0; i < txs.length; i++) {
@@ -166,7 +170,7 @@ class EVMTransactions extends EVMModule_1.EVMModule {
                 }
             }
             if (promises.length > 0)
-                await Promise.all(promises);
+                txIds = await Promise.all(promises);
         }
         else {
             for (let i = 0; i < txs.length; i++) {
@@ -187,9 +191,10 @@ class EVMTransactions extends EVMModule_1.EVMModule {
                 const confirmPromise = this.confirmTransaction(tx, abortSignal);
                 this.logger.debug("sendAndConfirm(): transaction sent (" + (i + 1) + "/" + txs.length + "): " + tx.hash);
                 //Don't await the last promise when !waitForConfirmation
+                let txHash = tx.hash;
                 if (i < txs.length - 1 || waitForConfirmation)
-                    await confirmPromise;
-                txIds.push(tx.hash);
+                    txHash = await confirmPromise;
+                txIds.push(txHash);
             }
         }
         this.logger.info("sendAndConfirm(): sent transactions, count: " + txs.length +

package/dist/evm/providers/JsonRpcProviderWithRetries.js

@@ -10,9 +10,9 @@ class JsonRpcProviderWithRetries extends ethers_1.JsonRpcProvider {
     }
     send(method, params) {
         return (0, Utils_1.tryWithRetries)(() => super.send(method, params), this.retryPolicy, e => {
+            if (e.code != null && typeof (e.code) === "string")
+                return Utils_1.allowedEthersErrorCodes.has(e.code);
             return false;
-            // if(e?.error?.code!=null) return false; //Error returned by the RPC
-            // return true;
         });
     }
 }

package/dist/evm/providers/WebSocketProviderWithRetries.js

@@ -10,9 +10,9 @@ class WebSocketProviderWithRetries extends ReconnectingWebSocketProvider_1.Recon
     }
     send(method, params) {
         return (0, Utils_1.tryWithRetries)(() => super.send(method, params), this.retryPolicy, e => {
+            if (e.code != null && typeof (e.code) === "string")
+                return Utils_1.allowedEthersErrorCodes.has(e.code);
             return false;
-            // if(e?.error?.code!=null) return false; //Error returned by the RPC
-            // return true;
         });
     }
 }

package/dist/evm/wallet/EVMPersistentSigner.js

@@ -98,7 +98,11 @@ class EVMPersistentSigner extends EVMSigner_1.EVMSigner {
                     priorityFee > (this.minFeeIncreaseAbsolute + (_gasPrice.priorityFee * (1000000n + this.minFeeIncreasePpm) / 1000000n))) {
                     //Too big of an increase over the current fee rate, don't fee bump
                     this.logger.debug("checkPastTransactions(): Tx yet unconfirmed but not increasing fee for ", lastTx.hash);
-                    await this.chainInterface.provider.broadcastTransaction(lastTx.serialized).catch(e => this.logger.error("checkPastTransactions(): Tx re-broadcast error", e));
+                    await this.chainInterface.provider.broadcastTransaction(lastTx.serialized).catch(e => {
+                        if (e.code === "NONCE_EXPIRED")
+                            return;
+                        this.logger.error("checkPastTransactions(): Tx re-broadcast error", e);
+                    });
                     continue;
                 }
                 let newTx = lastTx.clone();
@@ -112,7 +116,7 @@ class EVMPersistentSigner extends EVMSigner_1.EVMSigner {
                 newTx = ethers_1.Transaction.from(signedRawTx);
                 for (let callback of this.chainInterface.Transactions._cbksBeforeTxReplace) {
                     try {
-                        await callback(lastTx.hash, lastTx.serialized, newTx.hash, signedRawTx);
+                        await callback(lastTx.serialized, lastTx.hash, signedRawTx, newTx.hash);
                     }
                     catch (e) {
                         this.logger.error("checkPastTransactions(): beforeTxReplace callback error: ", e);
@@ -123,7 +127,11 @@ class EVMPersistentSigner extends EVMSigner_1.EVMSigner {
                 this.save();
                 this.chainInterface.Transactions._knownTxSet.add(newTx.hash);
                 //TODO: Better error handling when sending tx
-                await this.chainInterface.provider.broadcastTransaction(signedRawTx).catch(e => this.logger.error("checkPastTransactions(): Fee-bumped tx broadcast error", e));
+                await this.chainInterface.provider.broadcastTransaction(signedRawTx).catch(e => {
+                    if (e.code === "NONCE_EXPIRED")
+                        return;
+                    this.logger.error("checkPastTransactions(): Fee-bumped tx broadcast error", e);
+                });
             }
         }
     }

package/dist/utils/Utils.d.ts

@@ -14,3 +14,4 @@ export declare function tryWithRetries<T>(func: () => Promise<T>, retryPolicy?:
 }, errorAllowed?: (e: any) => boolean, abortSignal?: AbortSignal): Promise<T>;
 export declare function uint32ReverseEndianness(value: number): number;
 export declare function bigIntMax(a: bigint, b: bigint): bigint;
+export declare const allowedEthersErrorCodes: Set<string>;

package/dist/utils/Utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bigIntMax = exports.uint32ReverseEndianness = exports.tryWithRetries = exports.getLogger = exports.onceAsync = exports.timeoutPromise = void 0;
+exports.allowedEthersErrorCodes = exports.bigIntMax = exports.uint32ReverseEndianness = exports.tryWithRetries = exports.getLogger = exports.onceAsync = exports.timeoutPromise = void 0;
 function timeoutPromise(timeoutMillis, abortSignal) {
     return new Promise((resolve, reject) => {
         const timeout = setTimeout(resolve, timeoutMillis);
@@ -73,3 +73,9 @@ function bigIntMax(a, b) {
     return a > b ? a : b;
 }
 exports.bigIntMax = bigIntMax;
+exports.allowedEthersErrorCodes = new Set([
+    "NOT_IMPLEMENTED", "UNSUPPORTED_OPERATION", "BAD_DATA",
+    "NUMERIC_FAULT",
+    "INVALID_ARGUMENT", "MISSING_ARGUMENT", "UNEXPECTED_ARGUMENT", "VALUE_MISMATCH",
+    "CALL_EXCEPTION", "NONCE_EXPIRED", "REPLACEMENT_UNDERPRICED", "TRANSACTION_REPLACED", "UNCONFIGURED_NAME", "OFFCHAIN_FAULT", "ACTION_REJECTED"
+]);

package/package.json

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

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

@@ -39,7 +39,7 @@ export class EVMTransactions extends EVMModule<any> {
      * @param abortSignal signal to abort waiting for tx confirmation
      * @private
      */
-    private async confirmTransaction(tx: TransactionResponse | Transaction, abortSignal?: AbortSignal) {
+    private async confirmTransaction(tx: TransactionResponse | Transaction, abortSignal?: AbortSignal): Promise<string> {
         const checkTxns: Set<string> = new Set([tx.hash]);
 
         const txReplaceListener = (oldTx: string, oldTxId: string, newTx: string, newTxId: string) => {
@@ -49,11 +49,15 @@ export class EVMTransactions extends EVMModule<any> {
         this.onBeforeTxReplace(txReplaceListener);
 
         let state = "pending";
+        let confirmedTxId: string = null;
         while(state==="pending" || state==="not_found") {
             await timeoutPromise(3000, abortSignal);
             for(let txId of checkTxns) {
                 state = await this.getTxIdStatus(txId);
-                if(state==="reverted" || state==="success") break;
+                if(state==="reverted" || state==="success") {
+                    confirmedTxId = txId;
+                    break;
+                }
             }
         }
 
@@ -65,6 +69,8 @@ export class EVMTransactions extends EVMModule<any> {
             this.latestConfirmedNonces[tx.from] = nextAccountNonce;
         }
         if(state==="reverted") throw new Error("Transaction reverted!");
+
+        return confirmedTxId;
     }
 
     /**
@@ -168,9 +174,9 @@ export class EVMTransactions extends EVMModule<any> {
         this.logger.debug("sendAndConfirm(): sending transactions, count: "+txs.length+
             " waitForConfirmation: "+waitForConfirmation+" parallel: "+parallel);
 
-        const txIds: string[] = [];
+        let txIds: string[] = [];
         if(parallel) {
-            let promises: Promise<void>[] = [];
+            let promises: Promise<string>[] = [];
             for(let i=0;i<txs.length;i++) {
                 let tx: TransactionResponse | Transaction;
                 if(signer.signTransaction==null) {
@@ -195,7 +201,7 @@ export class EVMTransactions extends EVMModule<any> {
                     promises = [];
                 }
             }
-            if(promises.length>0) await Promise.all(promises);
+            if(promises.length>0) txIds = await Promise.all(promises);
         } else {
             for(let i=0;i<txs.length;i++) {
                 let tx: TransactionResponse | Transaction;
@@ -216,8 +222,9 @@ export class EVMTransactions extends EVMModule<any> {
                 const confirmPromise = this.confirmTransaction(tx, abortSignal);
                 this.logger.debug("sendAndConfirm(): transaction sent ("+(i+1)+"/"+txs.length+"): "+tx.hash);
                 //Don't await the last promise when !waitForConfirmation
-                if(i<txs.length-1 || waitForConfirmation) await confirmPromise;
-                txIds.push(tx.hash);
+                let txHash = tx.hash;
+                if(i<txs.length-1 || waitForConfirmation) txHash = await confirmPromise;
+                txIds.push(txHash);
             }
         }
 

package/src/evm/providers/JsonRpcProviderWithRetries.ts

@@ -1,7 +1,6 @@
-import {JsonRpcProvider, JsonRpcApiProviderOptions} from "ethers";
+import {JsonRpcProvider, JsonRpcApiProviderOptions, makeError} from "ethers";
 import type {Networkish, FetchRequest} from "ethers";
-import {tryWithRetries} from "../../utils/Utils";
-
+import {allowedEthersErrorCodes, tryWithRetries} from "../../utils/Utils";
 
 export class JsonRpcProviderWithRetries extends JsonRpcProvider {
 
@@ -18,9 +17,8 @@ export class JsonRpcProviderWithRetries extends JsonRpcProvider {
 
     send(method: string, params: Array<any> | Record<string, any>): Promise<any> {
         return tryWithRetries(() => super.send(method, params), this.retryPolicy, e => {
+            if(e.code!=null && typeof(e.code)==="string") return allowedEthersErrorCodes.has(e.code);
             return false;
-            // if(e?.error?.code!=null) return false; //Error returned by the RPC
-            // return true;
         });
     }
 

package/src/evm/providers/WebSocketProviderWithRetries.ts

@@ -1,6 +1,6 @@
 import {JsonRpcApiProviderOptions} from "ethers";
 import type {Networkish} from "ethers";
-import {tryWithRetries} from "../../utils/Utils";
+import {allowedEthersErrorCodes, tryWithRetries} from "../../utils/Utils";
 import {ReconnectingWebSocketProvider} from "./ReconnectingWebSocketProvider";
 import type {WebSocketLike} from "ethers/lib.esm";
 
@@ -20,9 +20,8 @@ export class WebSocketProviderWithRetries extends ReconnectingWebSocketProvider
 
     send(method: string, params: Array<any> | Record<string, any>): Promise<any> {
         return tryWithRetries(() => super.send(method, params), this.retryPolicy, e => {
+            if(e.code!=null && typeof(e.code)==="string") return allowedEthersErrorCodes.has(e.code);
             return false;
-            // if(e?.error?.code!=null) return false; //Error returned by the RPC
-            // return true;
         });
     }
 

package/src/evm/wallet/EVMPersistentSigner.ts

@@ -160,7 +160,10 @@ export class EVMPersistentSigner extends EVMSigner {
                 ) {
                     //Too big of an increase over the current fee rate, don't fee bump
                     this.logger.debug("checkPastTransactions(): Tx yet unconfirmed but not increasing fee for ", lastTx.hash);
-                    await this.chainInterface.provider.broadcastTransaction(lastTx.serialized).catch(e => this.logger.error("checkPastTransactions(): Tx re-broadcast error", e));
+                    await this.chainInterface.provider.broadcastTransaction(lastTx.serialized).catch(e => {
+                        if(e.code==="NONCE_EXPIRED") return;
+                        this.logger.error("checkPastTransactions(): Tx re-broadcast error", e)
+                    });
                     continue;
                 }
 
@@ -178,7 +181,7 @@ export class EVMPersistentSigner extends EVMSigner {
 
                 for(let callback of this.chainInterface.Transactions._cbksBeforeTxReplace) {
                     try {
-                        await callback(lastTx.hash, lastTx.serialized, newTx.hash, signedRawTx)
+                        await callback(lastTx.serialized, lastTx.hash, signedRawTx, newTx.hash)
                     } catch (e) {
                         this.logger.error("checkPastTransactions(): beforeTxReplace callback error: ", e);
                     }
@@ -191,7 +194,10 @@ export class EVMPersistentSigner extends EVMSigner {
                 this.chainInterface.Transactions._knownTxSet.add(newTx.hash);
 
                 //TODO: Better error handling when sending tx
-                await this.chainInterface.provider.broadcastTransaction(signedRawTx).catch(e => this.logger.error("checkPastTransactions(): Fee-bumped tx broadcast error", e));
+                await this.chainInterface.provider.broadcastTransaction(signedRawTx).catch(e => {
+                    if(e.code==="NONCE_EXPIRED") return;
+                    this.logger.error("checkPastTransactions(): Fee-bumped tx broadcast error", e)
+                });
             }
         }
     }

package/src/utils/Utils.ts

@@ -83,3 +83,10 @@ export function uint32ReverseEndianness(value: number): number {
 export function bigIntMax(a: bigint, b: bigint) {
     return a>b ? a : b;
 }
+
+export const allowedEthersErrorCodes: Set<string> = new Set([
+    "NOT_IMPLEMENTED", "UNSUPPORTED_OPERATION", "BAD_DATA",
+    "NUMERIC_FAULT",
+    "INVALID_ARGUMENT", "MISSING_ARGUMENT", "UNEXPECTED_ARGUMENT", "VALUE_MISMATCH",
+    "CALL_EXCEPTION", "NONCE_EXPIRED", "REPLACEMENT_UNDERPRICED", "TRANSACTION_REPLACED", "UNCONFIGURED_NAME", "OFFCHAIN_FAULT", "ACTION_REJECTED"
+]);