@atomiqlabs/chain-evm 2.1.10 → 2.1.12

package/dist/evm/spv_swap/EVMSpvVaultContract.js

@@ -248,13 +248,22 @@ class EVMSpvVaultContract extends EVMContractBase_1.EVMContractBase {
             return Promise.resolve(null);
         });
         const vaults = [];
+        let promises = [];
         for (let [identifier, vaultParams] of openedVaults.entries()) {
+            if (vaultParams.btcRelayContract.toLowerCase() !== this.btcRelay.contractAddress.toLowerCase())
+                continue;
             const [owner, vaultIdStr] = identifier.split(":");
-            const vaultState = await this.contract.getVault(owner, BigInt(vaultIdStr));
-            if (vaultState.spvVaultParametersCommitment === (0, EVMSpvVaultData_1.getVaultParamsCommitment)(vaultParams)) {
-                vaults.push(new EVMSpvVaultData_1.EVMSpvVaultData(owner, BigInt(vaultIdStr), vaultState, vaultParams));
+            promises.push(this.contract.getVault(owner, BigInt(vaultIdStr)).then(vaultState => {
+                if (vaultState.spvVaultParametersCommitment === (0, EVMSpvVaultData_1.getVaultParamsCommitment)(vaultParams)) {
+                    vaults.push(new EVMSpvVaultData_1.EVMSpvVaultData(owner, BigInt(vaultIdStr), vaultState, vaultParams));
+                }
+            }));
+            if (promises.length >= this.Chain.config.maxParallelCalls) {
+                await Promise.all(promises);
+                promises = [];
             }
         }
+        await Promise.all(promises);
         return vaults;
     }
     parseWithdrawalEvent(event) {

package/package.json

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

package/src/evm/spv_swap/EVMSpvVaultContract.ts

@@ -356,14 +356,24 @@ export class EVMSpvVaultContract<ChainId extends string>
             }
         );
         const vaults: EVMSpvVaultData[] = [];
+        let promises: Promise<void>[] = [];
         for(let [identifier, vaultParams] of openedVaults.entries()) {
+            if(vaultParams.btcRelayContract.toLowerCase()!==this.btcRelay.contractAddress.toLowerCase()) continue;
+
             const [owner, vaultIdStr] = identifier.split(":");
 
-            const vaultState = await this.contract.getVault(owner, BigInt(vaultIdStr));
-            if(vaultState.spvVaultParametersCommitment === getVaultParamsCommitment(vaultParams)) {
-                vaults.push(new EVMSpvVaultData(owner, BigInt(vaultIdStr), vaultState, vaultParams))
+            promises.push(this.contract.getVault(owner, BigInt(vaultIdStr)).then(vaultState => {
+                if(vaultState.spvVaultParametersCommitment === getVaultParamsCommitment(vaultParams)) {
+                    vaults.push(new EVMSpvVaultData(owner, BigInt(vaultIdStr), vaultState, vaultParams))
+                }
+            }))
+
+            if(promises.length>=this.Chain.config.maxParallelCalls) {
+                await Promise.all(promises);
+                promises = [];
             }
         }
+        await Promise.all(promises);
         return vaults;
     }