@7kprotocol/sdk-ts 2.4.1 → 2.4.2-beta.1

package/lib/cjs/libs/protocols/magma/index.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MagmaContract = void 0;
 const base_1 = require("../base");
@@ -15,38 +6,35 @@ const utils_1 = require("@mysten/sui/utils");
 const utils_2 = require("../utils");
 const sui_1 = require("../../../utils/sui");
 class MagmaContract extends base_1.BaseContract {
-    swap(tx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [coinX, coinY] = this.swapInfo.pool.allTokens;
-            const swapXtoY = this.swapInfo.swapXtoY;
-            const sqrtPriceLimit = (0, utils_2.getDefaultSqrtPriceLimit)(swapXtoY);
-            const typeArguments = [coinX.address, coinY.address];
-            const [zeroOut] = tx.moveCall({
-                target: "0x2::coin::zero",
-                typeArguments: [swapXtoY ? coinY.address : coinX.address],
-            });
-            const amountIn = sui_1.SuiUtils.getCoinValue(swapXtoY ? coinX.address : coinY.address, this.inputCoinObject, tx);
-            const config = this.config.magma;
-            const [receiveA, receiveB] = tx.moveCall({
-                target: `${config.package}::router::swap`,
-                typeArguments,
-                arguments: [
-                    tx.object(config.globalConfig),
-                    tx.object(this.swapInfo.poolId),
-                    swapXtoY ? this.inputCoinObject : zeroOut, // coin A
-                    swapXtoY ? zeroOut : this.inputCoinObject, // coin B
-                    tx.pure.bool(swapXtoY), // a to b or b to a
-                    tx.pure.bool(true), // exact in or out
-                    amountIn, // swap amount
-                    tx.pure.u128(sqrtPriceLimit.toString()), // sqrt price limit
-                    tx.pure.bool(false),
-                    tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
-                ],
-            });
-            sui_1.SuiUtils.transferOrDestroyZeroCoin(tx, this.swapInfo.assetIn, swapXtoY ? receiveA : receiveB, this.currentAccount);
-            console.log(tx);
-            return swapXtoY ? receiveB : receiveA;
+    async swap(tx) {
+        const [coinX, coinY] = this.swapInfo.pool.allTokens;
+        const swapXtoY = this.swapInfo.swapXtoY;
+        const sqrtPriceLimit = (0, utils_2.getDefaultSqrtPriceLimit)(swapXtoY);
+        const typeArguments = [coinX.address, coinY.address];
+        const [zeroOut] = tx.moveCall({
+            target: "0x2::coin::zero",
+            typeArguments: [swapXtoY ? coinY.address : coinX.address],
         });
+        const amountIn = sui_1.SuiUtils.getCoinValue(swapXtoY ? coinX.address : coinY.address, this.inputCoinObject, tx);
+        const config = this.config.magma;
+        const [receiveA, receiveB] = tx.moveCall({
+            target: `${config.package}::router::swap`,
+            typeArguments,
+            arguments: [
+                tx.object(config.globalConfig),
+                tx.object(this.swapInfo.poolId),
+                swapXtoY ? this.inputCoinObject : zeroOut, // coin A
+                swapXtoY ? zeroOut : this.inputCoinObject, // coin B
+                tx.pure.bool(swapXtoY), // a to b or b to a
+                tx.pure.bool(true), // exact in or out
+                amountIn, // swap amount
+                tx.pure.u128(sqrtPriceLimit.toString()), // sqrt price limit
+                tx.pure.bool(false),
+                tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
+            ],
+        });
+        sui_1.SuiUtils.collectDust(tx, this.swapInfo.assetIn, swapXtoY ? receiveA : receiveB);
+        return swapXtoY ? receiveB : receiveA;
     }
 }
 exports.MagmaContract = MagmaContract;

package/lib/cjs/libs/protocols/momentum/index.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MomentumContract = void 0;
+const base_1 = require("../base");
+const utils_1 = require("@mysten/sui/utils");
+const utils_2 = require("../utils");
+const sui_1 = require("../../../utils/sui");
+class MomentumContract extends base_1.BaseContract {
+    async swap(tx) {
+        const [coinX, coinY] = this.swapInfo.pool.allTokens;
+        const swapXtoY = this.swapInfo.swapXtoY;
+        const sqrtPriceLimit = (0, utils_2.getDefaultSqrtPriceLimit)(swapXtoY);
+        const typeArguments = [coinX.address, coinY.address];
+        const { package: packageId, version } = this.config.momentum;
+        const [receiveA, receiveB, debt] = tx.moveCall({
+            target: `${packageId}::trade::flash_swap`,
+            typeArguments,
+            arguments: [
+                tx.object(this.swapInfo.poolId),
+                tx.pure.bool(swapXtoY), // a2b
+                tx.pure.bool(true), // exact in
+                this.getInputCoinValue(tx),
+                tx.pure.u128(sqrtPriceLimit.toString()), // sqrt price limit
+                tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
+                tx.object(version),
+            ],
+        });
+        tx.moveCall({
+            target: `${packageId}::trade::repay_flash_swap`,
+            typeArguments,
+            arguments: [
+                tx.object(this.swapInfo.poolId),
+                debt,
+                swapXtoY
+                    ? sui_1.SuiUtils.coinIntoBalance(tx, coinX.address, this.inputCoinObject)
+                    : sui_1.SuiUtils.zeroBalance(tx, coinX.address),
+                swapXtoY
+                    ? sui_1.SuiUtils.zeroBalance(tx, coinY.address)
+                    : sui_1.SuiUtils.coinIntoBalance(tx, coinY.address, this.inputCoinObject),
+                tx.object(version),
+            ],
+        });
+        const receiveACoin = sui_1.SuiUtils.coinFromBalance(tx, coinX.address, receiveA);
+        const receiveBCoin = sui_1.SuiUtils.coinFromBalance(tx, coinY.address, receiveB);
+        sui_1.SuiUtils.collectDust(tx, this.swapInfo.assetIn, swapXtoY ? receiveACoin : receiveBCoin);
+        return swapXtoY ? receiveBCoin : receiveACoin;
+    }
+}
+exports.MomentumContract = MomentumContract;

package/lib/cjs/libs/protocols/obric/index.js

@@ -1,41 +1,30 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObricContract = void 0;
 const utils_1 = require("@mysten/sui/utils");
 const base_1 = require("../base");
 class ObricContract extends base_1.BaseContract {
-    swap(tx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [coinX, coinY] = this.swapInfo.pool.allTokens;
-            const xToY = this.swapInfo.swapXtoY;
-            const { x_price_id, y_price_id } = this.swapInfo.extra || {};
-            if (!x_price_id || !y_price_id) {
-                throw new Error("x_price_id and y_price_id are required");
-            }
-            const { package: PACKAGE_ID, pythState: PYTH_STATE } = this.config.obric;
-            const [coinOut] = tx.moveCall({
-                target: `${PACKAGE_ID}::v2::${xToY ? "swap_x_to_y" : "swap_y_to_x"}`,
-                typeArguments: [coinX.address, coinY.address],
-                arguments: [
-                    tx.object(this.swapInfo.poolId),
-                    tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
-                    tx.object(PYTH_STATE),
-                    tx.object(x_price_id), // pyth pricefeed for x
-                    tx.object(y_price_id), // pyth pricefeed for y
-                    this.inputCoinObject,
-                ],
-            });
-            return coinOut;
+    async swap(tx) {
+        const [coinX, coinY] = this.swapInfo.pool.allTokens;
+        const xToY = this.swapInfo.swapXtoY;
+        const { x_price_id, y_price_id } = this.swapInfo.extra || {};
+        if (!x_price_id || !y_price_id) {
+            throw new Error("x_price_id and y_price_id are required");
+        }
+        const { package: PACKAGE_ID, pythState: PYTH_STATE } = this.config.obric;
+        const [coinOut] = tx.moveCall({
+            target: `${PACKAGE_ID}::v2::${xToY ? "swap_x_to_y" : "swap_y_to_x"}`,
+            typeArguments: [coinX.address, coinY.address],
+            arguments: [
+                tx.object(this.swapInfo.poolId),
+                tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
+                tx.object(PYTH_STATE),
+                tx.object(x_price_id), // pyth pricefeed for x
+                tx.object(y_price_id), // pyth pricefeed for y
+                this.inputCoinObject,
+            ],
         });
+        return coinOut;
     }
 }
 exports.ObricContract = ObricContract;

package/lib/cjs/libs/protocols/springsui/index.js

@@ -1,35 +1,24 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpringSuiContract = void 0;
 const utils_1 = require("@mysten/sui/utils");
 const base_1 = require("../base");
 class SpringSuiContract extends base_1.BaseContract {
-    swap(tx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // coinX is always SUI
-            const coinY = this.swapInfo.pool.allTokens[1];
-            const isStake = this.swapInfo.swapXtoY;
-            const { package: PACKAGE_ID } = this.config.springsui;
-            const [coinOut] = tx.moveCall({
-                target: `${PACKAGE_ID}::liquid_staking::${isStake ? "mint" : "redeem"}`,
-                typeArguments: [coinY.address],
-                arguments: [
-                    tx.object(this.swapInfo.poolId),
-                    isStake ? tx.object(utils_1.SUI_SYSTEM_STATE_OBJECT_ID) : this.inputCoinObject,
-                    isStake ? this.inputCoinObject : tx.object(utils_1.SUI_SYSTEM_STATE_OBJECT_ID),
-                ],
-            });
-            return coinOut;
+    async swap(tx) {
+        // coinX is always SUI
+        const coinY = this.swapInfo.pool.allTokens[1];
+        const isStake = this.swapInfo.swapXtoY;
+        const { package: PACKAGE_ID } = this.config.springsui;
+        const [coinOut] = tx.moveCall({
+            target: `${PACKAGE_ID}::liquid_staking::${isStake ? "mint" : "redeem"}`,
+            typeArguments: [coinY.address],
+            arguments: [
+                tx.object(this.swapInfo.poolId),
+                isStake ? tx.object(utils_1.SUI_SYSTEM_STATE_OBJECT_ID) : this.inputCoinObject,
+                isStake ? this.inputCoinObject : tx.object(utils_1.SUI_SYSTEM_STATE_OBJECT_ID),
+            ],
         });
+        return coinOut;
     }
 }
 exports.SpringSuiContract = SpringSuiContract;

package/lib/cjs/libs/protocols/steamm/index.js

@@ -1,26 +1,21 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SteammContract = void 0;
 const base_1 = require("../base");
 const utils_1 = require("@mysten/sui/utils");
 const sui_1 = require("../../../utils/sui");
 class SteammContract extends base_1.BaseContract {
-    swap(tx) {
-        return __awaiter(this, void 0, void 0, function* () {
+    async swap(tx) {
+        if (this.extra.poolStructTag.includes("omm::OracleQuoter")) {
+            return this.ommSwap(tx);
+        }
+        else if (this.extra.poolStructTag.includes("cpmm::CpQuoter")) {
             return this.cpmmSwap(tx);
-        });
+        }
+        throw new Error(`Unsupported pool type: ${this.extra.poolStructTag}`);
     }
     cpmmSwap(tx) {
-        const extra = this.swapInfo.extra;
+        const extra = this.extra;
         if (!extra ||
             !extra.bankAStructTag ||
             !extra.bankBStructTag ||
@@ -70,10 +65,10 @@ class SteammContract extends base_1.BaseContract {
         });
         const coinIn = xToY ? coinA : coinB;
         const coinOut = xToY ? coinB : coinA;
-        sui_1.SuiUtils.transferOrDestroyZeroCoin(tx, this.swapInfo.assetIn, coinIn, this.currentAccount);
+        sui_1.SuiUtils.collectDust(tx, this.swapInfo.assetIn, coinIn);
         return coinOut;
     }
-    cpmmSwapV2(tx) {
+    ommSwap(tx) {
         const extra = this.swapInfo.extra;
         if (!extra ||
             !extra.bankAStructTag ||
@@ -87,72 +82,76 @@ class SteammContract extends base_1.BaseContract {
         }
         // the pool script v1 only support same lending market
         if (extra.lendingMarketA !== extra.lendingMarketB) {
-            throw new Error(`Invalid lending market for cpmmSwap`);
+            throw new Error(`Invalid lending market for ommSwap`);
         }
         const [btokenA, bTokenB, _quoter, lp] = (0, utils_1.parseStructTag)(extra.poolStructTag).typeParams;
         const [lendingMarket, coinTypeA, _bTokenA] = (0, utils_1.parseStructTag)(extra.bankAStructTag).typeParams;
         const [_lendingMarket, coinTypeB, _bTokenB] = (0, utils_1.parseStructTag)(extra.bankBStructTag).typeParams;
-        const [coinX, _coinY] = this.swapInfo.pool.allTokens;
-        const xToY = coinX.address === this.swapInfo.assetIn;
+        const xToY = this.swapInfo.swapXtoY;
         const coinA = xToY
             ? this.inputCoinObject
             : sui_1.SuiUtils.zeroCoin(tx, (0, utils_1.normalizeStructTag)(coinTypeA));
         const coinB = !xToY
             ? this.inputCoinObject
             : sui_1.SuiUtils.zeroCoin(tx, (0, utils_1.normalizeStructTag)(coinTypeB));
-        const bankATypeArgs = [lendingMarket, coinTypeA, btokenA].map(utils_1.normalizeStructTag);
-        const bankBTypeArgs = [lendingMarket, coinTypeB, bTokenB].map(utils_1.normalizeStructTag);
-        const bankInTypeArgs = xToY ? bankATypeArgs : bankBTypeArgs;
-        const bankOutTypeArgs = xToY ? bankBTypeArgs : bankATypeArgs;
-        // mint btoken from both coins
-        const bTokenIn = tx.moveCall({
-            target: `${this.config.steamm.package}::bank::mint_btokens`,
-            typeArguments: bankInTypeArgs,
+        const [priceA, priceB] = this.getOraclePriceUpdate(tx);
+        tx.moveCall({
+            target: `${this.config.steamm.script}::pool_script_v2::omm_swap`,
+            typeArguments: [
+                lendingMarket,
+                coinTypeA,
+                coinTypeB,
+                btokenA,
+                bTokenB,
+                lp,
+            ].map(utils_1.normalizeStructTag),
             arguments: [
-                tx.object(xToY ? extra.bankA : extra.bankB),
+                tx.object(this.swapInfo.poolId),
+                tx.object(extra.bankA),
+                tx.object(extra.bankB),
                 tx.object(extra.lendingMarketA),
-                xToY ? coinA : coinB,
+                priceA,
+                priceB,
+                coinA,
+                coinB,
+                tx.pure.bool(xToY),
                 this.getInputCoinValue(tx),
+                tx.pure.u64(0),
                 tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
             ],
         });
-        const bTokenOut = sui_1.SuiUtils.zeroCoin(tx, (0, utils_1.normalizeStructTag)(xToY ? bTokenB : btokenA));
-        // call swap on btoken
-        tx.moveCall({
-            target: `${this.config.steamm.package}::cpmm::swap`,
-            typeArguments: [btokenA, bTokenB, lp].map(utils_1.normalizeStructTag),
+        const coinIn = xToY ? coinA : coinB;
+        const coinOut = xToY ? coinB : coinA;
+        sui_1.SuiUtils.collectDust(tx, this.swapInfo.assetIn, coinIn);
+        return coinOut;
+    }
+    getOraclePriceUpdate(tx) {
+        const oracleA = this.extra.oracles?.[0]?.Pyth?.price_identifier?.bytes;
+        const oracleB = this.extra.oracles?.[1]?.Pyth?.price_identifier?.bytes;
+        const registry = this.extra.oracleRegistry;
+        const indexes = this.extra.oracleIndexes;
+        if (!oracleA || !oracleB || !registry || indexes?.length !== 2) {
+            throw new Error(`Invalid oracle info for getOraclePriceUpdate`);
+        }
+        const [a] = tx.moveCall({
+            target: `${this.config.steamm.oracle}::oracles::get_pyth_price`,
             arguments: [
-                tx.object(this.swapInfo.poolId),
-                xToY ? bTokenIn : bTokenOut,
-                xToY ? bTokenOut : bTokenIn,
-                tx.pure.bool(xToY),
-                sui_1.SuiUtils.getCoinValue((0, utils_1.normalizeStructTag)(xToY ? btokenA : bTokenB), bTokenIn, tx),
-                tx.pure.u64(0), // min output
+                tx.object(registry),
+                tx.object(this.pythMap["0x" + (0, utils_1.toHex)(Uint8Array.from(oracleA))]),
+                tx.pure.u64(indexes[0]),
+                tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
             ],
         });
-        // burn btoken to get out coin
-        const [outCoin] = tx.moveCall({
-            target: `${this.config.steamm.package}::bank::burn_btokens`,
-            typeArguments: bankOutTypeArgs,
+        const [b] = tx.moveCall({
+            target: `${this.config.steamm.oracle}::oracles::get_pyth_price`,
             arguments: [
-                tx.object(xToY ? extra.bankB : extra.bankA),
-                tx.object(extra.lendingMarketA),
-                bTokenOut,
-                sui_1.SuiUtils.getCoinValue((0, utils_1.normalizeStructTag)(xToY ? bTokenB : btokenA), bTokenOut, tx),
+                tx.object(registry),
+                tx.object(this.pythMap["0x" + (0, utils_1.toHex)(Uint8Array.from(oracleB))]),
+                tx.pure.u64(indexes[1]),
                 tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
             ],
         });
-        const coinIn = xToY ? coinA : coinB;
-        const coinOut = xToY ? coinB : coinA;
-        // the coinIn was mutated by mint_btokens above, but not consumed, so we need to transfer or destroy it
-        sui_1.SuiUtils.transferOrDestroyZeroCoin(tx, this.swapInfo.assetIn, coinIn, this.currentAccount);
-        // bTokenIn was mutated by cpmm::swap above, but not consumed, so we need to transfer or destroy it
-        sui_1.SuiUtils.transferOrDestroyZeroCoin(tx, (0, utils_1.normalizeStructTag)(xToY ? btokenA : bTokenB), bTokenIn, this.currentAccount);
-        // bTokenOut was burned by burn_btokens above, but not consumed, so we need to transfer or destroy it
-        sui_1.SuiUtils.transferOrDestroyZeroCoin(tx, (0, utils_1.normalizeStructTag)(xToY ? bTokenB : btokenA), bTokenOut, this.currentAccount);
-        // after all we need to merge the placeholder output coin (zero) with actual output coin from swap burn
-        tx.mergeCoins(coinOut, [outCoin]);
-        return coinOut;
+        return [a, b];
     }
 }
 exports.SteammContract = SteammContract;

package/lib/cjs/libs/protocols/stsui/index.js

@@ -1,35 +1,24 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StSuiContract = void 0;
 const utils_1 = require("@mysten/sui/utils");
 const base_1 = require("../base");
 class StSuiContract extends base_1.BaseContract {
-    swap(tx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // coinX is always SUI
-            const coinY = this.swapInfo.pool.allTokens[1];
-            const isStake = this.swapInfo.swapXtoY;
-            const { package: PACKAGE_ID } = this.config.stsui;
-            const [coinOut] = tx.moveCall({
-                target: `${PACKAGE_ID}::liquid_staking::${isStake ? "mint" : "redeem"}`,
-                typeArguments: [coinY.address],
-                arguments: [
-                    tx.object(this.swapInfo.poolId),
-                    isStake ? tx.object(utils_1.SUI_SYSTEM_STATE_OBJECT_ID) : this.inputCoinObject,
-                    isStake ? this.inputCoinObject : tx.object(utils_1.SUI_SYSTEM_STATE_OBJECT_ID),
-                ],
-            });
-            return coinOut;
+    async swap(tx) {
+        // coinX is always SUI
+        const coinY = this.swapInfo.pool.allTokens[1];
+        const isStake = this.swapInfo.swapXtoY;
+        const { package: PACKAGE_ID } = this.config.stsui;
+        const [coinOut] = tx.moveCall({
+            target: `${PACKAGE_ID}::liquid_staking::${isStake ? "mint" : "redeem"}`,
+            typeArguments: [coinY.address],
+            arguments: [
+                tx.object(this.swapInfo.poolId),
+                isStake ? tx.object(utils_1.SUI_SYSTEM_STATE_OBJECT_ID) : this.inputCoinObject,
+                isStake ? this.inputCoinObject : tx.object(utils_1.SUI_SYSTEM_STATE_OBJECT_ID),
+            ],
         });
+        return coinOut;
     }
 }
 exports.StSuiContract = StSuiContract;

package/lib/cjs/libs/protocols/suiswap/index.js

@@ -1,45 +1,34 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SuiswapContract = void 0;
 const utils_1 = require("@mysten/sui/utils");
 const base_1 = require("../base");
 const sui_1 = require("../../../utils/sui");
 class SuiswapContract extends base_1.BaseContract {
-    swap(tx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const poolId = this.swapInfo.poolId;
-            const swapXtoY = this.swapInfo.swapXtoY;
-            const inputCoin = this.inputCoinObject;
-            const typeArguments = [this.swapInfo.coinX.type, this.swapInfo.coinY.type];
-            const callFunc = swapXtoY
-                ? "do_swap_x_to_y_direct"
-                : "do_swap_y_to_x_direct";
-            const { package: PACKAGE_ID } = this.config.suiswap;
-            const inputAmount = this.getInputCoinValue(tx);
-            const [tokenIn, tokenOut] = tx.moveCall({
-                target: `${PACKAGE_ID}::pool::${callFunc}`,
-                typeArguments,
-                arguments: [
-                    tx.object(poolId),
-                    tx.makeMoveVec({
-                        elements: [inputCoin],
-                    }),
-                    inputAmount,
-                    tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
-                ],
-            });
-            sui_1.SuiUtils.transferOrDestroyZeroCoin(tx, this.swapInfo.assetIn, tokenIn, this.currentAccount);
-            return tokenOut;
+    async swap(tx) {
+        const poolId = this.swapInfo.poolId;
+        const swapXtoY = this.swapInfo.swapXtoY;
+        const inputCoin = this.inputCoinObject;
+        const typeArguments = [this.swapInfo.coinX.type, this.swapInfo.coinY.type];
+        const callFunc = swapXtoY
+            ? "do_swap_x_to_y_direct"
+            : "do_swap_y_to_x_direct";
+        const { package: PACKAGE_ID } = this.config.suiswap;
+        const inputAmount = this.getInputCoinValue(tx);
+        const [tokenIn, tokenOut] = tx.moveCall({
+            target: `${PACKAGE_ID}::pool::${callFunc}`,
+            typeArguments,
+            arguments: [
+                tx.object(poolId),
+                tx.makeMoveVec({
+                    elements: [inputCoin],
+                }),
+                inputAmount,
+                tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
+            ],
         });
+        sui_1.SuiUtils.collectDust(tx, this.swapInfo.assetIn, tokenIn);
+        return tokenOut;
     }
 }
 exports.SuiswapContract = SuiswapContract;

package/lib/cjs/libs/protocols/turbos/index.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TurbosContract = void 0;
 const utils_1 = require("@mysten/sui/utils");
@@ -16,36 +7,30 @@ const utils_2 = require("../utils");
 const sui_1 = require("../../../utils/sui");
 const ONE_MINUTE = 60 * 1000;
 class TurbosContract extends base_1.BaseContract {
-    swap(tx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const a2b = this.swapInfo.swapXtoY;
-            const { poolId, address } = {
-                poolId: this.swapInfo.poolId,
-                address: this.currentAccount,
-            };
-            const { package: PACKAGE_ID, version: VERSION } = this.config.turbos;
-            const inputAmount = this.getInputCoinValue(tx);
-            const [tokenOut, tokenIn] = tx.moveCall({
-                target: `${PACKAGE_ID}::swap_router::swap_${a2b ? "a_b" : "b_a"}_with_return_`,
-                typeArguments: this.getTypeParams(),
-                arguments: [
-                    tx.object(poolId),
-                    tx.makeMoveVec({
-                        elements: [this.inputCoinObject],
-                    }),
-                    inputAmount,
-                    tx.pure.u64(0),
-                    tx.pure.u128((0, utils_2.getDefaultSqrtPriceLimit)(this.swapInfo.swapXtoY).toString()),
-                    tx.pure.bool(true),
-                    tx.pure.address(this.currentAccount),
-                    tx.pure.u64(Date.now() + ONE_MINUTE * 3),
-                    tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
-                    tx.object(VERSION),
-                ],
-            });
-            sui_1.SuiUtils.transferOrDestroyZeroCoin(tx, this.swapInfo.assetIn, tokenIn, address);
-            return tokenOut;
+    async swap(tx) {
+        const a2b = this.swapInfo.swapXtoY;
+        const { package: PACKAGE_ID, version: VERSION } = this.config.turbos;
+        const inputAmount = this.getInputCoinValue(tx);
+        const [tokenOut, tokenIn] = tx.moveCall({
+            target: `${PACKAGE_ID}::swap_router::swap_${a2b ? "a_b" : "b_a"}_with_return_`,
+            typeArguments: this.getTypeParams(),
+            arguments: [
+                tx.object(this.swapInfo.poolId),
+                tx.makeMoveVec({
+                    elements: [this.inputCoinObject],
+                }),
+                inputAmount,
+                tx.pure.u64(0),
+                tx.pure.u128((0, utils_2.getDefaultSqrtPriceLimit)(this.swapInfo.swapXtoY).toString()),
+                tx.pure.bool(true),
+                tx.pure.address(this.currentAccount),
+                tx.pure.u64(Date.now() + ONE_MINUTE * 3),
+                tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
+                tx.object(VERSION),
+            ],
         });
+        sui_1.SuiUtils.collectDust(tx, this.swapInfo.assetIn, tokenIn);
+        return tokenOut;
     }
 }
 exports.TurbosContract = TurbosContract;

package/lib/cjs/libs/protocols/utils.js

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultSqrtPriceLimit = getDefaultSqrtPriceLimit;
-const bn_js_1 = __importDefault(require("bn.js"));
 const constants_1 = require("./constants");
 function getDefaultSqrtPriceLimit(a2b) {
-    return new bn_js_1.default(a2b ? constants_1.MIN_SQRT_PRICE : constants_1.MAX_SQRT_PRICE);
+    return BigInt(a2b ? constants_1.MIN_SQRT_PRICE : constants_1.MAX_SQRT_PRICE);
 }