Fix approve disable check

helix-bridge · Apr 22, 2024 · 58e116b · 58e116b
1 parent 844b6f4
commit 58e116b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 19 deletions.
diff --git a/src/ecosys/tool.js b/src/ecosys/tool.js
@@ -38,6 +38,14 @@ export function pickDecimal(options = {definition, decimal, chain, symbol}) {
   return BigInt(chainDecimal ? chainDecimal : symbolDefaultDecimal);
 }
 
+export function isDisableApprove(options = {definition, symbol, chainId}) {
+  const {definition, symbol, chainId} = options;
+  const featureApprove = definition.features.approve;
+  const approveDisable = featureApprove.disable;
+  const ix = approveDisable.findIndex(item => item.symbol === symbol && item.chain.toString() === chainId.toString())
+  return ix !== -1;
+}
+
 export async function queryBridgeInfoRecord(options = {lifecycle, version, sourceTokenAddress, bridge}) {
   const {lifecycle, version, sourceTokenAddress, bridge} = options;
   const gqlBody = {

diff --git a/src/register/lnv2_default.js b/src/register/lnv2_default.js
@@ -1,6 +1,7 @@
 import * as safe from "../ecosys/safe.js";
 import * as arg from "../ecosys/arg.js";
 import * as tool from '../ecosys/tool.js';
+import {isDisableApprove} from "../ecosys/tool.js";
 
 export async function register(options) {
   const {register, lifecycle, definition} = options;
@@ -97,6 +98,7 @@ export async function register(options) {
     setFeeFlags,
     withdrawFlags,
     sourceDepositToTarget,
+    targetChainId,
   };
 
   // call safe
@@ -110,16 +112,15 @@ export async function register(options) {
 
 async function registerWithCall(options, callOptions) {
   const {register, lifecycle, definition, signer} = options;
-  const {approveFlags, depositFlags, setFeeFlags, withdrawFlags, sourceDepositToTarget} = callOptions;
+  const {approveFlags, depositFlags, setFeeFlags, withdrawFlags, sourceDepositToTarget, targetChainId} = callOptions;
   const sourceSendFlags = [
     `--rpc-url=${lifecycle.sourceChainRpc}`,
   ];
   const targetSendFlags = [
     `--rpc-url=${lifecycle.targetChainRpc}`,
   ];
-  const featureApprove = definition.features.approve;
 
-  if (featureApprove.disable.indexOf(register.symbol) === -1) {
+  if (!tool.isDisableApprove({definition, symbol: register.symbol, chainId: targetChainId})) {
     approveFlags.unshift(...[
       ...targetSendFlags,
       register.targetTokenAddress,
@@ -170,15 +171,13 @@ async function registerWithSafe(options, callOptions) {
     sourceSafeSdk, sourceSafeService, sourceSigner,
     targetSafeSdk, targetSafeService, targetSigner,
   } = options;
-  const {approveFlags, depositFlags, setFeeFlags, withdrawFlags, sourceDepositToTarget} = callOptions;
+  const {approveFlags, depositFlags, setFeeFlags, withdrawFlags, sourceDepositToTarget, targetChainId} = callOptions;
 
   const txApprove = await $`cast calldata ${approveFlags}`;
   const txSetFee = await $`cast calldata ${setFeeFlags}`;
 
-  const featureApprove = definition.features.approve;
-
   const p0Transactions = [];
-  if (featureApprove.disable.indexOf(register.symbol) === -1) {
+  if (!tool.isDisableApprove({definition, symbol: register.symbol, chainId: targetChainId})) {
     p0Transactions.push({
       to: register.targetTokenAddress,
       value: '0',

diff --git a/src/register/lnv2_opposite.js b/src/register/lnv2_opposite.js
@@ -67,6 +67,7 @@ export async function register(options) {
     setFeeFlags,
     withdrawFlags,
     sourceDeposit,
+    targetChainId,
   };
 
   // call safe
@@ -81,16 +82,15 @@ export async function register(options) {
 
 async function registerWithCall(options, callOptions) {
   const {register, lifecycle, definition, signer} = options;
-  const {approveFlags, setFeeFlags, withdrawFlags, sourceDeposit} = callOptions;
+  const {approveFlags, setFeeFlags, withdrawFlags, sourceDeposit, targetChainId} = callOptions;
   const sourceSendFlags = [
     `--rpc-url=${lifecycle.sourceChainRpc}`,
   ];
   const targetSendFlags = [
     `--rpc-url=${lifecycle.targetChainRpc}`,
   ];
 
-  const featureApprove = definition.features.approve;
-  if (featureApprove.disable.indexOf(register.symbol) === -1) {
+  if (!tool.isDisableApprove({definition, symbol: register.symbol, chainId: targetChainId})) {
     approveFlags.unshift(...[
       ...targetSendFlags,
       register.targetTokenAddress,
@@ -118,15 +118,14 @@ async function registerWithSafe(options, callOptions) {
     sourceSafeSdk, sourceSafeService, sourceSigner,
     targetSafeSdk, targetSafeService, targetSigner,
   } = options;
-  const {approveFlags, setFeeFlags, withdrawFlags, sourceDeposit} = callOptions;
+  const {approveFlags, setFeeFlags, withdrawFlags, sourceDeposit, targetChainId} = callOptions;
 
   const txApprove = await $`cast calldata ${approveFlags}`;
   const txSetFee = await $`cast calldata ${setFeeFlags}`;
 
   const p0Transactions = [];
 
-  const featureApprove = definition.features.approve;
-  if (featureApprove.disable.indexOf(register.symbol) === -1) {
+  if (!tool.isDisableApprove({definition, symbol: register.symbol, chainId: targetChainId})) {
     p0Transactions.push({
       to: register.targetTokenAddress,
       value: '0',

diff --git a/src/register/lnv3.js b/src/register/lnv3.js
@@ -75,6 +75,7 @@ export async function register(options) {
     setFeeFlags,
     depositFlags,
     withdrawFlags,
+    targetChainId,
   };
 
   // call safe
@@ -89,13 +90,12 @@ export async function register(options) {
 
 async function registerWithCall(options, callOptions) {
   const {register, lifecycle, definition, signer} = options;
-  const {approvalFlags, depositFlags, setFeeFlags, withdrawFlags} = callOptions;
+  const {approvalFlags, depositFlags, setFeeFlags, withdrawFlags, targetChainId} = callOptions;
   const sendFlags = [
     `--rpc-url=${lifecycle.sourceChainRpc}`,
   ];
 
-  const featureApprove = definition.features.approve;
-  if (featureApprove.disable.indexOf(register.symbol) === -1) {
+  if (!tool.isDisableApprove({definition, symbol: register.symbol, chainId: targetChainId})) {
     approvalFlags.unshift(...[
       ...sendFlags,
       register.sourceTokenAddress,
@@ -140,14 +140,13 @@ async function registerWithCall(options, callOptions) {
 
 async function registerWithSafe(options, callOptions) {
   const {register, lifecycle, definition, sourceSafeSdk, sourceSafeService, sourceSigner} = options;
-  const {approvalFlags, depositFlags, setFeeFlags, withdrawFlags} = callOptions;
+  const {approvalFlags, depositFlags, setFeeFlags, withdrawFlags, targetChainId} = callOptions;
 
   const txApprove = await $`cast calldata ${approvalFlags}`;
   const txSetFee = await $`cast calldata ${setFeeFlags}`;
-  const featureApprove = definition.features.approve;
 
   const transactions = [];
-  if (featureApprove.disable.indexOf(register.symbol) === -1) {
+  if (!tool.isDisableApprove({definition, symbol: register.symbol, chainId: targetChainId})) {
     transactions.push({
       to: register.sourceTokenAddress,
       value: '0',