@atomiqlabs/chain-evm 1.0.0-dev.104 → 1.0.0-dev.105

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

@@ -22,7 +22,8 @@ class EVMEvents extends EVMModule_1.EVMModule {
             });
         }
         catch (e) {
-            if (e.error?.code === -32008 || //Response is too big
+            if ((e.error?.code === -32602 && e.error?.message?.startsWith("query exceeds max results")) || //Query exceeds max results
+                e.error?.code === -32008 || //Response is too big
                 e.error?.code === -32005 //Limit exceeded
             ) {
                 if (startBlock === endBlock)

package/dist/evm/wallet/EVMPersistentSigner.d.ts

@@ -22,6 +22,7 @@ export declare class EVMPersistentSigner extends EVMSigner {
     private save;
     private checkPastTransactions;
     private startFeeBumper;
+    private syncNonceFromChain;
     init(): Promise<void>;
     stop(): Promise<void>;
     private readonly sendTransactionQueue;

package/dist/evm/wallet/EVMPersistentSigner.js

@@ -75,11 +75,11 @@ class EVMPersistentSigner extends EVMSigner_1.EVMSigner {
         for (let [nonce, data] of this.pendingTxs) {
             if (!data.sending && data.lastBumped < Date.now() - this.waitBeforeBump) {
                 _safeBlockTxCount = await this.chainInterface.provider.getTransactionCount(this.address, this.safeBlockTag);
-                this.confirmedNonce = _safeBlockTxCount;
-                if (_safeBlockTxCount > nonce) {
+                this.confirmedNonce = _safeBlockTxCount - 1;
+                if (this.confirmedNonce >= nonce) {
                     this.pendingTxs.delete(nonce);
                     data.txs.forEach(tx => this.chainInterface.Transactions._knownTxSet.delete(tx.hash));
-                    this.logger.info("checkPastTransactions(): Tx confirmed, required fee bumps: ", data.txs.length);
+                    this.logger.info(`checkPastTransactions(): Tx confirmed, nonce: ${nonce}, required fee bumps: `, data.txs.length);
                     this.save();
                     continue;
                 }
@@ -159,6 +159,21 @@ class EVMPersistentSigner extends EVMSigner_1.EVMSigner {
         };
         func();
     }
+    async syncNonceFromChain() {
+        const txCount = await this.chainInterface.provider.getTransactionCount(this.address, this.safeBlockTag);
+        this.confirmedNonce = txCount - 1;
+        if (this.pendingNonce < this.confirmedNonce) {
+            this.pendingNonce = this.confirmedNonce;
+            for (let [nonce, data] of this.pendingTxs) {
+                if (nonce <= this.pendingNonce) {
+                    this.pendingTxs.delete(nonce);
+                    data.txs.forEach(tx => this.chainInterface.Transactions._knownTxSet.delete(tx.hash));
+                }
+                this.logger.info(`syncNonceFromChain(): Tx confirmed, nonce: ${nonce}, required fee bumps: `, data.txs.length);
+            }
+            this.save();
+        }
+    }
     async init() {
         try {
             await fs.mkdir(this.directory);
@@ -213,11 +228,17 @@ class EVMPersistentSigner extends EVMSigner_1.EVMSigner {
             this.save();
             this.chainInterface.Transactions._knownTxSet.add(signedTx.hash);
             try {
+                //TODO: This can fail due to not receiving a response from the server, however the transaction
+                // might already be broadcasted!
                 const result = await this.chainInterface.provider.broadcastTransaction(signedRawTx);
                 pendingTxObject.sending = false;
                 return result;
             }
             catch (e) {
+                if (e.code === "NONCE_EXPIRED") {
+                    //Re-check nonce from on-chain
+                    await this.syncNonceFromChain();
+                }
                 this.chainInterface.Transactions._knownTxSet.delete(signedTx.hash);
                 this.pendingTxs.delete(transaction.nonce);
                 this.pendingNonce--;

package/package.json

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

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

@@ -24,6 +24,7 @@ export class EVMEvents extends EVMModule<any> {
             });
         } catch (e) {
             if(
+                (e.error?.code===-32602 && e.error?.message?.startsWith("query exceeds max results")) || //Query exceeds max results
                 e.error?.code===-32008 || //Response is too big
                 e.error?.code===-32005 //Limit exceeded
             ) {

package/src/evm/wallet/EVMPersistentSigner.ts

@@ -131,11 +131,11 @@ export class EVMPersistentSigner extends EVMSigner {
         for(let [nonce, data] of this.pendingTxs) {
             if(!data.sending && data.lastBumped<Date.now()-this.waitBeforeBump) {
                 _safeBlockTxCount = await this.chainInterface.provider.getTransactionCount(this.address, this.safeBlockTag);
-                this.confirmedNonce = _safeBlockTxCount;
-                if(_safeBlockTxCount > nonce) {
+                this.confirmedNonce = _safeBlockTxCount - 1;
+                if(this.confirmedNonce >= nonce) {
                     this.pendingTxs.delete(nonce);
                     data.txs.forEach(tx => this.chainInterface.Transactions._knownTxSet.delete(tx.hash));
-                    this.logger.info("checkPastTransactions(): Tx confirmed, required fee bumps: ", data.txs.length);
+                    this.logger.info(`checkPastTransactions(): Tx confirmed, nonce: ${nonce}, required fee bumps: `, data.txs.length);
                     this.save();
                     continue;
                 }
@@ -228,6 +228,22 @@ export class EVMPersistentSigner extends EVMSigner {
         func();
     }
 
+    private async syncNonceFromChain() {
+        const txCount = await this.chainInterface.provider.getTransactionCount(this.address, this.safeBlockTag);
+        this.confirmedNonce = txCount-1;
+        if(this.pendingNonce < this.confirmedNonce) {
+            this.pendingNonce = this.confirmedNonce;
+            for(let [nonce, data] of this.pendingTxs) {
+                if(nonce <= this.pendingNonce) {
+                    this.pendingTxs.delete(nonce);
+                    data.txs.forEach(tx => this.chainInterface.Transactions._knownTxSet.delete(tx.hash));
+                }
+                this.logger.info(`syncNonceFromChain(): Tx confirmed, nonce: ${nonce}, required fee bumps: `, data.txs.length);
+            }
+            this.save();
+        }
+    }
+
     async init(): Promise<void> {
         try {
             await fs.mkdir(this.directory)
@@ -291,10 +307,16 @@ export class EVMPersistentSigner extends EVMSigner {
             this.chainInterface.Transactions._knownTxSet.add(signedTx.hash);
 
             try {
+                //TODO: This can fail due to not receiving a response from the server, however the transaction
+                // might already be broadcasted!
                 const result = await this.chainInterface.provider.broadcastTransaction(signedRawTx);
                 pendingTxObject.sending = false;
                 return result;
             } catch (e) {
+                if(e.code==="NONCE_EXPIRED") {
+                    //Re-check nonce from on-chain
+                    await this.syncNonceFromChain();
+                }
                 this.chainInterface.Transactions._knownTxSet.delete(signedTx.hash);
                 this.pendingTxs.delete(transaction.nonce);
                 this.pendingNonce--;