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

package/dist/evm/btcrelay/EVMBtcRelay.js

@@ -160,7 +160,7 @@ class EVMBtcRelay extends EVMContractBase_1.EVMContractBase {
         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);
+            const storedBlockheader = this.blockHashCache.get(blockHashString);
             return Promise.resolve([storedBlockheader, storedBlockheader.getCommitHash()]);
         }
         return this.Events.findInContractEvents(["StoreHeader", "StoreForkHeader"], [

package/dist/evm/spv_swap/EVMSpvVaultContract.d.ts

@@ -41,6 +41,7 @@ export declare class EVMSpvVaultContract<ChainId extends string> extends EVMCont
     checkWithdrawalTx(tx: SpvWithdrawalTransactionData): Promise<void>;
     createVaultData(owner: string, vaultId: bigint, utxo: string, confirmations: number, tokenData: SpvVaultTokenData[]): Promise<EVMSpvVaultData>;
     getFronterAddress(owner: string, vaultId: bigint, withdrawal: EVMSpvWithdrawalData): Promise<string>;
+    private vaultParamsCache;
     getVaultData(owner: string, vaultId: bigint): Promise<EVMSpvVaultData>;
     getAllVaults(owner?: string): Promise<EVMSpvVaultData[]>;
     getWithdrawalState(btcTxId: string): Promise<SpvWithdrawalState>;

package/dist/evm/spv_swap/EVMSpvVaultContract.js

@@ -34,6 +34,7 @@ class EVMSpvVaultContract extends EVMContractBase_1.EVMContractBase {
         super(chainInterface, contractAddress, SpvVaultContractAbi_1.SpvVaultContractAbi, contractDeploymentHeight);
         this.claimTimeout = 180;
         this.logger = (0, Utils_1.getLogger)("EVMSpvVaultContract: ");
+        this.vaultParamsCache = new Map();
         this.btcRelay = btcRelay;
         this.bitcoinRpc = bitcoinRpc;
     }
@@ -125,15 +126,19 @@ class EVMSpvVaultContract extends EVMContractBase_1.EVMContractBase {
     }
     async getVaultData(owner, vaultId) {
         const vaultState = await this.contract.getVault(owner, vaultId);
-        const blockheight = Number(vaultState.openBlockheight);
-        const events = await this.Events.getContractBlockEvents(["Opened"], [
-            "0x" + owner.substring(2).padStart(64, "0"),
-            (0, ethers_1.hexlify)(base_1.BigIntBufferUtils.toBuffer(vaultId, "be", 32))
-        ], blockheight);
-        const foundEvent = events.find(event => (0, EVMSpvVaultData_1.getVaultParamsCommitment)(event.args.params) === vaultState.spvVaultParametersCommitment);
-        if (foundEvent == null)
-            throw new Error("Valid open event not found!");
-        const vaultParams = foundEvent.args.params;
+        let vaultParams = this.vaultParamsCache.get(vaultState.spvVaultParametersCommitment);
+        if (vaultParams == null) {
+            const blockheight = Number(vaultState.openBlockheight);
+            const events = await this.Events.getContractBlockEvents(["Opened"], [
+                "0x" + owner.substring(2).padStart(64, "0"),
+                (0, ethers_1.hexlify)(base_1.BigIntBufferUtils.toBuffer(vaultId, "be", 32))
+            ], blockheight);
+            const foundEvent = events.find(event => (0, EVMSpvVaultData_1.getVaultParamsCommitment)(event.args.params) === vaultState.spvVaultParametersCommitment);
+            if (foundEvent == null)
+                throw new Error("Valid open event not found!");
+            vaultParams = foundEvent.args.params;
+            this.vaultParamsCache.set(vaultState.spvVaultParametersCommitment, vaultParams);
+        }
         if (vaultParams.btcRelayContract.toLowerCase() !== this.btcRelay.contractAddress.toLowerCase())
             return null;
         return new EVMSpvVaultData_1.EVMSpvVaultData(owner, vaultId, vaultState, vaultParams);

package/package.json

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

package/src/evm/btcrelay/EVMBtcRelay.ts

@@ -202,7 +202,7 @@ export class EVMBtcRelay<B extends BtcBlock>
         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);
+            const storedBlockheader = this.blockHashCache.get(blockHashString);
             return Promise.resolve([storedBlockheader, storedBlockheader.getCommitHash()]);
         }
 

package/src/evm/spv_swap/EVMSpvVaultContract.ts

@@ -209,24 +209,32 @@ export class EVMSpvVaultContract<ChainId extends string>
         return frontingAddress;
     }
 
+    private vaultParamsCache: Map<string, SpvVaultParametersStructOutput> = new Map();
+
     async getVaultData(owner: string, vaultId: bigint): Promise<EVMSpvVaultData> {
         const vaultState = await this.contract.getVault(owner, vaultId);
-        const blockheight = Number(vaultState.openBlockheight);
-        const events = await this.Events.getContractBlockEvents(
-            ["Opened"],
-            [
-                "0x"+owner.substring(2).padStart(64, "0"),
-                hexlify(BigIntBufferUtils.toBuffer(vaultId, "be", 32))
-            ],
-            blockheight
-        );
 
-        const foundEvent = events.find(
-            event => getVaultParamsCommitment(event.args.params)===vaultState.spvVaultParametersCommitment
-        );
-        if(foundEvent==null) throw new Error("Valid open event not found!");
+        let vaultParams = this.vaultParamsCache.get(vaultState.spvVaultParametersCommitment);
+        if(vaultParams==null) {
+            const blockheight = Number(vaultState.openBlockheight);
+            const events = await this.Events.getContractBlockEvents(
+                ["Opened"],
+                [
+                    "0x"+owner.substring(2).padStart(64, "0"),
+                    hexlify(BigIntBufferUtils.toBuffer(vaultId, "be", 32))
+                ],
+                blockheight
+            );
+
+            const foundEvent = events.find(
+                event => getVaultParamsCommitment(event.args.params)===vaultState.spvVaultParametersCommitment
+            );
+            if(foundEvent==null) throw new Error("Valid open event not found!");
+
+            vaultParams = foundEvent.args.params;
+            this.vaultParamsCache.set(vaultState.spvVaultParametersCommitment, vaultParams);
+        }
 
-        const vaultParams = foundEvent.args.params;
         if(vaultParams.btcRelayContract.toLowerCase()!==this.btcRelay.contractAddress.toLowerCase()) return null;
 
         return new EVMSpvVaultData(owner, vaultId, vaultState, vaultParams);