@atomiqlabs/chain-evm 1.0.0-dev.69 → 1.0.0-dev.71

package/dist/evm/btcrelay/EVMBtcRelay.d.ts

@@ -47,6 +47,8 @@ export declare class EVMBtcRelay<B extends BtcBlock> extends EVMContractBase<Btc
      */
     private _saveHeaders;
     private findStoredBlockheaderInTraces;
+    private commitHashCache;
+    private blockHashCache;
     private getBlock;
     private getBlockHeight;
     /**

package/dist/evm/btcrelay/EVMBtcRelay.js

@@ -54,6 +54,8 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
         this.maxHeadersPerTx = 100;
         this.maxForkHeadersPerTx = 50;
         this.maxShortForkHeadersPerTx = 100;
+        this.commitHashCache = new Map;
+        this.blockHashCache = new Map;
         this.bitcoinRpc = bitcoinRpc;
     }
     /**
@@ -151,14 +153,27 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
         return null;
     }
     getBlock(commitHash, blockHash) {
+        if (commitHash != null && this.commitHashCache.has(commitHash)) {
+            logger.debug("getBlock(): Returning block from commit hash cache: ", commitHash);
+            return Promise.resolve([this.commitHashCache.get(commitHash), commitHash]);
+        }
+        const blockHashString = blockHash == null ? null : "0x" + Buffer.from([...blockHash]).reverse().toString("hex");
+        if (blockHashString != null && this.blockHashCache.has(blockHashString)) {
+            logger.debug("getBlock(): Returning block from block hash cache: ", blockHashString);
+            const storedBlockheader = this.blockHashCache.get(commitHash);
+            return Promise.resolve([storedBlockheader, storedBlockheader.getCommitHash()]);
+        }
         return this.Events.findInContractEvents(["StoreHeader", "StoreForkHeader"], [
             commitHash,
-            blockHash == null ? null : "0x" + Buffer.from([...blockHash]).reverse().toString("hex")
+            blockHashString
         ], async (event) => {
             const txTrace = await this.Chain.Transactions.traceTransaction(event.transactionHash);
             const storedBlockheader = await this.findStoredBlockheaderInTraces(txTrace, event.args.commitHash);
-            if (storedBlockheader != null)
+            if (storedBlockheader != null) {
+                this.commitHashCache.set(event.args.commitHash, storedBlockheader);
+                this.blockHashCache.set(event.args.blockHash, storedBlockheader);
                 return [storedBlockheader, event.args.commitHash];
+            }
         });
     }
     async getBlockHeight() {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "1.0.0-dev.69",
+  "version": "1.0.0-dev.71",
   "description": "EVM specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -23,7 +23,7 @@
   "author": "adambor",
   "license": "Apache-2.0",
   "dependencies": {
-    "@atomiqlabs/base": "^10.0.0-dev.9",
+    "@atomiqlabs/base": "^10.0.0-dev.10",
     "@noble/hashes": "^1.8.0",
     "@scure/btc-signer": "1.6.0",
     "buffer": "6.0.3"

package/src/evm/btcrelay/EVMBtcRelay.ts

@@ -191,17 +191,35 @@ export class EVMBtcRelay<B extends BtcBlock>
         return null;
     }
 
+    private commitHashCache: Map<string, EVMBtcStoredHeader> = new Map<string, EVMBtcStoredHeader>;
+    private blockHashCache: Map<string, EVMBtcStoredHeader> = new Map<string, EVMBtcStoredHeader>;
+
     private getBlock(commitHash?: string, blockHash?: Buffer): Promise<[EVMBtcStoredHeader, string] | null> {
+        if(commitHash!=null && this.commitHashCache.has(commitHash)) {
+            logger.debug("getBlock(): Returning block from commit hash cache: ", commitHash);
+            return Promise.resolve([this.commitHashCache.get(commitHash), commitHash]);
+        }
+        const blockHashString = blockHash==null ? null : "0x"+Buffer.from([...blockHash]).reverse().toString("hex");
+        if(blockHashString!=null && this.blockHashCache.has(blockHashString)) {
+            logger.debug("getBlock(): Returning block from block hash cache: ", blockHashString);
+            const storedBlockheader = this.blockHashCache.get(commitHash);
+            return Promise.resolve([storedBlockheader, storedBlockheader.getCommitHash()]);
+        }
+
         return this.Events.findInContractEvents(
             ["StoreHeader", "StoreForkHeader"],
             [
                 commitHash,
-                blockHash==null ? null : "0x"+Buffer.from([...blockHash]).reverse().toString("hex")
+                blockHashString
             ],
             async (event) => {
                 const txTrace = await this.Chain.Transactions.traceTransaction(event.transactionHash);
                 const storedBlockheader = await this.findStoredBlockheaderInTraces(txTrace, event.args.commitHash);
-                if(storedBlockheader!=null) return [storedBlockheader, event.args.commitHash];
+                if(storedBlockheader!=null) {
+                    this.commitHashCache.set(event.args.commitHash, storedBlockheader);
+                    this.blockHashCache.set(event.args.blockHash, storedBlockheader);
+                    return [storedBlockheader, event.args.commitHash];
+                }
             }
         );
     }

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);
             }
         }