@allbridge/bridge-core-sdk 3.27.0-alpha.2 → 3.27.0-alpha.20

package/dist/src/models/index.js

@@ -36,6 +36,10 @@ var FeePaymentMethod;
      * The fee is paid with the stablecoin token.
      */
     FeePaymentMethod["WITH_STABLECOIN"] = "stablecoin";
+    /**
+     * The fee is paid with the ABR token.
+     */
+    FeePaymentMethod["WITH_ARB"] = "abr";
 })(FeePaymentMethod || (exports.FeePaymentMethod = FeePaymentMethod = {}));
 /**
  * Define the type of amount data<p/>

package/dist/src/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAaA,oEAO2C;AANzC,2GAAA,SAAS,OAAA;AAKT,+GAAA,aAAa,OAAA;AAqBf,2DAAyC;AAEzC,6DAAyF;AAAhF,qHAAA,sBAAsB,OAAA;AAAE,+GAAA,gBAAgB,OAAA;AAyBjD,gDAA8B;AAC9B,qDAA+D;AAAtD,0GAAA,WAAW,OAAA;AAAE,wGAAA,SAAS,OAAA;AAG/B,IAAY,gBAUX;AAVD,WAAY,gBAAgB;IAC1B;;OAEG;IACH,mDAA+B,CAAA;IAE/B;;OAEG;IACH,kDAA8B,CAAA;AAChC,CAAC,EAVW,gBAAgB,gCAAhB,gBAAgB,QAU3B;AAoCD;;;;GAIG;AACH,IAAY,YASX;AATD,WAAY,YAAY;IACtB;;OAEG;IACH,2BAAW,CAAA;IACX;;OAEG;IACH,+BAAe,CAAA;AACjB,CAAC,EATW,YAAY,4BAAZ,YAAY,QASvB","sourcesContent":["export {\n  ApproveParams as BridgeApproveParams,\n  BaseSendParams,\n  CheckAllowanceParams,\n  GetAllowanceParams,\n  GetTokenBalanceParams,\n  SendParams,\n  SwapParams,\n  GetNativeTokenBalanceParams,\n} from \"../services/bridge/models/bridge.model\";\nexport { BridgeService } from \"../services/bridge/index\";\nexport { CctpParams, CctpDomains } from \"../services/bridge/sol\";\nexport { LiquidityPoolService } from \"../services/liquidity-pool/index\";\nexport {\n  Messenger,\n  TransferStatusResponse,\n  BridgeTransaction,\n  GasBalanceResponse,\n  CheckAddressResponse,\n  AddressStatus,\n} from \"../client/core-api/core-api.model\";\nexport { RawBridgeTransactionBuilder } from \"../services/bridge/raw-bridge-transaction-builder\";\nexport { RawPoolTransactionBuilder } from \"../services/liquidity-pool/raw-pool-transaction-builder\";\nexport {\n  PoolInfo,\n  TokenWithChainDetails,\n  TransferTime,\n  TxCostAmount,\n  SuiAddresses,\n  MessengerTransferTime,\n} from \"../tokens-info/tokens-info.model\";\nexport {\n  UserBalanceInfo,\n  UserBalanceInfoDTO,\n  LiquidityPoolsParams,\n  LiquidityPoolsParamsWithAmount,\n  ApproveParams as LiquidityPoolsApproveParams,\n  CheckAllowanceParams as LiquidityPoolsCheckAllowanceParams,\n  GetAllowanceParams as LiquidityPoolsGetAllowanceParams,\n} from \"../services/liquidity-pool/models/pool.model\";\nexport * from \"../services/models/index\";\nexport { YieldService } from \"../services/yield/index\";\nexport { assertYieldIsSupported, isYieldSupported } from \"../services/yield/validations\";\nexport {\n  TokenWithChainDetailsYield,\n  CYDToken,\n  YieldGetAllowanceParams,\n  YieldCheckAllowanceParams,\n  YieldBalanceParams,\n  YieldGetEstimatedAmountOnDepositParams,\n  YieldGetWithdrawProportionAmountParams,\n  YieldWithdrawAmount,\n  YieldApproveParams,\n  YieldDepositParams,\n  YieldWithdrawParams,\n} from \"../services/yield//models/yield.model\";\nexport { RawYieldTransactionBuilder } from \"../services/yield/raw-yield-transaction-builder\";\nexport {\n  SwapAndBridgeCalculationData,\n  SwapFromVUsdCalcResult,\n  SwapToVUsdCalcResult,\n} from \"../utils/calculation/swap-and-bridge-fee-calc\";\nexport { SendAmountDetails, AmountImpact } from \"../utils/calculation/swap-and-bridge-details\";\nexport { ChainDetailsMap, ChainDetailsWithTokens } from \"../tokens-info\";\nexport { Utils } from \"../utils\";\nexport { SrbUtils, TrustLineParams } from \"../utils/srb\";\nexport { SolUtils } from \"../utils/sol\";\nexport * from \"../exceptions\";\nexport { ChainSymbol, ChainType } from \"../chains/chain.enums\";\nexport { AdditionalBasicChainProperties, BasicChainProperties } from \"../chains/models\";\n\nexport enum FeePaymentMethod {\n  /**\n   * The fee is paid in the native currency of the source chain.\n   */\n  WITH_NATIVE_CURRENCY = \"native\",\n\n  /**\n   * The fee is paid with the stablecoin token.\n   */\n  WITH_STABLECOIN = \"stablecoin\",\n}\n\nexport interface AmountsAndGasFeeOptions {\n  /**\n   * The floating point amount of tokens to be sent (not including gas fee).\n   */\n  amountToSendFloat: string;\n\n  /**\n   * The floating point amount of tokens to be received.\n   */\n  amountToBeReceivedFloat: string;\n\n  /**\n   * Available ways to pay the transfer gas fee and gas fee amount.\n   */\n  gasFeeOptions: GasFeeOptions;\n}\n\ntype GasFeeOptionsType = {\n  [key in FeePaymentMethod]?: AmountFormatted;\n};\n\n/**\n * Describes available options of paying the gas fee and the amount to pay when using the corresponding method.\n *\n * For {@link FeePaymentMethod.WITH_NATIVE_CURRENCY} value contains the amount in the smallest denomination of the source chain currency\n *\n * For {@link FeePaymentMethod.WITH_STABLECOIN} value contains the amount in the smallest denomination of the source token\n */\nexport interface GasFeeOptions extends GasFeeOptionsType {\n  [FeePaymentMethod.WITH_NATIVE_CURRENCY]: AmountFormatted;\n  [FeePaymentMethod.WITH_STABLECOIN]?: AmountFormatted;\n  adminFeeShareWithExtras?: string;\n}\n\n/**\n * Define the type of amount data<p/>\n * Example:<p/>\n *  \"1500000\" USDC {@link AmountFormat.INT} = \"1.5\" USDC {@link AmountFormat.FLOAT}, if USDC.decimals = 6\n */\nexport enum AmountFormat {\n  /**\n   * denominated in the smallest unit of the source token\n   */\n  INT = \"int\",\n  /**\n   * denominated in the unit of the source token\n   */\n  FLOAT = \"float\",\n}\n\n/**\n * Describes the same amount in two variation formats.\n *\n * For {@link AmountFormat.INT} value contains the amount in the smallest denomination\n *\n * For {@link AmountFormat.FLOAT} value contains the amount in tokens denomination\n */\nexport type AmountFormatted = {\n  [key in AmountFormat]: string;\n};\n\n/**\n * Describes MAX extra gas value can to be passed when using the corresponding method.\n *\n * For {@link FeePaymentMethod.WITH_NATIVE_CURRENCY} value contains {@link ExtraGasMaxLimit} the amount of the source chain currency\n *\n * For {@link FeePaymentMethod.WITH_STABLECOIN} value contains {@link ExtraGasMaxLimit} the amount of the source token\n */\nexport type ExtraGasMaxLimits = {\n  [key in FeePaymentMethod]?: ExtraGasMaxLimit;\n};\n\n/**\n * Describes the same MAX extra gas amount.\n */\nexport type ExtraGasMaxLimit = AmountFormatted;\n\n/**\n * Provide extra gas information\n */\nexport interface ExtraGasMaxLimitResponse {\n  /**\n   * See {@link ExtraGasMaxLimits}\n   */\n  extraGasMax: ExtraGasMaxLimits;\n  /**\n   * Information due to destination chain\n   */\n  destinationChain: {\n    /**\n     *  gasAmountMax maximum amount you can receive as extra gas on dest chain\n     */\n    gasAmountMax: ExtraGasMaxLimit;\n    /**\n     * cost of swap tx on chain\n     */\n    swap: AmountFormatted;\n    /**\n     * cost of send tx on chain\n     */\n    transfer: AmountFormatted;\n  };\n  /**\n   * Exchange rate\n   */\n  exchangeRate: string;\n  /**\n   * Source native token price\n   */\n  sourceNativeTokenPrice: string;\n}\n\n/**\n * Provide pending status information\n */\nexport interface PendingStatusInfoResponse {\n  /**\n   * Number of pending transactions\n   */\n  pendingTxs: number;\n  /**\n   * Total amount of pending transactions\n   */\n  pendingAmount: AmountFormatted;\n  /**\n   * The amount of tokens can be received as a result of transfer considering pending transactions\n   */\n  estimatedAmount: { min: AmountFormatted; max: AmountFormatted };\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAaA,oEAO2C;AANzC,2GAAA,SAAS,OAAA;AAKT,+GAAA,aAAa,OAAA;AAaf,2DAAyC;AAEzC,6DAAyF;AAAhF,qHAAA,sBAAsB,OAAA;AAAE,+GAAA,gBAAgB,OAAA;AAmCjD,gDAA8B;AAC9B,qDAA+D;AAAtD,0GAAA,WAAW,OAAA;AAAE,wGAAA,SAAS,OAAA;AAG/B,IAAY,gBAeX;AAfD,WAAY,gBAAgB;IAC1B;;OAEG;IACH,mDAA+B,CAAA;IAE/B;;OAEG;IACH,kDAA8B,CAAA;IAE9B;;OAEG;IACH,oCAAgB,CAAA;AAClB,CAAC,EAfW,gBAAgB,gCAAhB,gBAAgB,QAe3B;AAqCD;;;;GAIG;AACH,IAAY,YASX;AATD,WAAY,YAAY;IACtB;;OAEG;IACH,2BAAW,CAAA;IACX;;OAEG;IACH,+BAAe,CAAA;AACjB,CAAC,EATW,YAAY,4BAAZ,YAAY,QASvB","sourcesContent":["export {\n  ApproveParams as BridgeApproveParams,\n  BaseSendParams,\n  CheckAllowanceParams,\n  GetAllowanceParams,\n  GetTokenBalanceParams,\n  SendParams,\n  SwapParams,\n  GetNativeTokenBalanceParams,\n} from \"../services/bridge/models/bridge.model\";\nexport { BridgeService } from \"../services/bridge/index\";\nexport { CctpParams, CctpDomains } from \"../services/bridge/sol\";\nexport { LiquidityPoolService } from \"../services/liquidity-pool/index\";\nexport {\n  Messenger,\n  TransferStatusResponse,\n  BridgeTransaction,\n  GasBalanceResponse,\n  CheckAddressResponse,\n  AddressStatus,\n} from \"../client/core-api/core-api.model\";\nexport { RawBridgeTransactionBuilder } from \"../services/bridge/raw-bridge-transaction-builder\";\nexport { RawPoolTransactionBuilder } from \"../services/liquidity-pool/raw-pool-transaction-builder\";\nexport {\n  UserBalanceInfo,\n  UserBalanceInfoDTO,\n  LiquidityPoolsParams,\n  LiquidityPoolsParamsWithAmount,\n  ApproveParams as LiquidityPoolsApproveParams,\n  CheckAllowanceParams as LiquidityPoolsCheckAllowanceParams,\n  GetAllowanceParams as LiquidityPoolsGetAllowanceParams,\n} from \"../services/liquidity-pool/models/pool.model\";\nexport * from \"../services/models/index\";\nexport { YieldService } from \"../services/yield/index\";\nexport { assertYieldIsSupported, isYieldSupported } from \"../services/yield/validations\";\nexport {\n  TokenWithChainDetailsYield,\n  CYDToken,\n  YieldGetAllowanceParams,\n  YieldCheckAllowanceParams,\n  YieldBalanceParams,\n  YieldGetEstimatedAmountOnDepositParams,\n  YieldGetWithdrawProportionAmountParams,\n  YieldWithdrawAmount,\n  YieldApproveParams,\n  YieldDepositParams,\n  YieldWithdrawParams,\n} from \"../services/yield/models/yield.model\";\nexport { RawYieldTransactionBuilder } from \"../services/yield/raw-yield-transaction-builder\";\nexport {\n  SwapAndBridgeCalculationData,\n  SwapFromVUsdCalcResult,\n  SwapToVUsdCalcResult,\n} from \"../utils/calculation/swap-and-bridge-fee-calc\";\nexport { SendAmountDetails, AmountImpact } from \"../utils/calculation/swap-and-bridge-details\";\nexport {\n  PoolInfo,\n  TokenCoreFields,\n  TokenWithChainDetails,\n  TransferTime,\n  TxCostAmount,\n  SuiAddresses,\n  MessengerTransferTime,\n  ChainDetailsMap,\n  ChainDetailsWithTokens,\n} from \"../tokens-info\";\nexport { Utils } from \"../utils\";\nexport { SrbUtils, TrustLineParams } from \"../utils/srb\";\nexport { SolUtils } from \"../utils/sol\";\nexport * from \"../exceptions\";\nexport { ChainSymbol, ChainType } from \"../chains/chain.enums\";\nexport { AdditionalBasicChainProperties, BasicChainProperties } from \"../chains/models\";\n\nexport enum FeePaymentMethod {\n  /**\n   * The fee is paid in the native currency of the source chain.\n   */\n  WITH_NATIVE_CURRENCY = \"native\",\n\n  /**\n   * The fee is paid with the stablecoin token.\n   */\n  WITH_STABLECOIN = \"stablecoin\",\n\n  /**\n   * The fee is paid with the ABR token.\n   */\n  WITH_ARB = \"abr\",\n}\n\nexport interface AmountsAndGasFeeOptions {\n  /**\n   * The floating point amount of tokens to be sent (not including gas fee).\n   */\n  amountToSendFloat: string;\n\n  /**\n   * The floating point amount of tokens to be received.\n   */\n  amountToBeReceivedFloat: string;\n\n  /**\n   * Available ways to pay the transfer gas fee and gas fee amount.\n   */\n  gasFeeOptions: GasFeeOptions;\n}\n\ntype GasFeeOptionsType = {\n  [key in FeePaymentMethod]?: AmountFormatted;\n};\n\n/**\n * Describes available options of paying the gas fee and the amount to pay when using the corresponding method.\n *\n * For {@link FeePaymentMethod.WITH_NATIVE_CURRENCY} value contains the amount in the smallest denomination of the source chain currency\n *\n * For {@link FeePaymentMethod.WITH_STABLECOIN} value contains the amount in the smallest denomination of the source token\n */\nexport interface GasFeeOptions extends GasFeeOptionsType {\n  [FeePaymentMethod.WITH_NATIVE_CURRENCY]: AmountFormatted;\n  [FeePaymentMethod.WITH_STABLECOIN]?: AmountFormatted;\n  [FeePaymentMethod.WITH_ARB]?: AmountFormatted;\n  adminFeeShareWithExtras?: string;\n}\n\n/**\n * Define the type of amount data<p/>\n * Example:<p/>\n *  \"1500000\" USDC {@link AmountFormat.INT} = \"1.5\" USDC {@link AmountFormat.FLOAT}, if USDC.decimals = 6\n */\nexport enum AmountFormat {\n  /**\n   * denominated in the smallest unit of the source token\n   */\n  INT = \"int\",\n  /**\n   * denominated in the unit of the source token\n   */\n  FLOAT = \"float\",\n}\n\n/**\n * Describes the same amount in two variation formats.\n *\n * For {@link AmountFormat.INT} value contains the amount in the smallest denomination\n *\n * For {@link AmountFormat.FLOAT} value contains the amount in tokens denomination\n */\nexport type AmountFormatted = {\n  [key in AmountFormat]: string;\n};\n\n/**\n * Describes MAX extra gas value can to be passed when using the corresponding method.\n *\n * For {@link FeePaymentMethod.WITH_NATIVE_CURRENCY} value contains {@link ExtraGasMaxLimit} the amount of the source chain currency\n *\n * For {@link FeePaymentMethod.WITH_STABLECOIN} value contains {@link ExtraGasMaxLimit} the amount of the source token\n */\nexport type ExtraGasMaxLimits = {\n  [key in FeePaymentMethod]?: ExtraGasMaxLimit;\n};\n\n/**\n * Describes the same MAX extra gas amount.\n */\nexport type ExtraGasMaxLimit = AmountFormatted;\n\n/**\n * Provide extra gas information\n */\nexport interface ExtraGasMaxLimitResponse {\n  /**\n   * See {@link ExtraGasMaxLimits}\n   */\n  extraGasMax: ExtraGasMaxLimits;\n  /**\n   * Information due to destination chain\n   */\n  destinationChain: {\n    /**\n     *  gasAmountMax maximum amount you can receive as extra gas on dest chain\n     */\n    gasAmountMax: ExtraGasMaxLimit;\n    /**\n     * cost of swap tx on chain\n     */\n    swap: AmountFormatted;\n    /**\n     * cost of send tx on chain\n     */\n    transfer: AmountFormatted;\n  };\n  /**\n   * Exchange rate\n   */\n  exchangeRate: string;\n  /**\n   * Exchange rate\n   */\n  abrExchangeRate?: string;\n  /**\n   * Source native token price\n   */\n  sourceNativeTokenPrice: string;\n}\n\n/**\n * Provide pending status information\n */\nexport interface PendingStatusInfoResponse {\n  /**\n   * Number of pending transactions\n   */\n  pendingTxs: number;\n  /**\n   * Total amount of pending transactions\n   */\n  pendingAmount: AmountFormatted;\n  /**\n   * The amount of tokens can be received as a result of transfer considering pending transactions\n   */\n  estimatedAmount: { min: AmountFormatted; max: AmountFormatted };\n}\n"]}

package/dist/src/services/bridge/alg/index.d.ts

@@ -12,4 +12,5 @@ export declare class AlgBridgeService extends ChainBridgeService {
     buildRawTransactionSend(params: SendParams): Promise<RawTransaction>;
     buildRawTransactionSwap(params: SwapParams): Promise<RawTransaction>;
     private getBridge;
+    private getPaddingUtil;
 }

package/dist/src/services/bridge/alg/index.js

@@ -29,10 +29,12 @@ const algosdk_1 = __importStar(require("algosdk"));
 const chain_enums_1 = require("../../../chains/chain.enums");
 const exceptions_1 = require("../../../exceptions");
 const models_1 = require("../../../models");
+const utils_1 = require("../../../utils/utils");
 const BridgeClient_1 = require("../../models/alg/BridgeClient");
+const PaddingUtilClient_1 = require("../../models/alg/PaddingUtilClient");
 const alg_1 = require("../../utils/alg");
 const models_2 = require("../models");
-const utils_1 = require("../utils");
+const utils_2 = require("../utils");
 class AlgBridgeService extends models_2.ChainBridgeService {
     algorand;
     api;
@@ -47,67 +49,94 @@ class AlgBridgeService extends models_2.ChainBridgeService {
         throw new exceptions_1.MethodNotSupportedError();
     }
     async buildRawTransactionSend(params) {
-        const txSendParams = await (0, utils_1.prepareTxSendParams)(this.chainType, params, this.api);
+        const txSendParams = await (0, utils_2.prepareTxSendParams)(this.chainType, params, this.api);
         if (!params.sourceToken.bridgeId) {
             throw new exceptions_1.SdkError("ALG sourceToken must contain 'bridgeId'");
         }
+        if (!params.sourceToken.paddingUtilId) {
+            throw new exceptions_1.SdkError("ALG sourceToken must contain 'paddingUtilId'");
+        }
         const bridgeId = BigInt(params.sourceToken.bridgeId);
         const bridge = this.getBridge(bridgeId);
+        const paddingUtilId = BigInt(params.sourceToken.paddingUtilId);
+        const paddingUtil = this.getPaddingUtil(paddingUtilId);
         const sender = algosdk_1.Address.fromString(params.fromAccountAddress);
         const tokenId = BigInt(params.sourceToken.tokenAddress);
         const destinationChainId = txSendParams.toChainId;
         const recipient = txSendParams.toAccountAddress;
         const receiveToken = txSendParams.toTokenAddress;
-        const nonce = (0, utils_1.getNonce)();
+        const nonce = (0, utils_2.getNonce)();
         const amount = BigInt(txSendParams.amount);
         let totalFee = BigInt(txSendParams.fee);
         if (txSendParams.extraGas) {
             totalFee = totalFee + BigInt(txSendParams.extraGas);
         }
-        const isPayWithStable = txSendParams.gasFeePaymentMethod === models_1.FeePaymentMethod.WITH_STABLECOIN;
         const composer = this.algorand.newGroup();
-        let feeTokenAmount;
-        if (isPayWithStable) {
-            feeTokenAmount = totalFee;
-        }
-        else {
-            composer.addPayment({
-                sender,
-                receiver: bridge.appAddress,
-                amount: amount_1.AlgoAmount.MicroAlgo(totalFee),
-            });
-            feeTokenAmount = 0n;
-        }
-        composer
-            .addAssetTransfer({
-            assetId: tokenId,
+        const assetTransferTx = await this.algorand.createTransaction.assetTransfer({
             amount,
-            sender,
+            assetId: tokenId,
             receiver: bridge.appAddress,
-        })
-            .addAppCallMethodCall(await bridge.params.swapAndBridge({
-            args: {
-                tokenId,
-                recipient,
-                destinationChainId,
-                receiveToken,
-                nonce,
-                feeTokenAmount,
-            },
             sender,
-            extraFee: (0, alg_1.feeForInner)(isPayWithStable ? 9 : 8),
-        }));
-        (0, alg_1.addBudgetNoops)({
-            composer,
-            appId: bridgeId,
+        });
+        switch (txSendParams.gasFeePaymentMethod) {
+            case models_1.FeePaymentMethod.WITH_NATIVE_CURRENCY: {
+                const paymentTx = await this.algorand.createTransaction.payment({
+                    amount: amount_1.AlgoAmount.MicroAlgo(totalFee),
+                    receiver: bridge.appAddress,
+                    sender,
+                });
+                composer.addAppCallMethodCall(await bridge.params.swapAndBridge({
+                    args: {
+                        paymentRef: paymentTx,
+                        assetTransferRef: assetTransferTx,
+                        recipient,
+                        destinationChainId,
+                        receiveToken,
+                        nonce,
+                    },
+                    sender,
+                    extraFee: (0, alg_1.feeForInner)(8),
+                }));
+                break;
+            }
+            case models_1.FeePaymentMethod.WITH_STABLECOIN: {
+                composer.addAppCallMethodCall(await bridge.params.swapAndBridgeWithStable({
+                    args: {
+                        assetTransferRef: assetTransferTx,
+                        recipient,
+                        destinationChainId,
+                        receiveToken,
+                        nonce,
+                        feeTokenAmount: totalFee,
+                    },
+                    sender,
+                    extraFee: (0, alg_1.feeForInner)(9),
+                }));
+                const paddingTx = await this.algorand.createTransaction.appCall({
+                    appId: paddingUtil.appId,
+                    sender,
+                    note: "padding_1",
+                });
+                composer.addTransaction(paddingTx);
+                break;
+            }
+            case models_1.FeePaymentMethod.WITH_ARB:
+                throw new exceptions_1.SdkError("ALG bridge does not support ARB0 payment method");
+            default: {
+                return (0, utils_1.assertNever)(txSendParams.gasFeePaymentMethod, "Unhandled FeePaymentMethod");
+            }
+        }
+        const paddingTx = await this.algorand.createTransaction.appCall({
+            appId: paddingUtil.appId,
             sender,
-            count: isPayWithStable ? 3 : 2,
+            note: "padding",
         });
+        composer.addTransaction(paddingTx);
         const { transactions } = await composer.buildTransactions();
         return (0, alg_1.populateAndEncodeTxs)(transactions, sender, this.algorand.client.algod);
     }
     async buildRawTransactionSwap(params) {
-        const txSwapParams = (0, utils_1.prepareTxSwapParams)(this.chainType, params);
+        const txSwapParams = (0, utils_2.prepareTxSwapParams)(this.chainType, params);
         const sender = algosdk_1.Address.fromString(params.fromAccountAddress);
         const recipient = params.toAccountAddress;
         const tokenId = BigInt(params.sourceToken.tokenAddress);
@@ -117,8 +146,13 @@ class AlgBridgeService extends models_2.ChainBridgeService {
         if (!params.sourceToken.bridgeId) {
             throw new exceptions_1.SdkError("ALG sourceToken must contain 'bridgeId'");
         }
+        if (!params.sourceToken.paddingUtilId) {
+            throw new exceptions_1.SdkError("ALG sourceToken must contain 'paddingUtilId'");
+        }
         const bridgeId = BigInt(params.sourceToken.bridgeId);
         const bridge = this.getBridge(bridgeId);
+        const paddingUtilId = BigInt(params.sourceToken.paddingUtilId);
+        const paddingUtil = this.getPaddingUtil(paddingUtilId);
         const composer = this.algorand.newGroup();
         if (params.fromAccountAddress === recipient) {
             const optIn = await (0, alg_1.checkAssetOptIn)(receiveTokenId, recipient, this.algorand);
@@ -126,29 +160,31 @@ class AlgBridgeService extends models_2.ChainBridgeService {
                 composer.addAssetOptIn({ sender: sender, assetId: receiveTokenId });
             }
         }
-        composer.addAssetTransfer({
+        const assetTransfer = this.algorand.createTransaction.assetTransfer({
             assetId: tokenId,
             amount: amount,
             sender,
             receiver: bridge.appAddress,
         });
         composer.addAppCallMethodCall(await bridge.params.swap({
-            args: { tokenId, recipient, receiveTokenId, receiveAmountMin },
+            args: { assetTransferRef: assetTransfer, recipient, receiveAsset: receiveTokenId, receiveAmountMin },
             sender,
             extraFee: (0, alg_1.feeForInner)(4),
         }));
-        (0, alg_1.addBudgetNoops)({
-            composer,
-            appId: bridgeId,
+        const paddingTx = await this.algorand.createTransaction.appCall({
+            appId: paddingUtil.appId,
             sender,
-            count: 1,
         });
+        composer.addTransaction(paddingTx);
         const { transactions } = await composer.buildTransactions();
         return (0, alg_1.populateAndEncodeTxs)(transactions, sender, this.algorand.client.algod);
     }
     getBridge(appId) {
         return this.algorand.client.getTypedAppClientById(BridgeClient_1.BridgeClient, { appId });
     }
+    getPaddingUtil(appId) {
+        return this.algorand.client.getTypedAppClientById(PaddingUtilClient_1.PaddingUtilClient, { appId });
+    }
 }
 exports.AlgBridgeService = AlgBridgeService;
 //# sourceMappingURL=index.js.map

package/dist/src/services/bridge/alg/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/services/bridge/alg/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { AlgorandClient } from \"@algorandfoundation/algokit-utils\";\nimport { AlgoAmount } from \"@algorandfoundation/algokit-utils/types/amount\";\nimport algosdk, { Address } from \"algosdk\";\nimport { ChainType } from \"../../../chains/chain.enums\";\nimport { AllbridgeCoreClient } from \"../../../client/core-api/core-client-base\";\nimport { MethodNotSupportedError, SdkError } from \"../../../exceptions\";\nimport { FeePaymentMethod } from \"../../../models\";\nimport { RawTransaction, TransactionResponse } from \"../../models\";\nimport { BridgeClient } from \"../../models/alg/BridgeClient\";\nimport { addBudgetNoops, checkAssetOptIn, feeForInner, populateAndEncodeTxs } from \"../../utils/alg\";\nimport { ChainBridgeService, SendParams, SwapParams } from \"../models\";\nimport { getNonce, prepareTxSendParams, prepareTxSwapParams } from \"../utils\";\n\nexport class AlgBridgeService extends ChainBridgeService {\n  chainType: ChainType.ALG = ChainType.ALG;\n\n  constructor(\n    public algorand: AlgorandClient,\n    public api: AllbridgeCoreClient\n  ) {\n    super();\n    algorand.setDefaultSigner(\n      algosdk.makeBasicAccountTransactionSigner(\n        algosdk.mnemonicToSecretKey(\n          \"tunnel gym elevator pulse motor evolve release orange culture make sister approve winter chair armor grocery distance festival tiger holiday dish wisdom region absorb secret\"\n        )\n      )\n    );\n  }\n\n  send(_params: SendParams): Promise<TransactionResponse> {\n    throw new MethodNotSupportedError();\n  }\n\n  async buildRawTransactionSend(params: SendParams): Promise<RawTransaction> {\n    const txSendParams = await prepareTxSendParams(this.chainType, params, this.api);\n\n    if (!params.sourceToken.bridgeId) {\n      throw new SdkError(\"ALG sourceToken must contain 'bridgeId'\");\n    }\n    const bridgeId = BigInt(params.sourceToken.bridgeId);\n    const bridge = this.getBridge(bridgeId);\n    const sender = Address.fromString(params.fromAccountAddress);\n    const tokenId = BigInt(params.sourceToken.tokenAddress);\n    const destinationChainId = txSendParams.toChainId;\n    const recipient = txSendParams.toAccountAddress;\n    const receiveToken = txSendParams.toTokenAddress;\n    const nonce = getNonce();\n    const amount = BigInt(txSendParams.amount);\n\n    let totalFee = BigInt(txSendParams.fee);\n    if (txSendParams.extraGas) {\n      totalFee = totalFee + BigInt(txSendParams.extraGas);\n    }\n    const isPayWithStable = txSendParams.gasFeePaymentMethod === FeePaymentMethod.WITH_STABLECOIN;\n\n    const composer = this.algorand.newGroup();\n\n    let feeTokenAmount: bigint;\n    if (isPayWithStable) {\n      feeTokenAmount = totalFee;\n    } else {\n      composer.addPayment({\n        sender,\n        receiver: bridge.appAddress,\n        amount: AlgoAmount.MicroAlgo(totalFee),\n      });\n      feeTokenAmount = 0n;\n    }\n    composer\n      .addAssetTransfer({\n        assetId: tokenId,\n        amount,\n        sender,\n        receiver: bridge.appAddress,\n      })\n      .addAppCallMethodCall(\n        await bridge.params.swapAndBridge({\n          args: {\n            tokenId,\n            recipient,\n            destinationChainId,\n            receiveToken,\n            nonce,\n            feeTokenAmount,\n          },\n          sender,\n          extraFee: feeForInner(isPayWithStable ? 9 : 8),\n        })\n      );\n    addBudgetNoops({\n      composer,\n      appId: bridgeId,\n      sender,\n      count: isPayWithStable ? 3 : 2,\n    });\n    const { transactions } = await composer.buildTransactions();\n    return populateAndEncodeTxs(transactions, sender, this.algorand.client.algod);\n  }\n\n  async buildRawTransactionSwap(params: SwapParams): Promise<RawTransaction> {\n    const txSwapParams = prepareTxSwapParams(this.chainType, params);\n\n    const sender = Address.fromString(params.fromAccountAddress);\n    const recipient = params.toAccountAddress;\n    const tokenId = BigInt(params.sourceToken.tokenAddress);\n    const receiveTokenId = BigInt(params.destinationToken.tokenAddress);\n    const receiveAmountMin = BigInt(txSwapParams.minimumReceiveAmount);\n    const amount = BigInt(txSwapParams.amount);\n\n    if (!params.sourceToken.bridgeId) {\n      throw new SdkError(\"ALG sourceToken must contain 'bridgeId'\");\n    }\n    const bridgeId = BigInt(params.sourceToken.bridgeId);\n    const bridge = this.getBridge(bridgeId);\n\n    const composer = this.algorand.newGroup();\n\n    if (params.fromAccountAddress === recipient) {\n      const optIn = await checkAssetOptIn(receiveTokenId, recipient, this.algorand);\n      if (!optIn) {\n        composer.addAssetOptIn({ sender: sender, assetId: receiveTokenId });\n      }\n    }\n\n    composer.addAssetTransfer({\n      assetId: tokenId,\n      amount: amount,\n      sender,\n      receiver: bridge.appAddress,\n    });\n    composer.addAppCallMethodCall(\n      await bridge.params.swap({\n        args: { tokenId, recipient, receiveTokenId, receiveAmountMin },\n        sender,\n        extraFee: feeForInner(4),\n      })\n    );\n    addBudgetNoops({\n      composer,\n      appId: bridgeId,\n      sender,\n      count: 1,\n    });\n    const { transactions } = await composer.buildTransactions();\n    return populateAndEncodeTxs(transactions, sender, this.algorand.client.algod);\n  }\n\n  private getBridge(appId: bigint): BridgeClient {\n    return this.algorand.client.getTypedAppClientById(BridgeClient, { appId });\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/services/bridge/alg/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { AlgorandClient } from \"@algorandfoundation/algokit-utils\";\nimport { AlgoAmount } from \"@algorandfoundation/algokit-utils/types/amount\";\nimport algosdk, { Address } from \"algosdk\";\nimport { ChainType } from \"../../../chains/chain.enums\";\nimport { AllbridgeCoreClient } from \"../../../client/core-api/core-client-base\";\nimport { MethodNotSupportedError, SdkError } from \"../../../exceptions\";\nimport { FeePaymentMethod } from \"../../../models\";\nimport { assertNever } from \"../../../utils/utils\";\nimport { RawTransaction, TransactionResponse } from \"../../models\";\nimport { BridgeClient } from \"../../models/alg/BridgeClient\";\nimport { PaddingUtilClient } from \"../../models/alg/PaddingUtilClient\";\nimport { checkAssetOptIn, feeForInner, populateAndEncodeTxs } from \"../../utils/alg\";\nimport { ChainBridgeService, SendParams, SwapParams } from \"../models\";\nimport { getNonce, prepareTxSendParams, prepareTxSwapParams } from \"../utils\";\n\nexport class AlgBridgeService extends ChainBridgeService {\n  chainType: ChainType.ALG = ChainType.ALG;\n\n  constructor(\n    public algorand: AlgorandClient,\n    public api: AllbridgeCoreClient\n  ) {\n    super();\n    algorand.setDefaultSigner(\n      algosdk.makeBasicAccountTransactionSigner(\n        algosdk.mnemonicToSecretKey(\n          \"tunnel gym elevator pulse motor evolve release orange culture make sister approve winter chair armor grocery distance festival tiger holiday dish wisdom region absorb secret\"\n        )\n      )\n    );\n  }\n\n  send(_params: SendParams): Promise<TransactionResponse> {\n    throw new MethodNotSupportedError();\n  }\n\n  async buildRawTransactionSend(params: SendParams): Promise<RawTransaction> {\n    const txSendParams = await prepareTxSendParams(this.chainType, params, this.api);\n\n    if (!params.sourceToken.bridgeId) {\n      throw new SdkError(\"ALG sourceToken must contain 'bridgeId'\");\n    }\n    if (!params.sourceToken.paddingUtilId) {\n      throw new SdkError(\"ALG sourceToken must contain 'paddingUtilId'\");\n    }\n    const bridgeId = BigInt(params.sourceToken.bridgeId);\n    const bridge = this.getBridge(bridgeId);\n    const paddingUtilId = BigInt(params.sourceToken.paddingUtilId);\n    const paddingUtil = this.getPaddingUtil(paddingUtilId);\n    const sender = Address.fromString(params.fromAccountAddress);\n    const tokenId = BigInt(params.sourceToken.tokenAddress);\n    const destinationChainId = txSendParams.toChainId;\n    const recipient = txSendParams.toAccountAddress;\n    const receiveToken = txSendParams.toTokenAddress;\n    const nonce = getNonce();\n    const amount = BigInt(txSendParams.amount);\n\n    let totalFee = BigInt(txSendParams.fee);\n    if (txSendParams.extraGas) {\n      totalFee = totalFee + BigInt(txSendParams.extraGas);\n    }\n\n    const composer = this.algorand.newGroup();\n\n    const assetTransferTx = await this.algorand.createTransaction.assetTransfer({\n      amount,\n      assetId: tokenId,\n      receiver: bridge.appAddress,\n      sender,\n    });\n\n    switch (txSendParams.gasFeePaymentMethod) {\n      case FeePaymentMethod.WITH_NATIVE_CURRENCY: {\n        const paymentTx = await this.algorand.createTransaction.payment({\n          amount: AlgoAmount.MicroAlgo(totalFee),\n          receiver: bridge.appAddress,\n          sender,\n        });\n        composer.addAppCallMethodCall(\n          await bridge.params.swapAndBridge({\n            args: {\n              paymentRef: paymentTx,\n              assetTransferRef: assetTransferTx,\n              recipient,\n              destinationChainId,\n              receiveToken,\n              nonce,\n            },\n            sender,\n            extraFee: feeForInner(8),\n          })\n        );\n        break;\n      }\n      case FeePaymentMethod.WITH_STABLECOIN: {\n        composer.addAppCallMethodCall(\n          await bridge.params.swapAndBridgeWithStable({\n            args: {\n              assetTransferRef: assetTransferTx,\n              recipient,\n              destinationChainId,\n              receiveToken,\n              nonce,\n              feeTokenAmount: totalFee,\n            },\n            sender,\n            extraFee: feeForInner(9),\n          })\n        );\n        const paddingTx = await this.algorand.createTransaction.appCall({\n          appId: paddingUtil.appId,\n          sender,\n          note: \"padding_1\",\n        });\n        composer.addTransaction(paddingTx);\n        break;\n      }\n      case FeePaymentMethod.WITH_ARB:\n        throw new SdkError(\"ALG bridge does not support ARB0 payment method\");\n      default: {\n        return assertNever(txSendParams.gasFeePaymentMethod, \"Unhandled FeePaymentMethod\");\n      }\n    }\n\n    const paddingTx = await this.algorand.createTransaction.appCall({\n      appId: paddingUtil.appId,\n      sender,\n      note: \"padding\",\n    });\n    composer.addTransaction(paddingTx);\n\n    const { transactions } = await composer.buildTransactions();\n    return populateAndEncodeTxs(transactions, sender, this.algorand.client.algod);\n  }\n\n  async buildRawTransactionSwap(params: SwapParams): Promise<RawTransaction> {\n    const txSwapParams = prepareTxSwapParams(this.chainType, params);\n\n    const sender = Address.fromString(params.fromAccountAddress);\n    const recipient = params.toAccountAddress;\n    const tokenId = BigInt(params.sourceToken.tokenAddress);\n    const receiveTokenId = BigInt(params.destinationToken.tokenAddress);\n    const receiveAmountMin = BigInt(txSwapParams.minimumReceiveAmount);\n    const amount = BigInt(txSwapParams.amount);\n\n    if (!params.sourceToken.bridgeId) {\n      throw new SdkError(\"ALG sourceToken must contain 'bridgeId'\");\n    }\n    if (!params.sourceToken.paddingUtilId) {\n      throw new SdkError(\"ALG sourceToken must contain 'paddingUtilId'\");\n    }\n    const bridgeId = BigInt(params.sourceToken.bridgeId);\n    const bridge = this.getBridge(bridgeId);\n    const paddingUtilId = BigInt(params.sourceToken.paddingUtilId);\n    const paddingUtil = this.getPaddingUtil(paddingUtilId);\n\n    const composer = this.algorand.newGroup();\n\n    if (params.fromAccountAddress === recipient) {\n      const optIn = await checkAssetOptIn(receiveTokenId, recipient, this.algorand);\n      if (!optIn) {\n        composer.addAssetOptIn({ sender: sender, assetId: receiveTokenId });\n      }\n    }\n\n    const assetTransfer = this.algorand.createTransaction.assetTransfer({\n      assetId: tokenId,\n      amount: amount,\n      sender,\n      receiver: bridge.appAddress,\n    });\n    composer.addAppCallMethodCall(\n      await bridge.params.swap({\n        args: { assetTransferRef: assetTransfer, recipient, receiveAsset: receiveTokenId, receiveAmountMin },\n        sender,\n        extraFee: feeForInner(4),\n      })\n    );\n    const paddingTx = await this.algorand.createTransaction.appCall({\n      appId: paddingUtil.appId,\n      sender,\n    });\n    composer.addTransaction(paddingTx);\n    const { transactions } = await composer.buildTransactions();\n    return populateAndEncodeTxs(transactions, sender, this.algorand.client.algod);\n  }\n\n  private getBridge(appId: bigint): BridgeClient {\n    return this.algorand.client.getTypedAppClientById(BridgeClient, { appId });\n  }\n\n  private getPaddingUtil(appId: bigint): PaddingUtilClient {\n    return this.algorand.client.getTypedAppClientById(PaddingUtilClient, { appId });\n  }\n}\n"]}

package/dist/src/services/bridge/evm/index.d.ts

@@ -19,4 +19,5 @@ export declare class EvmBridgeService extends ChainBridgeService {
     private getBridgeContract;
     private getCctpBridgeContract;
     private getOftBridgeContract;
+    private getAbrPayerContract;
 }

package/dist/src/services/bridge/evm/index.js

@@ -5,13 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvmBridgeService = void 0;
 const big_js_1 = require("big.js");
+const chains_1 = require("../../../chains");
 const models_1 = require("../../../models");
+const calculation_1 = require("../../../utils/calculation");
+const utils_1 = require("../../../utils/utils");
 const Bridge_1 = __importDefault(require("../../models/abi/Bridge"));
 const CctpBridge_1 = __importDefault(require("../../models/abi/CctpBridge"));
 const OftBridge_1 = __importDefault(require("../../models/abi/OftBridge"));
+const PayerWithAbr_1 = __importDefault(require("../../models/abi/PayerWithAbr"));
 const get_cctp_sol_token_recipient_address_1 = require("../get-cctp-sol-token-recipient-address");
 const models_2 = require("../models");
-const utils_1 = require("../utils");
+const utils_2 = require("../utils");
 class EvmBridgeService extends models_2.ChainBridgeService {
     web3;
     api;
@@ -28,7 +32,7 @@ class EvmBridgeService extends models_2.ChainBridgeService {
         return this.sendRawTransaction(rawTransaction);
     }
     async buildRawTransactionSwap(params) {
-        const txSwapParams = (0, utils_1.prepareTxSwapParams)(this.chainType, params);
+        const txSwapParams = (0, utils_2.prepareTxSwapParams)(this.chainType, params);
         return await this.buildRawTransactionSwapFromParams(txSwapParams);
     }
     async buildRawTransactionSwapFromParams(params) {
@@ -42,15 +46,27 @@ class EvmBridgeService extends models_2.ChainBridgeService {
         });
     }
     async buildRawTransactionSend(params) {
-        const txSendParams = await (0, utils_1.prepareTxSendParams)(this.chainType, params, this.api);
-        const { amount, contractAddress, fromAccountAddress, fromTokenAddress, toChainId, toAccountAddress, toTokenAddress, messenger, fee, gasFeePaymentMethod, extraGas, extraGasDest, } = txSendParams;
-        const nonce = "0x" + (0, utils_1.getNonce)().toString("hex");
+        const txSendParams = await (0, utils_2.prepareTxSendParams)(this.chainType, params, this.api);
+        const { amount, contractAddress, fromAccountAddress, fromTokenAddress, toChainId, toAccountAddress, toTokenAddress, messenger, fee, gasFeePaymentMethod, extraGas, extraGasDest, abrExchangeRate, } = txSendParams;
+        const nonce = "0x" + (0, utils_2.getNonce)().toString("hex");
         let sendMethod;
         let value;
         let totalFee = fee;
         if (extraGas) {
             totalFee = (0, big_js_1.Big)(totalFee).plus(extraGas).toFixed();
         }
+        let totalFeeInAbr;
+        if (gasFeePaymentMethod === models_1.FeePaymentMethod.WITH_ARB) {
+            if (!abrExchangeRate) {
+                throw new models_1.SdkError("Cannot find 'abrExchangeRate' for ARB0 payment method");
+            }
+            if (!params.sourceToken.abrPayer) {
+                throw new models_1.SdkError("Source token must contain 'abrPayer' for ARB0 payment method");
+            }
+            totalFeeInAbr = totalFee;
+            const totalFeeInNativeRaw = (0, big_js_1.Big)(totalFee).div(abrExchangeRate);
+            totalFee = (0, calculation_1.convertAmountPrecision)(totalFeeInNativeRaw, params.sourceToken.abrPayer.abrToken.decimals, chains_1.Chains.getChainDecimalsByType(params.sourceToken.chainType)).toFixed();
+        }
         switch (messenger) {
             case models_1.Messenger.CCTP:
             case models_1.Messenger.CCTP_V2: {
@@ -69,17 +85,44 @@ class EvmBridgeService extends models_2.ChainBridgeService {
             case models_1.Messenger.WORMHOLE:
                 {
                     const bridgeContract = this.getBridgeContract(contractAddress);
-                    if (gasFeePaymentMethod === models_1.FeePaymentMethod.WITH_STABLECOIN) {
-                        sendMethod = bridgeContract.methods.swapAndBridge(fromTokenAddress, amount, toAccountAddress, toChainId, toTokenAddress, nonce, messenger, totalFee);
-                        value = "0";
-                    }
-                    else {
-                        sendMethod = bridgeContract.methods.swapAndBridge(fromTokenAddress, amount, toAccountAddress, toChainId, toTokenAddress, nonce, messenger, 0);
-                        value = totalFee;
+                    switch (gasFeePaymentMethod) {
+                        case models_1.FeePaymentMethod.WITH_ARB:
+                        case models_1.FeePaymentMethod.WITH_NATIVE_CURRENCY: {
+                            sendMethod = bridgeContract.methods.swapAndBridge(fromTokenAddress, amount, toAccountAddress, toChainId, toTokenAddress, nonce, messenger, 0);
+                            value = totalFee;
+                            break;
+                        }
+                        case models_1.FeePaymentMethod.WITH_STABLECOIN: {
+                            sendMethod = bridgeContract.methods.swapAndBridge(fromTokenAddress, amount, toAccountAddress, toChainId, toTokenAddress, nonce, messenger, totalFee);
+                            value = "0";
+                            break;
+                        }
+                        default: {
+                            return (0, utils_1.assertNever)(gasFeePaymentMethod, "Unhandled FeePaymentMethod");
+                        }
                     }
                 }
                 break;
         }
+        if (gasFeePaymentMethod === models_1.FeePaymentMethod.WITH_ARB) {
+            if (!params.sourceToken.abrPayer) {
+                throw new models_1.SdkError("Source token must contain 'abrPayer' for ARB0 payment method");
+            }
+            const abrPayerAddress = params.sourceToken.abrPayer.payerAddress;
+            if (!totalFeeInAbr) {
+                throw new models_1.SdkError("Failed to calculate totalFeeInAbr");
+            }
+            const abrPayerContract = this.getAbrPayerContract(abrPayerAddress);
+            const abi = sendMethod.encodeABI();
+            const withoutSelector = "0x" + abi.slice(10);
+            sendMethod = abrPayerContract.methods.transferTokensAndCallTarget(params.sourceToken.tokenAddress, amount, totalFeeInAbr, messenger, withoutSelector);
+            return Promise.resolve({
+                from: fromAccountAddress,
+                to: abrPayerAddress,
+                value: "0",
+                data: sendMethod.encodeABI(),
+            });
+        }
         return Promise.resolve({
             from: fromAccountAddress,
             to: contractAddress,
@@ -94,23 +137,39 @@ class EvmBridgeService extends models_2.ChainBridgeService {
         let value;
         if (params.destinationToken.chainType === models_1.ChainType.SOLANA) {
             const recipient = await (0, get_cctp_sol_token_recipient_address_1.getCctpSolTokenRecipientAddress)(this.chainType, params.toAccountAddress, params.destinationToken.tokenAddress, this.nodeRpcUrlsConfig.getNodeRpcUrl(models_1.ChainSymbol.SOL));
-            if (gasFeePaymentMethod === models_1.FeePaymentMethod.WITH_STABLECOIN) {
-                sendMethod = cctpBridgeContract.methods.bridgeWithWalletAddress(amount, recipient, toAccountAddress, toChainId, totalFee);
-                value = "0";
-            }
-            else {
-                sendMethod = cctpBridgeContract.methods.bridgeWithWalletAddress(amount, recipient, toAccountAddress, toChainId, 0);
-                value = totalFee;
+            switch (gasFeePaymentMethod) {
+                case models_1.FeePaymentMethod.WITH_ARB:
+                case models_1.FeePaymentMethod.WITH_NATIVE_CURRENCY: {
+                    sendMethod = cctpBridgeContract.methods.bridgeWithWalletAddress(amount, recipient, toAccountAddress, toChainId, 0);
+                    value = totalFee;
+                    break;
+                }
+                case models_1.FeePaymentMethod.WITH_STABLECOIN: {
+                    sendMethod = cctpBridgeContract.methods.bridgeWithWalletAddress(amount, recipient, toAccountAddress, toChainId, totalFee);
+                    value = "0";
+                    break;
+                }
+                default: {
+                    return (0, utils_1.assertNever)(gasFeePaymentMethod, "Unhandled FeePaymentMethod");
+                }
             }
         }
         else {
-            if (gasFeePaymentMethod === models_1.FeePaymentMethod.WITH_STABLECOIN) {
-                sendMethod = cctpBridgeContract.methods.bridge(amount, toAccountAddress, toChainId, totalFee);
-                value = "0";
-            }
-            else {
-                sendMethod = cctpBridgeContract.methods.bridge(amount, toAccountAddress, toChainId, 0);
-                value = totalFee;
+            switch (gasFeePaymentMethod) {
+                case models_1.FeePaymentMethod.WITH_ARB:
+                case models_1.FeePaymentMethod.WITH_NATIVE_CURRENCY: {
+                    sendMethod = cctpBridgeContract.methods.bridge(amount, toAccountAddress, toChainId, 0);
+                    value = totalFee;
+                    break;
+                }
+                case models_1.FeePaymentMethod.WITH_STABLECOIN: {
+                    sendMethod = cctpBridgeContract.methods.bridge(amount, toAccountAddress, toChainId, totalFee);
+                    value = "0";
+                    break;
+                }
+                default: {
+                    return (0, utils_1.assertNever)(gasFeePaymentMethod, "Unhandled FeePaymentMethod");
+                }
             }
         }
         return { sendMethod, value };
@@ -120,13 +179,21 @@ class EvmBridgeService extends models_2.ChainBridgeService {
         const oftBridgeContract = this.getOftBridgeContract(contractAddress);
         let sendMethod;
         let value;
-        if (gasFeePaymentMethod === models_1.FeePaymentMethod.WITH_STABLECOIN) {
-            sendMethod = oftBridgeContract.methods.bridge(params.sourceToken.tokenAddress, amount, toAccountAddress, toChainId, totalFee, extraGasDest ?? "0", "10");
-            value = "0";
-        }
-        else {
-            sendMethod = oftBridgeContract.methods.bridge(params.sourceToken.tokenAddress, amount, toAccountAddress, toChainId, 0, extraGasDest ?? "0", "10");
-            value = totalFee;
+        switch (gasFeePaymentMethod) {
+            case models_1.FeePaymentMethod.WITH_ARB:
+            case models_1.FeePaymentMethod.WITH_NATIVE_CURRENCY: {
+                sendMethod = oftBridgeContract.methods.bridge(params.sourceToken.tokenAddress, amount, toAccountAddress, toChainId, 0, extraGasDest ?? "0", "10");
+                value = totalFee;
+                break;
+            }
+            case models_1.FeePaymentMethod.WITH_STABLECOIN: {
+                sendMethod = oftBridgeContract.methods.bridge(params.sourceToken.tokenAddress, amount, toAccountAddress, toChainId, totalFee, extraGasDest ?? "0", "10");
+                value = "0";
+                break;
+            }
+            default: {
+                return (0, utils_1.assertNever)(gasFeePaymentMethod, "Unhandled FeePaymentMethod");
+            }
         }
         return { sendMethod, value };
     }
@@ -151,6 +218,9 @@ class EvmBridgeService extends models_2.ChainBridgeService {
     getOftBridgeContract(contractAddress) {
         return new this.web3.eth.Contract(OftBridge_1.default.abi, contractAddress);
     }
+    getAbrPayerContract(contractAddress) {
+        return new this.web3.eth.Contract(PayerWithAbr_1.default.abi, contractAddress);
+    }
 }
 exports.EvmBridgeService = EvmBridgeService;
 //# sourceMappingURL=index.js.map

package/dist/src/services/bridge/evm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/services/bridge/evm/index.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA6B;AAK7B,4CAQyB;AAGzB,qEAA6C;AAC7C,6EAAqD;AACrD,2EAAmD;AACnD,kGAA0F;AAC1F,sCAA6F;AAC7F,oCAA8E;AAE9E,MAAa,gBAAiB,SAAQ,2BAAkB;IAI7C;IACA;IACC;IALV,SAAS,GAAkB,kBAAS,CAAC,GAAG,CAAC;IAEzC,YACS,IAAmB,EACnB,GAAwB,EACvB,iBAAoC;QAE5C,KAAK,EAAE,CAAC;QAJD,SAAI,GAAJ,IAAI,CAAe;QACnB,QAAG,GAAH,GAAG,CAAqB;QACvB,sBAAiB,GAAjB,iBAAiB,CAAmB;IAG9C,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAkB;QAC3B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,MAAkB;QAC9C,MAAM,YAAY,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACjE,OAAO,MAAM,IAAI,CAAC,iCAAiC,CAAC,YAAY,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,iCAAiC,CAAC,MAAuB;QAC7D,MAAM,EACJ,MAAM,EACN,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,oBAAoB,GACrB,GAAG,MAAM,CAAC;QAEX,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAE/D,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAC5C,MAAM,EACN,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,oBAAoB,CACrB,CAAC;QAEF,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,kBAAkB;YACxB,EAAE,EAAE,eAAe;YACnB,IAAI,EAAE,UAAU,CAAC,SAAS,EAAE;SAC7B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,MAAkB;QAC9C,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAmB,EAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACjF,MAAM,EACJ,MAAM,EACN,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,SAAS,EACT,GAAG,EACH,mBAAmB,EACnB,QAAQ,EACR,YAAY,GACb,GAAG,YAAY,CAAC;QAEjB,MAAM,KAAK,GAAG,IAAI,GAAG,IAAA,gBAAQ,GAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,UAA+B,CAAC;QACpC,IAAI,KAAa,CAAC;QAElB,IAAI,QAAQ,GAAG,GAAG,CAAC;QACnB,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,GAAG,IAAA,YAAG,EAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;QACpD,CAAC;QAED,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,kBAAS,CAAC,IAAI,CAAC;YACpB,KAAK,kBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBACvB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;gBACpF,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;gBAC7B,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;gBACnB,MAAM;YACR,CAAC;YACD,KAAK,kBAAS,CAAC,GAAG,CAAC,CAAC,CAAC;gBACnB,MAAM,GAAG,GAAG,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;gBAC1F,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;gBAC5B,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;gBAClB,MAAM;YACR,CAAC;YACD,KAAK,kBAAS,CAAC,SAAS,CAAC;YACzB,KAAK,kBAAS,CAAC,QAAQ;gBACrB,CAAC;oBACC,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;oBAC/D,IAAI,mBAAmB,KAAK,yBAAgB,CAAC,eAAe,EAAE,CAAC;wBAC7D,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,aAAa,CAC/C,gBAAgB,EAChB,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,cAAc,EACd,KAAK,EACL,SAAS,EACT,QAAQ,CACT,CAAC;wBACF,KAAK,GAAG,GAAG,CAAC;oBACd,CAAC;yBAAM,CAAC;wBACN,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,aAAa,CAC/C,gBAAgB,EAChB,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,cAAc,EACd,KAAK,EACL,SAAS,EACT,CAAC,CACF,CAAC;wBACF,KAAK,GAAG,QAAQ,CAAC;oBACnB,CAAC;gBACH,CAAC;gBACD,MAAM;QACV,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,kBAAkB;YACxB,EAAE,EAAE,eAAe;YACnB,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,UAAU,CAAC,SAAS,EAAE;SAC7B,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACvC,MAAkB,EAClB,YAA6B,EAC7B,QAAgB;QAKhB,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,GAAG,YAAY,CAAC;QAEnG,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;QACvE,IAAI,UAA+B,CAAC;QACpC,IAAI,KAAa,CAAC;QAElB,IAAI,MAAM,CAAC,gBAAgB,CAAC,SAAS,KAAK,kBAAS,CAAC,MAAM,EAAE,CAAC;YAC3D,MAAM,SAAS,GAAG,MAAM,IAAA,sEAA+B,EACrD,IAAI,CAAC,SAAS,EACd,MAAM,CAAC,gBAAgB,EACvB,MAAM,CAAC,gBAAgB,CAAC,YAAY,EACpC,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,oBAAW,CAAC,GAAG,CAAC,CACtD,CAAC;YAEF,IAAI,mBAAmB,KAAK,yBAAgB,CAAC,eAAe,EAAE,CAAC;gBAC7D,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,uBAAuB,CAC7D,MAAM,EACN,SAAS,EACT,gBAAgB,EAChB,SAAS,EACT,QAAQ,CACT,CAAC;gBACF,KAAK,GAAG,GAAG,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,uBAAuB,CAC7D,MAAM,EACN,SAAS,EACT,gBAAgB,EAChB,SAAS,EACT,CAAC,CACF,CAAC;gBACF,KAAK,GAAG,QAAQ,CAAC;YACnB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,mBAAmB,KAAK,yBAAgB,CAAC,eAAe,EAAE,CAAC;gBAC7D,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAC9F,KAAK,GAAG,GAAG,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;gBACvF,KAAK,GAAG,QAAQ,CAAC;YACnB,CAAC;QACH,CAAC;QACD,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAC/B,CAAC;IAEO,0BAA0B,CAChC,MAAkB,EAClB,YAA6B,EAC7B,QAAgB,EAChB,YAAqB;QAKrB,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,GAAG,YAAY,CAAC;QAEnG,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;QACrE,IAAI,UAA+B,CAAC;QACpC,IAAI,KAAa,CAAC;QAElB,IAAI,mBAAmB,KAAK,yBAAgB,CAAC,eAAe,EAAE,CAAC;YAC7D,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAC3C,MAAM,CAAC,WAAW,CAAC,YAAY,EAC/B,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,QAAQ,EACR,YAAY,IAAI,GAAG,EACnB,IAAI,CACL,CAAC;YACF,KAAK,GAAG,GAAG,CAAC;QACd,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAC3C,MAAM,CAAC,WAAW,CAAC,YAAY,EAC/B,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,CAAC,EACD,YAAY,IAAI,GAAG,EACnB,IAAI,CACL,CAAC;YACF,KAAK,GAAG,QAAQ,CAAC;QACnB,CAAC;QAED,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,cAA8B;QAC7D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,cAAiC,CAAC,CAAC;QAEvF,8DAA8D;QAC9D,kBAAkB;QAClB,MAAM,UAAU,GAAyF,EAAE,oBAAoB,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QAC5J,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC;YAC9D,GAAI,cAAyB;YAC7B,GAAG,EAAE,WAAW;YAChB,GAAG,UAAU;SACK,CAAC,CAAC;QACtB,OAAO,EAAE,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC9C,CAAC;IAEO,iBAAiB,CAAC,eAAuB;QAC/C,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAM,CAAC,GAAG,EAAE,eAAe,CAAgC,CAAC;IAChG,CAAC;IAEO,qBAAqB,CAAC,eAAuB;QACnD,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,oBAAU,CAAC,GAAG,EAAE,eAAe,CAAoC,CAAC;IACxG,CAAC;IAEO,oBAAoB,CAAC,eAAuB;QAClD,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,mBAAS,CAAC,GAAG,EAAE,eAAe,CAAmC,CAAC;IACtG,CAAC;CACF;AA1PD,4CA0PC","sourcesContent":["import { Big } from \"big.js\";\nimport BN from \"bn.js\";\nimport { Contract, Transaction as Web3Transaction } from \"web3\";\nimport { PayableMethodObject } from \"web3-eth-contract\";\nimport { AllbridgeCoreClient } from \"../../../client/core-api/core-client-base\";\nimport {\n  ChainSymbol,\n  ChainType,\n  EssentialWeb3,\n  FeePaymentMethod,\n  Messenger,\n  SwapParams,\n  TransactionResponse,\n} from \"../../../models\";\nimport { NodeRpcUrlsConfig } from \"../../index\";\nimport { RawTransaction } from \"../../models\";\nimport Bridge from \"../../models/abi/Bridge\";\nimport CctpBridge from \"../../models/abi/CctpBridge\";\nimport OftBridge from \"../../models/abi/OftBridge\";\nimport { getCctpSolTokenRecipientAddress } from \"../get-cctp-sol-token-recipient-address\";\nimport { ChainBridgeService, SendParams, TxSendParamsEvm, TxSwapParamsEvm } from \"../models\";\nimport { getNonce, prepareTxSendParams, prepareTxSwapParams } from \"../utils\";\n\nexport class EvmBridgeService extends ChainBridgeService {\n  chainType: ChainType.EVM = ChainType.EVM;\n\n  constructor(\n    public web3: EssentialWeb3,\n    public api: AllbridgeCoreClient,\n    private nodeRpcUrlsConfig: NodeRpcUrlsConfig\n  ) {\n    super();\n  }\n\n  async send(params: SendParams): Promise<TransactionResponse> {\n    const rawTransaction = await this.buildRawTransactionSend(params);\n    return this.sendRawTransaction(rawTransaction);\n  }\n\n  async buildRawTransactionSwap(params: SwapParams): Promise<RawTransaction> {\n    const txSwapParams = prepareTxSwapParams(this.chainType, params);\n    return await this.buildRawTransactionSwapFromParams(txSwapParams);\n  }\n\n  async buildRawTransactionSwapFromParams(params: TxSwapParamsEvm): Promise<RawTransaction> {\n    const {\n      amount,\n      contractAddress,\n      fromAccountAddress,\n      fromTokenAddress,\n      toAccountAddress,\n      toTokenAddress,\n      minimumReceiveAmount,\n    } = params;\n\n    const bridgeContract = this.getBridgeContract(contractAddress);\n\n    const swapMethod = bridgeContract.methods.swap(\n      amount,\n      fromTokenAddress,\n      toTokenAddress,\n      toAccountAddress,\n      minimumReceiveAmount\n    );\n\n    return Promise.resolve({\n      from: fromAccountAddress,\n      to: contractAddress,\n      data: swapMethod.encodeABI(),\n    });\n  }\n\n  async buildRawTransactionSend(params: SendParams): Promise<RawTransaction> {\n    const txSendParams = await prepareTxSendParams(this.chainType, params, this.api);\n    const {\n      amount,\n      contractAddress,\n      fromAccountAddress,\n      fromTokenAddress,\n      toChainId,\n      toAccountAddress,\n      toTokenAddress,\n      messenger,\n      fee,\n      gasFeePaymentMethod,\n      extraGas,\n      extraGasDest,\n    } = txSendParams;\n\n    const nonce = \"0x\" + getNonce().toString(\"hex\");\n    let sendMethod: PayableMethodObject;\n    let value: string;\n\n    let totalFee = fee;\n    if (extraGas) {\n      totalFee = Big(totalFee).plus(extraGas).toFixed();\n    }\n\n    switch (messenger) {\n      case Messenger.CCTP:\n      case Messenger.CCTP_V2: {\n        const cctp = await this.buildRawTransactionCctpSend(params, txSendParams, totalFee);\n        sendMethod = cctp.sendMethod;\n        value = cctp.value;\n        break;\n      }\n      case Messenger.OFT: {\n        const oft = this.buildRawTransactionOftSend(params, txSendParams, totalFee, extraGasDest);\n        sendMethod = oft.sendMethod;\n        value = oft.value;\n        break;\n      }\n      case Messenger.ALLBRIDGE:\n      case Messenger.WORMHOLE:\n        {\n          const bridgeContract = this.getBridgeContract(contractAddress);\n          if (gasFeePaymentMethod === FeePaymentMethod.WITH_STABLECOIN) {\n            sendMethod = bridgeContract.methods.swapAndBridge(\n              fromTokenAddress,\n              amount,\n              toAccountAddress,\n              toChainId,\n              toTokenAddress,\n              nonce,\n              messenger,\n              totalFee\n            );\n            value = \"0\";\n          } else {\n            sendMethod = bridgeContract.methods.swapAndBridge(\n              fromTokenAddress,\n              amount,\n              toAccountAddress,\n              toChainId,\n              toTokenAddress,\n              nonce,\n              messenger,\n              0\n            );\n            value = totalFee;\n          }\n        }\n        break;\n    }\n\n    return Promise.resolve({\n      from: fromAccountAddress,\n      to: contractAddress,\n      value: value,\n      data: sendMethod.encodeABI(),\n    });\n  }\n\n  private async buildRawTransactionCctpSend(\n    params: SendParams,\n    txSendParams: TxSendParamsEvm,\n    totalFee: string\n  ): Promise<{\n    sendMethod: PayableMethodObject;\n    value: string;\n  }> {\n    const { amount, contractAddress, toChainId, toAccountAddress, gasFeePaymentMethod } = txSendParams;\n\n    const cctpBridgeContract = this.getCctpBridgeContract(contractAddress);\n    let sendMethod: PayableMethodObject;\n    let value: string;\n\n    if (params.destinationToken.chainType === ChainType.SOLANA) {\n      const recipient = await getCctpSolTokenRecipientAddress(\n        this.chainType,\n        params.toAccountAddress,\n        params.destinationToken.tokenAddress,\n        this.nodeRpcUrlsConfig.getNodeRpcUrl(ChainSymbol.SOL)\n      );\n\n      if (gasFeePaymentMethod === FeePaymentMethod.WITH_STABLECOIN) {\n        sendMethod = cctpBridgeContract.methods.bridgeWithWalletAddress(\n          amount,\n          recipient,\n          toAccountAddress,\n          toChainId,\n          totalFee\n        );\n        value = \"0\";\n      } else {\n        sendMethod = cctpBridgeContract.methods.bridgeWithWalletAddress(\n          amount,\n          recipient,\n          toAccountAddress,\n          toChainId,\n          0\n        );\n        value = totalFee;\n      }\n    } else {\n      if (gasFeePaymentMethod === FeePaymentMethod.WITH_STABLECOIN) {\n        sendMethod = cctpBridgeContract.methods.bridge(amount, toAccountAddress, toChainId, totalFee);\n        value = \"0\";\n      } else {\n        sendMethod = cctpBridgeContract.methods.bridge(amount, toAccountAddress, toChainId, 0);\n        value = totalFee;\n      }\n    }\n    return { sendMethod, value };\n  }\n\n  private buildRawTransactionOftSend(\n    params: SendParams,\n    txSendParams: TxSendParamsEvm,\n    totalFee: string,\n    extraGasDest?: string\n  ): {\n    sendMethod: PayableMethodObject;\n    value: string;\n  } {\n    const { amount, contractAddress, toChainId, toAccountAddress, gasFeePaymentMethod } = txSendParams;\n\n    const oftBridgeContract = this.getOftBridgeContract(contractAddress);\n    let sendMethod: PayableMethodObject;\n    let value: string;\n\n    if (gasFeePaymentMethod === FeePaymentMethod.WITH_STABLECOIN) {\n      sendMethod = oftBridgeContract.methods.bridge(\n        params.sourceToken.tokenAddress,\n        amount,\n        toAccountAddress,\n        toChainId,\n        totalFee,\n        extraGasDest ?? \"0\",\n        \"10\"\n      );\n      value = \"0\";\n    } else {\n      sendMethod = oftBridgeContract.methods.bridge(\n        params.sourceToken.tokenAddress,\n        amount,\n        toAccountAddress,\n        toChainId,\n        0,\n        extraGasDest ?? \"0\",\n        \"10\"\n      );\n      value = totalFee;\n    }\n\n    return { sendMethod, value };\n  }\n\n  private async sendRawTransaction(rawTransaction: RawTransaction) {\n    const estimateGas = await this.web3.eth.estimateGas(rawTransaction as Web3Transaction);\n\n    // @ts-expect-error DISABLE SITE SUGGESTED GAS FEE IN METAMASK\n    // prettier-ignore\n    const feeOptions: { maxPriorityFeePerGas?: number | string | BN; maxFeePerGas?: number | string | BN } = { maxPriorityFeePerGas: null, maxFeePerGas: null };\n    const { transactionHash } = await this.web3.eth.sendTransaction({\n      ...(rawTransaction as object),\n      gas: estimateGas,\n      ...feeOptions,\n    } as Web3Transaction);\n    return { txId: transactionHash.toString() };\n  }\n\n  private getBridgeContract(contractAddress: string) {\n    return new this.web3.eth.Contract(Bridge.abi, contractAddress) as Contract<typeof Bridge.abi>;\n  }\n\n  private getCctpBridgeContract(contractAddress: string) {\n    return new this.web3.eth.Contract(CctpBridge.abi, contractAddress) as Contract<typeof CctpBridge.abi>;\n  }\n\n  private getOftBridgeContract(contractAddress: string) {\n    return new this.web3.eth.Contract(OftBridge.abi, contractAddress) as Contract<typeof OftBridge.abi>;\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/services/bridge/evm/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { Big } from \"big.js\";\nimport BN from \"bn.js\";\nimport { Contract, Transaction as Web3Transaction } from \"web3\";\nimport { PayableMethodObject } from \"web3-eth-contract\";\nimport { Chains } from \"../../../chains\";\nimport { AllbridgeCoreClient } from \"../../../client/core-api/core-client-base\";\nimport {\n  ChainSymbol,\n  ChainType,\n  EssentialWeb3,\n  FeePaymentMethod,\n  Messenger,\n  SdkError,\n  SwapParams,\n  TransactionResponse,\n} from \"../../../models\";\nimport { convertAmountPrecision } from \"../../../utils/calculation\";\nimport { assertNever } from \"../../../utils/utils\";\nimport { NodeRpcUrlsConfig } from \"../../index\";\nimport { RawTransaction } from \"../../models\";\nimport Bridge from \"../../models/abi/Bridge\";\nimport CctpBridge from \"../../models/abi/CctpBridge\";\nimport OftBridge from \"../../models/abi/OftBridge\";\nimport PayerWithAbr from \"../../models/abi/PayerWithAbr\";\nimport { getCctpSolTokenRecipientAddress } from \"../get-cctp-sol-token-recipient-address\";\nimport { ChainBridgeService, SendParams, TxSendParamsEvm, TxSwapParamsEvm } from \"../models\";\nimport { getNonce, prepareTxSendParams, prepareTxSwapParams } from \"../utils\";\n\nexport class EvmBridgeService extends ChainBridgeService {\n  chainType: ChainType.EVM = ChainType.EVM;\n\n  constructor(\n    public web3: EssentialWeb3,\n    public api: AllbridgeCoreClient,\n    private nodeRpcUrlsConfig: NodeRpcUrlsConfig\n  ) {\n    super();\n  }\n\n  async send(params: SendParams): Promise<TransactionResponse> {\n    const rawTransaction = await this.buildRawTransactionSend(params);\n    return this.sendRawTransaction(rawTransaction);\n  }\n\n  async buildRawTransactionSwap(params: SwapParams): Promise<RawTransaction> {\n    const txSwapParams = prepareTxSwapParams(this.chainType, params);\n    return await this.buildRawTransactionSwapFromParams(txSwapParams);\n  }\n\n  async buildRawTransactionSwapFromParams(params: TxSwapParamsEvm): Promise<RawTransaction> {\n    const {\n      amount,\n      contractAddress,\n      fromAccountAddress,\n      fromTokenAddress,\n      toAccountAddress,\n      toTokenAddress,\n      minimumReceiveAmount,\n    } = params;\n\n    const bridgeContract = this.getBridgeContract(contractAddress);\n\n    const swapMethod = bridgeContract.methods.swap(\n      amount,\n      fromTokenAddress,\n      toTokenAddress,\n      toAccountAddress,\n      minimumReceiveAmount\n    );\n\n    return Promise.resolve({\n      from: fromAccountAddress,\n      to: contractAddress,\n      data: swapMethod.encodeABI(),\n    });\n  }\n\n  async buildRawTransactionSend(params: SendParams): Promise<RawTransaction> {\n    const txSendParams = await prepareTxSendParams(this.chainType, params, this.api);\n    const {\n      amount,\n      contractAddress,\n      fromAccountAddress,\n      fromTokenAddress,\n      toChainId,\n      toAccountAddress,\n      toTokenAddress,\n      messenger,\n      fee,\n      gasFeePaymentMethod,\n      extraGas,\n      extraGasDest,\n      abrExchangeRate,\n    } = txSendParams;\n\n    const nonce = \"0x\" + getNonce().toString(\"hex\");\n    let sendMethod: PayableMethodObject;\n    let value: string;\n\n    let totalFee = fee;\n    if (extraGas) {\n      totalFee = Big(totalFee).plus(extraGas).toFixed();\n    }\n\n    let totalFeeInAbr: string | undefined;\n    if (gasFeePaymentMethod === FeePaymentMethod.WITH_ARB) {\n      if (!abrExchangeRate) {\n        throw new SdkError(\"Cannot find 'abrExchangeRate' for ARB0 payment method\");\n      }\n      if (!params.sourceToken.abrPayer) {\n        throw new SdkError(\"Source token must contain 'abrPayer' for ARB0 payment method\");\n      }\n      totalFeeInAbr = totalFee;\n      const totalFeeInNativeRaw = Big(totalFee).div(abrExchangeRate);\n      totalFee = convertAmountPrecision(\n        totalFeeInNativeRaw,\n        params.sourceToken.abrPayer.abrToken.decimals,\n        Chains.getChainDecimalsByType(params.sourceToken.chainType)\n      ).toFixed();\n    }\n\n    switch (messenger) {\n      case Messenger.CCTP:\n      case Messenger.CCTP_V2: {\n        const cctp = await this.buildRawTransactionCctpSend(params, txSendParams, totalFee);\n        sendMethod = cctp.sendMethod;\n        value = cctp.value;\n        break;\n      }\n      case Messenger.OFT: {\n        const oft = this.buildRawTransactionOftSend(params, txSendParams, totalFee, extraGasDest);\n        sendMethod = oft.sendMethod;\n        value = oft.value;\n        break;\n      }\n      case Messenger.ALLBRIDGE:\n      case Messenger.WORMHOLE:\n        {\n          const bridgeContract = this.getBridgeContract(contractAddress);\n          switch (gasFeePaymentMethod) {\n            case FeePaymentMethod.WITH_ARB:\n            case FeePaymentMethod.WITH_NATIVE_CURRENCY: {\n              sendMethod = bridgeContract.methods.swapAndBridge(\n                fromTokenAddress,\n                amount,\n                toAccountAddress,\n                toChainId,\n                toTokenAddress,\n                nonce,\n                messenger,\n                0\n              );\n              value = totalFee;\n              break;\n            }\n            case FeePaymentMethod.WITH_STABLECOIN: {\n              sendMethod = bridgeContract.methods.swapAndBridge(\n                fromTokenAddress,\n                amount,\n                toAccountAddress,\n                toChainId,\n                toTokenAddress,\n                nonce,\n                messenger,\n                totalFee\n              );\n              value = \"0\";\n              break;\n            }\n            default: {\n              return assertNever(gasFeePaymentMethod, \"Unhandled FeePaymentMethod\");\n            }\n          }\n        }\n        break;\n    }\n\n    if (gasFeePaymentMethod === FeePaymentMethod.WITH_ARB) {\n      if (!params.sourceToken.abrPayer) {\n        throw new SdkError(\"Source token must contain 'abrPayer' for ARB0 payment method\");\n      }\n\n      const abrPayerAddress = params.sourceToken.abrPayer.payerAddress;\n\n      if (!totalFeeInAbr) {\n        throw new SdkError(\"Failed to calculate totalFeeInAbr\");\n      }\n      const abrPayerContract = this.getAbrPayerContract(abrPayerAddress);\n\n      const abi = sendMethod.encodeABI();\n      const withoutSelector = \"0x\" + abi.slice(10);\n      sendMethod = abrPayerContract.methods.transferTokensAndCallTarget(\n        params.sourceToken.tokenAddress,\n        amount,\n        totalFeeInAbr,\n        messenger,\n        withoutSelector\n      );\n\n      return Promise.resolve({\n        from: fromAccountAddress,\n        to: abrPayerAddress,\n        value: \"0\",\n        data: sendMethod.encodeABI(),\n      });\n    }\n\n    return Promise.resolve({\n      from: fromAccountAddress,\n      to: contractAddress,\n      value: value,\n      data: sendMethod.encodeABI(),\n    });\n  }\n\n  private async buildRawTransactionCctpSend(\n    params: SendParams,\n    txSendParams: TxSendParamsEvm,\n    totalFee: string\n  ): Promise<{\n    sendMethod: PayableMethodObject;\n    value: string;\n  }> {\n    const { amount, contractAddress, toChainId, toAccountAddress, gasFeePaymentMethod } = txSendParams;\n\n    const cctpBridgeContract = this.getCctpBridgeContract(contractAddress);\n    let sendMethod: PayableMethodObject;\n    let value: string;\n\n    if (params.destinationToken.chainType === ChainType.SOLANA) {\n      const recipient = await getCctpSolTokenRecipientAddress(\n        this.chainType,\n        params.toAccountAddress,\n        params.destinationToken.tokenAddress,\n        this.nodeRpcUrlsConfig.getNodeRpcUrl(ChainSymbol.SOL)\n      );\n\n      switch (gasFeePaymentMethod) {\n        case FeePaymentMethod.WITH_ARB:\n        case FeePaymentMethod.WITH_NATIVE_CURRENCY: {\n          sendMethod = cctpBridgeContract.methods.bridgeWithWalletAddress(\n            amount,\n            recipient,\n            toAccountAddress,\n            toChainId,\n            0\n          );\n          value = totalFee;\n          break;\n        }\n        case FeePaymentMethod.WITH_STABLECOIN: {\n          sendMethod = cctpBridgeContract.methods.bridgeWithWalletAddress(\n            amount,\n            recipient,\n            toAccountAddress,\n            toChainId,\n            totalFee\n          );\n          value = \"0\";\n          break;\n        }\n        default: {\n          return assertNever(gasFeePaymentMethod, \"Unhandled FeePaymentMethod\");\n        }\n      }\n    } else {\n      switch (gasFeePaymentMethod) {\n        case FeePaymentMethod.WITH_ARB:\n        case FeePaymentMethod.WITH_NATIVE_CURRENCY: {\n          sendMethod = cctpBridgeContract.methods.bridge(amount, toAccountAddress, toChainId, 0);\n          value = totalFee;\n          break;\n        }\n        case FeePaymentMethod.WITH_STABLECOIN: {\n          sendMethod = cctpBridgeContract.methods.bridge(amount, toAccountAddress, toChainId, totalFee);\n          value = \"0\";\n          break;\n        }\n        default: {\n          return assertNever(gasFeePaymentMethod, \"Unhandled FeePaymentMethod\");\n        }\n      }\n    }\n    return { sendMethod, value };\n  }\n\n  private buildRawTransactionOftSend(\n    params: SendParams,\n    txSendParams: TxSendParamsEvm,\n    totalFee: string,\n    extraGasDest?: string\n  ): {\n    sendMethod: PayableMethodObject;\n    value: string;\n  } {\n    const { amount, contractAddress, toChainId, toAccountAddress, gasFeePaymentMethod } = txSendParams;\n\n    const oftBridgeContract = this.getOftBridgeContract(contractAddress);\n    let sendMethod: PayableMethodObject;\n    let value: string;\n\n    switch (gasFeePaymentMethod) {\n      case FeePaymentMethod.WITH_ARB:\n      case FeePaymentMethod.WITH_NATIVE_CURRENCY: {\n        sendMethod = oftBridgeContract.methods.bridge(\n          params.sourceToken.tokenAddress,\n          amount,\n          toAccountAddress,\n          toChainId,\n          0,\n          extraGasDest ?? \"0\",\n          \"10\"\n        );\n        value = totalFee;\n        break;\n      }\n      case FeePaymentMethod.WITH_STABLECOIN: {\n        sendMethod = oftBridgeContract.methods.bridge(\n          params.sourceToken.tokenAddress,\n          amount,\n          toAccountAddress,\n          toChainId,\n          totalFee,\n          extraGasDest ?? \"0\",\n          \"10\"\n        );\n        value = \"0\";\n        break;\n      }\n      default: {\n        return assertNever(gasFeePaymentMethod, \"Unhandled FeePaymentMethod\");\n      }\n    }\n\n    return { sendMethod, value };\n  }\n\n  private async sendRawTransaction(rawTransaction: RawTransaction) {\n    const estimateGas = await this.web3.eth.estimateGas(rawTransaction as Web3Transaction);\n\n    // @ts-expect-error DISABLE SITE SUGGESTED GAS FEE IN METAMASK\n    // prettier-ignore\n    const feeOptions: { maxPriorityFeePerGas?: number | string | BN; maxFeePerGas?: number | string | BN } = { maxPriorityFeePerGas: null, maxFeePerGas: null };\n    const { transactionHash } = await this.web3.eth.sendTransaction({\n      ...(rawTransaction as object),\n      gas: estimateGas,\n      ...feeOptions,\n    } as Web3Transaction);\n    return { txId: transactionHash.toString() };\n  }\n\n  private getBridgeContract(contractAddress: string) {\n    return new this.web3.eth.Contract(Bridge.abi, contractAddress) as Contract<typeof Bridge.abi>;\n  }\n\n  private getCctpBridgeContract(contractAddress: string) {\n    return new this.web3.eth.Contract(CctpBridge.abi, contractAddress) as Contract<typeof CctpBridge.abi>;\n  }\n\n  private getOftBridgeContract(contractAddress: string) {\n    return new this.web3.eth.Contract(OftBridge.abi, contractAddress) as Contract<typeof OftBridge.abi>;\n  }\n\n  private getAbrPayerContract(contractAddress: string) {\n    return new this.web3.eth.Contract(PayerWithAbr.abi, contractAddress) as Contract<typeof PayerWithAbr.abi>;\n  }\n}\n"]}

package/dist/src/services/bridge/index.d.ts

@@ -1,7 +1,7 @@
 import { NodeRpcUrlsConfig } from "..";
 import { Messenger } from "../../client/core-api/core-api.model";
 import { AllbridgeCoreClient } from "../../client/core-api/core-client-base";
-import { AllbridgeCoreSdkOptions } from "../../index";
+import { AllbridgeCoreSdkOptions, FeePaymentMethod } from "../../index";
 import { TokenWithChainDetails } from "../../tokens-info";
 import { Provider, TransactionResponse } from "../models";
 import { TokenService } from "../token";
@@ -65,5 +65,5 @@ export declare class DefaultBridgeService implements BridgeService {
     approve(provider: Provider, approveData: ApproveParams): Promise<TransactionResponse>;
     send(provider: Provider, params: SendParams): Promise<TransactionResponse>;
 }
-export declare function getSpender(token: TokenWithChainDetails, messenger?: Messenger): string;
+export declare function getSpender(token: TokenWithChainDetails, messenger?: Messenger, gasFeePaymentMethod?: FeePaymentMethod): string;
 export declare function getChainBridgeService(chainSymbol: string, api: AllbridgeCoreClient, nodeRpcUrlsConfig: NodeRpcUrlsConfig, params: AllbridgeCoreSdkOptions, provider?: Provider): ChainBridgeService;