withdraw conditions

helix-bridge · Oct 11, 2024 · 8c016f3 · 8c016f3
1 parent d930cdd
commit 8c016f3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   "dependencies": {
     "@composedb/client": "0.5.0",
     "@composedb/types": "0.5.0",
-    "@helixbridge/helixconf": "1.1.15",
+    "@helixbridge/helixconf": "1.1.17",
     "@nestjs/common": "^9.0.0",
     "@nestjs/config": "^2.2.0",
     "@nestjs/core": "^9.0.0",

diff --git a/src/dataworker/dataworker.service.ts b/src/dataworker/dataworker.service.ts
@@ -160,7 +160,6 @@ export class DataworkerService implements OnModuleInit {
     return feeUsed;
   }
 
-  // MUST: countThreshold <= 40 ELSE invalid threshold
   async queryLiquidity(
     url: string,
     fromChain: string,

diff --git a/src/relayer/relayer.service.ts b/src/relayer/relayer.service.ts
@@ -35,6 +35,11 @@ import { SingleService } from "../base/safe-service/single.service";
 import { SafeGlobalService } from "../base/safe-service/safeglobal.service";
 import { SafeService } from "../base/safe-service/safe.service";
 
+const kMaxWithdrawTransferCount = 16;
+export const kMaxWithdrawTransferAmount: bigint = BigInt(
+  "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+);
+
 export class ChainInfo {
   chainName: string;
   rpcs: string[];
@@ -225,8 +230,7 @@ export class RelayerService implements OnModuleInit {
             txHashCache: "",
             checkTimes: 0,
             lendMarket: lendMarket ?? [],
-            //multicall: new MulticallContract(chainInfo.multicallAddress, provider),
-            multicall: new MulticallContract("0xcA11bde05977b3631167028862bE2a173976CA11", provider),
+            multicall: new MulticallContract(chainInfo.additional.multicallAddress, provider),
           },
         ];
       })
@@ -885,19 +889,22 @@ export class RelayerService implements OnModuleInit {
                 lockInfo
               );
               if (Number(txStatus) === 1) {
-                filterTransferIds.push(needWithdrawRecords.transferIds[index]);
+                if (filterTransferIds.length < kMaxWithdrawTransferCount) {
+                  filterTransferIds.push(needWithdrawRecords.transferIds[index]);
+                }
                 totalAmount += amountWithFeeAndPenalty;
               }
               index++;
-              if (filterTransferIds.length >= 16) {
-                break;
-              }
             }
             let countThreshold = lnProvider.withdrawLiquidityCountThreshold;
-            if (!countThreshold) {
-              countThreshold = 0;
+            if (!countThreshold || countThreshold > kMaxWithdrawTransferCount) {
+              countThreshold = kMaxWithdrawTransferCount;
+            }
+            let amountThreshold = kMaxWithdrawTransferAmount;
+            if (lnProvider.withdrawLiquidityAmountThreshold) {
+              amountThreshold = BigInt(lnProvider.withdrawLiquidityAmountThreshold);
             }
-            if (filterTransferIds.length >= countThreshold) {
+            if (filterTransferIds.length >= countThreshold || totalAmount >= amountThreshold) {
               // token transfer direction fromChain -> toChain
               // withdrawLiquidity message direction toChain -> fromChain
               const fromChannelAddress = this.configureService.getMessagerAddress(
@@ -946,7 +953,7 @@ export class RelayerService implements OnModuleInit {
                 this.logger.log(
                   `withdrawLiquidity ${fromChainInfo.chainId}->${
                     toChainInfo.chainId
-                  }, info: ${JSON.stringify(needWithdrawRecords)}, fee: ${
+                  }, info: ${JSON.stringify(filterTransferIds)}, fee: ${
                     params.fee
                   }`
                 );