rainbow-swap-sdk 1.3.1 → 1.3.2

package/dist/dexes/ston-v2/transfer-params-pack.utils.d.ts

@@ -1,17 +1,4 @@
 import { Address, Cell } from '@ton/core';
-interface SwapParams {
-    outputJettonWalletAddress: Address;
-    receiverAddress: Address;
-    minOutputAmount: bigint;
-    refundAddress: Address;
-    excessesAddress?: Address;
-    dexCustomPayload?: Cell;
-    dexCustomPayloadForwardGasAmount?: bigint;
-    refundPayload?: Cell;
-    refundForwardGasAmount?: bigint;
-    referralAddress: Address | null;
-    referralValue: bigint;
-    deadline?: number;
-}
-export declare const packSwapParams: (params: SwapParams) => Cell;
-export {};
+import { RouteStepWithCalculation } from '../../interfaces/route-step-with-calculation.interface';
+export declare const getRouterAddress: (routeStep: RouteStepWithCalculation) => Address;
+export declare const packSwapParams: (remainingRoute: RouteStepWithCalculation[], routeStepGasAmount: bigint, receiverAddress: Address, responseDestination: Address, referralAddress: Address, referralValue: bigint, slippageTolerance: number) => Promise<Cell | undefined>;

package/dist/dexes/ston-v2/transfer-params-pack.utils.js

@@ -1,14 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.packSwapParams = void 0;
+exports.packSwapParams = exports.getRouterAddress = void 0;
+const shared_1 = require("@rnw-community/shared");
 const core_1 = require("@ton/core");
+const sdk_1 = require("./sdk");
+const dex_type_enum_1 = require("../../enums/dex-type.enum");
+const globals_1 = require("../../globals");
+const jetton_utils_1 = require("../../utils/jetton.utils");
+const slippage_tolerance_utils_1 = require("../shared/slippage-tolerance.utils");
 const TX_DEADLINE = 15 * 60; // 15 minutes
 const getDefaultDeadline = () => Math.floor(Date.now() / 1000) + TX_DEADLINE;
 var Operation;
 (function (Operation) {
     Operation[Operation["SWAP"] = 1717886506] = "SWAP";
 })(Operation || (Operation = {}));
-const packSwapParams = (params) => {
+const routeStep_packSwapParams = (params) => {
     if (params.referralValue < 0 || params.referralValue > 100) {
         throw Error(`'referralValue' should be in range [0, 100] BPS`);
     }
@@ -30,4 +36,51 @@ const packSwapParams = (params) => {
         .endCell())
         .endCell();
 };
+const getRouterAddress = (routeStep) => {
+    if (routeStep.dexPair.dexType !== dex_type_enum_1.DexTypeEnum.Ston_v2) {
+        throw new Error(`Unsupported dexType ${routeStep.dexPair.dexType}, ${dex_type_enum_1.DexTypeEnum.Ston_v2} expected`);
+    }
+    return core_1.Address.parse(routeStep.dexPair.routerAddress);
+};
+exports.getRouterAddress = getRouterAddress;
+const getOutputJettonWalletAddress = (routeStep) => {
+    const routerAddress = (0, exports.getRouterAddress)(routeStep);
+    const jettonMasterAddress = routeStep.outputAssetAddress === globals_1.TON
+        ? sdk_1.PROXY_TON_V2_MASTER_ADDRESS
+        : routeStep.outputAssetAddress;
+    return (0, jetton_utils_1.getJettonWalletAddress)(jettonMasterAddress, routerAddress);
+};
+const getNextReceiverAddress = async (receiverAddress, nextStep) => {
+    if ((0, shared_1.isDefined)(nextStep)) {
+        const routerAddress = (0, exports.getRouterAddress)(nextStep);
+        if (nextStep.inputAssetAddress === globals_1.TON) {
+            return (0, jetton_utils_1.getJettonWalletAddress)(sdk_1.PROXY_TON_V2_MASTER_ADDRESS, routerAddress);
+        }
+        else {
+            return routerAddress;
+        }
+    }
+    return receiverAddress;
+};
+const packSwapParams = async (remainingRoute, routeStepGasAmount, receiverAddress, responseDestination, referralAddress, referralValue, slippageTolerance) => {
+    if (remainingRoute.length === 0) {
+        return undefined;
+    }
+    const routeStep = remainingRoute[0];
+    const outputJettonWalletAddress = await getOutputJettonWalletAddress(routeStep);
+    const nextReceiverAddress = await getNextReceiverAddress(receiverAddress, remainingRoute[1]);
+    const minOutputAmount = (0, slippage_tolerance_utils_1.applySlippageTolerance)(routeStep.outputAssetAmount, slippageTolerance);
+    const dexCustomPayload = await (0, exports.packSwapParams)(remainingRoute.slice(1), routeStepGasAmount, receiverAddress, responseDestination, referralAddress, referralValue, slippageTolerance);
+    const dexCustomPayloadForwardGasAmount = routeStepGasAmount * BigInt(remainingRoute.length - 1);
+    return routeStep_packSwapParams({
+        outputJettonWalletAddress,
+        receiverAddress: nextReceiverAddress,
+        minOutputAmount,
+        refundAddress: responseDestination,
+        dexCustomPayload,
+        dexCustomPayloadForwardGasAmount,
+        referralAddress,
+        referralValue
+    });
+};
 exports.packSwapParams = packSwapParams;

package/dist/dexes/ston-v2/transfer-params.utils.js

@@ -1,68 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stonV2_getTransferParams = void 0;
+const shared_1 = require("@rnw-community/shared");
 const core_1 = require("@ton/core");
 const sdk_1 = require("./sdk");
 const transfer_params_pack_utils_1 = require("./transfer-params-pack.utils");
-const dex_type_enum_1 = require("../../enums/dex-type.enum");
 const globals_1 = require("../../globals");
 const jetton_utils_1 = require("../../utils/jetton.utils");
-const slippage_tolerance_utils_1 = require("../shared/slippage-tolerance.utils");
+const ROUTE_STEP_GAS_AMOUNT = (0, core_1.toNano)('0.30');
 const stonV2_getTransferParams = async (route, queryId, gasAmount, senderAddress, receiverAddress, responseDestination, slippageTolerance) => {
-    if (route.length !== 1) {
-        throw new Error('Only 1 step route is supported rn');
+    if (route.length === 0) {
+        throw new Error('Empty route');
     }
-    const routeStep = route[0];
-    if (routeStep.dexPair.dexType !== dex_type_enum_1.DexTypeEnum.Ston_v2) {
-        throw new Error(`Unsupported dexType ${routeStep.dexPair.dexType}, ${dex_type_enum_1.DexTypeEnum.Ston_v2} expected`);
+    const firstRouteStep = route[0];
+    const routerAddress = (0, transfer_params_pack_utils_1.getRouterAddress)(firstRouteStep);
+    const additionalGasAmount = ROUTE_STEP_GAS_AMOUNT * BigInt(route.length - 1);
+    const swapPayload = await (0, transfer_params_pack_utils_1.packSwapParams)(route, ROUTE_STEP_GAS_AMOUNT, receiverAddress, responseDestination, globals_1.REFERRAL_ADDRESS, globals_1.REFERRAL_VALUE, slippageTolerance);
+    if (!(0, shared_1.isDefined)(swapPayload)) {
+        throw new Error('swapPayload not defined');
     }
-    const routerAddress = core_1.Address.parse(routeStep.dexPair.routerAddress);
-    const minOutputAmount = (0, slippage_tolerance_utils_1.applySlippageTolerance)(routeStep.outputAssetAmount, slippageTolerance);
-    if (routeStep.inputAssetAddress === globals_1.TON) {
+    if (firstRouteStep.inputAssetAddress === globals_1.TON) {
         const stonRouterProxyTonWalletAddress = await (0, jetton_utils_1.getJettonWalletAddress)(sdk_1.PROXY_TON_V2_MASTER_ADDRESS, routerAddress);
-        const stonRouterOutputJettonWalletAddress = await (0, jetton_utils_1.getJettonWalletAddress)(routeStep.outputAssetAddress, routerAddress);
-        const tonSwapPayload = (0, transfer_params_pack_utils_1.packSwapParams)({
-            outputJettonWalletAddress: stonRouterOutputJettonWalletAddress,
-            receiverAddress,
-            minOutputAmount,
-            refundAddress: responseDestination,
-            referralAddress: globals_1.REFERRAL_ADDRESS,
-            referralValue: globals_1.REFERRAL_VALUE
-        });
         return {
             to: stonRouterProxyTonWalletAddress,
-            value: gasAmount + BigInt(routeStep.inputAssetAmount),
+            value: gasAmount +
+                additionalGasAmount +
+                BigInt(firstRouteStep.inputAssetAmount),
             body: (0, sdk_1.pTonV2_createTonTransferBody)({
                 queryId,
-                amount: BigInt(routeStep.inputAssetAmount),
+                amount: BigInt(firstRouteStep.inputAssetAmount),
                 refundAddress: responseDestination,
-                forwardPayload: tonSwapPayload
+                forwardPayload: swapPayload
             })
         };
     }
     else {
-        const inputJettonWalletAddress = await (0, jetton_utils_1.getJettonWalletAddress)(routeStep.inputAssetAddress, senderAddress);
-        const outputJettonWalletAddress = await (0, jetton_utils_1.getJettonWalletAddress)(routeStep.outputAssetAddress === globals_1.TON
-            ? sdk_1.PROXY_TON_V2_MASTER_ADDRESS
-            : routeStep.outputAssetAddress, routerAddress);
-        const jettonSwapPayload = (0, transfer_params_pack_utils_1.packSwapParams)({
-            outputJettonWalletAddress,
-            receiverAddress,
-            minOutputAmount,
-            refundAddress: responseDestination,
-            referralAddress: globals_1.REFERRAL_ADDRESS,
-            referralValue: globals_1.REFERRAL_VALUE
-        });
+        const inputJettonWalletAddress = await (0, jetton_utils_1.getJettonWalletAddress)(firstRouteStep.inputAssetAddress, senderAddress);
         return {
             to: inputJettonWalletAddress,
-            value: gasAmount + globals_1.JETTON_TRANSFER_GAS_AMOUNT,
+            value: gasAmount + globals_1.JETTON_TRANSFER_GAS_AMOUNT + additionalGasAmount,
             body: (0, jetton_utils_1.getJettonTransferBody)({
                 queryId,
-                amount: BigInt(routeStep.inputAssetAmount),
+                amount: BigInt(firstRouteStep.inputAssetAmount),
                 destination: routerAddress,
                 responseDestination: responseDestination,
-                forwardTonAmount: gasAmount,
-                forwardPayload: jettonSwapPayload
+                forwardTonAmount: gasAmount + additionalGasAmount,
+                forwardPayload: swapPayload
             })
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rainbow-swap-sdk",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "SDK for building applications on top of Rainbow Swap 🌈 - The Next Gen DEX Aggregator on TON 💎.",
   "repository": "https://github.com/0xblackbot/rainbow-swap-sdk.git",
   "license": "Apache-2.0",