@atomiqlabs/chain-evm 1.0.0-dev.70 → 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "1.0.0-dev.70",
+  "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];
+                }
             }
         );
     }