@cetusprotocol/aggregator-sdk 0.3.5 → 0.3.7

package/README.md

@@ -0,0 +1,127 @@
+<!-- PROJECT LOGO -->
+<br />
+<div align="center">
+  <a >
+    <img src="https://archive.cetus.zone/assets/image/logo.png" alt="Logo" width="100" height="100">
+  </a>
+
+  <h3 align="center">Cetus Plus Swap Aggregator</h3>
+
+  <p align="center">
+    Integrating Cetus-Aggregator-SDK: A Comprehensive Guide, Please see details in document.
+    <br />
+    <a href="https://cetus-1.gitbook.io/cetus-developer-docs/developer/cetus-plus-aggregator"><strong>Explore the document »</strong>
+    </a>
+  </p>
+</div>
+
+# Welcome to Cetus Plus Swap Aggregator
+
+Cetus plus swap aggregator is a high-speed and easy-to-integrate solution designed to optimize your trading experience on the Sui blockchain. This aggregator integrates multiple mainstream decentralized exchanges (DEX) on the Sui chain, including various types of trading platforms, providing users with the best trading prices and the lowest slippage.
+
+Core Advantages:
+
+High-Speed Transactions: Thanks to advanced algorithms and efficient architecture, our aggregator can execute transactions at lightning speed, ensuring users get the best opportunities in a rapidly changing market.
+
+Easy Integration: The aggregator is designed to be simple and easy to integrate. Whether you are an individual developer or a large project team, you can quickly connect and deploy.
+
+Multi-Platform Support: Currently, we have integrated multiple mainstream DEXs on the Sui chain, including cetus, deepbook, kriya, flowx, aftermath, afsui, haedal, volo, turbos etc, allowing users to enjoy a diversified trading experience on a single platform.
+
+By using our aggregator, you can trade more efficiently and securely on the Sui blockchain, fully leveraging the various opportunities brought by decentralized finance (DeFi).
+
+# Install
+
+The SDK is published to npm registry. To use the SDK in your project, you can
+
+```
+npm install @cetusprotocol/aggregator-sdk
+```
+
+# Usage
+
+## 1. Init client with rpc and package config
+
+```typescript
+const client = new AggregatorClient()
+```
+
+## 2. Get best router swap result from aggregator service
+
+```typescript
+const amount = new BN(1000000)
+const from = "0x2::sui::SUI"
+const target =
+  "0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b::cetus::CETUS"
+
+const routerRes = await client.findRouters({
+  from,
+  target,
+  amount,
+  byAmountIn: true, // true means fix input amount, false means fix output amount
+})
+```
+
+## 3. Confirm and do fast swap
+
+```typescript
+const routerTx = new Transaction()
+
+if (routerRes != null) {
+  await client.fastRouterSwap({
+    routers: routerRes.routes,
+    byAmountIn,
+    txb: routerTx,
+    slippage: 0.01,
+    isMergeTragetCoin: true,
+    refreshAllCoins: true,
+  })
+
+  let result = await client.devInspectTransactionBlock(routerTx, keypair)
+
+  if (result.effects.status.status === "success") {
+    console.log("Sim exec transaction success")
+    const result = await client.signAndExecuteTransaction(routerTx, keypair)
+  }
+  console.log("result", result)
+}
+```
+
+## 4. Build PTB and return target coin
+
+```typescript
+const routerTx = new Transaction()
+const byAmountIn = true;
+
+if (routerRes != null) {
+  const targetCoin = await client.routerSwap({
+    routers: routerRes.routes,
+    byAmountIn,
+    txb: routerTx,
+    inputCoin,
+    slippage: 0.01,
+  })
+
+  // you can use this target coin object argument to build your ptb.
+  const client.transferOrDestoryCoin(
+      txb,
+      targetCoinRes.targetCoin,
+      targetCoinType
+  )
+
+  let result = await client.devInspectTransactionBlock(routerTx, keypair)
+
+  if (result.effects.status.status === "success") {
+    console.log("Sim exec transaction success")
+    const result = await client.signAndExecuteTransaction(routerTx, keypair)
+  }
+  console.log("result", result)
+}
+```
+
+# More About Cetus
+
+Use the following links to learn more about Cetus:
+
+Learn more about working with Cetus in the [Cetus Documentation](https://cetus-1.gitbook.io/cetus-docs).
+
+Join the Cetus community on [Cetus Discord](https://discord.com/channels/1009749448022315008/1009751382783447072).

package/dist/{index.mjs → index.cjs}

@@ -1,6 +1,8 @@
-import { SuiClient, getFullnodeUrl } from '@mysten/sui/client';
-import { normalizeSuiObjectId, SUI_FRAMEWORK_ADDRESS } from '@mysten/sui/utils';
-import { Transaction } from '@mysten/sui/transactions';
+'use strict';
+
+var client = require('@mysten/sui/client');
+var utils = require('@mysten/sui/utils');
+var transactions = require('@mysten/sui/transactions');
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -47,7 +49,7 @@ var __toESM = (mod2, isNodeMode, target) => (target = mod2 != null ? __create(__
   // file that has been converted to a CommonJS file using a Babel-
   // compatible transform (i.e. "__esModule" has not been set), then set
   // "default" to the CommonJS "module.exports" for node compatibility.
-  !mod2 || !mod2.__esModule ? __defProp(target, "default", { value: mod2, enumerable: true }) : target,
+  __defProp(target, "default", { value: mod2, enumerable: true }) ,
   mod2
 ));
 var __async = (__this, __arguments, generator) => {
@@ -5263,8 +5265,8 @@ var Turbos = class {
 // src/transaction/cetus.ts
 var Cetus = class {
   constructor(env, partner) {
-    this.globalConfig = env === 0 /* Mainnet */ ? "0xdaa46292632c3c4d8f31f23ea0f9b36a28ff3677e9684980e4438403a67a3d8f" : "0x6f4149091a5aea0e818e7243a13adcfb403842d670b9a2089de058512620687a";
-    this.partner = partner != null ? partner : env === 0 /* Mainnet */ ? "0x639b5e433da31739e800cd085f356e64cae222966d0f1b11bd9dc76b322ff58b" : "0x8e0b7668a79592f70fbfb1ae0aebaf9e2019a7049783b9a4b6fe7c6ae038b528";
+    this.globalConfig = env === 0 /* Mainnet */ ? "0xdaa46292632c3c4d8f31f23ea0f9b36a28ff3677e9684980e4438403a67a3d8f" : "0x9774e359588ead122af1c7e7f64e14ade261cfeecdb5d0eb4a5b3b4c8ab8bd3e";
+    this.partner = partner != null ? partner : env === 0 /* Mainnet */ ? "0x639b5e433da31739e800cd085f356e64cae222966d0f1b11bd9dc76b322ff58b" : "0x1f5fa5c820f40d43fc47815ad06d95e40a1942ff72a732a92e8ef4aa8cde70a5";
   }
   flash_swap(client, txb, path, by_amount_in) {
     const { direction, from, target } = path;
@@ -5388,7 +5390,7 @@ function extractStructTagFromType(type) {
     const isSuiCoin = _type === GAS_TYPE_ARG || _type === GAS_TYPE_ARG_LONG;
     const structTag = {
       full_address: _type,
-      address: isSuiCoin ? "0x2" : normalizeSuiObjectId(parts[0]),
+      address: isSuiCoin ? "0x2" : utils.normalizeSuiObjectId(parts[0]),
       module: parts[1],
       name: parts[2],
       type_arguments: [],
@@ -5413,7 +5415,7 @@ function normalizeCoinType(coinType) {
 }
 function fixSuiObjectId(value) {
   if (value.toLowerCase().startsWith("0x")) {
-    return normalizeSuiObjectId(value);
+    return utils.normalizeSuiObjectId(value);
   }
   return value;
 }
@@ -5762,20 +5764,19 @@ function sqrtPriceX64ToPrice(sqrtPriceStr, decimalsA, decimalsB) {
 }
 
 // src/transaction/swap.ts
-function swapInPools(client, params, sender) {
+function swapInPools(client, params, sender, env) {
   return __async(this, null, function* () {
     var _a, _b, _c, _d, _e;
     const { from, target, amount, byAmountIn, pools } = params;
     const fromCoin = completionCoin(from);
     const targetCoin = completionCoin(target);
-    const tx = new Transaction();
+    const tx = new transactions.Transaction();
     const direction = compareCoins(fromCoin, targetCoin);
-    const integratePublishedAt = "0x8faab90228e4c4df91c41626bbaefa19fc25c514405ac64de54578dec9e6f5ee";
+    const integratePublishedAt = env === 0 /* Mainnet */ ? "0x3a5aa90ffa33d09100d7b6941ea1c0ffe6ab66e77062ddd26320c1b073aabb10" : "0x19dd42e05fa6c9988a60d30686ee3feb776672b5547e328d6dab16563da65293";
     const coinA = direction ? fromCoin : targetCoin;
     const coinB = direction ? targetCoin : fromCoin;
     const typeArguments = [coinA, coinB];
-    console.log("typeArguments", typeArguments);
-    console.log("pools", pools);
+    console.log("typeArguments", typeArguments, integratePublishedAt);
     for (let i = 0; i < pools.length; i++) {
       const args = [
         tx.object(pools[i]),
@@ -5795,6 +5796,7 @@ function swapInPools(client, params, sender) {
         "InvalidWallet" /* InvalidWallet */
       );
     }
+    printTransaction(tx);
     const simulateRes = yield client.devInspectTransactionBlock({
       transactionBlock: tx,
       sender
@@ -5836,7 +5838,6 @@ function swapInPools(client, params, sender) {
       }
     }
     const event = valueData[tempIndex].parsedJson.data;
-    console.log("event", JSON.stringify(event, null, 2));
     const currentSqrtPrice = event.step_results[0].current_sqrt_price;
     const [decimalA, decimalB] = yield Promise.all([
       client.getCoinMetadata({ coinType: coinA }).then((metadata) => metadata == null ? void 0 : metadata.decimals),
@@ -6090,39 +6091,47 @@ var DEEPBOOKV3 = "DEEPBOOKV3";
 var SCALLOP = "SCALLOP";
 var DEFAULT_ENDPOINT = "https://api-sui.cetus.zone/router_v2";
 var AggregatorClient8 = class {
-  constructor(endpoint, signer, client, env) {
+  constructor(endpoint, signer, client$1, env) {
     this.endpoint = endpoint ? processEndpoint(endpoint) : DEFAULT_ENDPOINT;
-    this.client = client || new SuiClient({ url: getFullnodeUrl("mainnet") });
+    this.client = client$1 || new client.SuiClient({ url: client.getFullnodeUrl("mainnet") });
     this.signer = signer || "";
     this.env = env || 0 /* Mainnet */;
-    this.allCoins = [];
+    this.allCoins = /* @__PURE__ */ new Map();
   }
-  getAllCoins() {
+  getCoins(coinType, refresh = true) {
     return __async(this, null, function* () {
       if (this.signer === "") {
         throw new Error("Signer is required, but not provided.");
       }
       let cursor = null;
       let limit = 50;
+      if (!refresh) {
+        const gotFromCoins = this.allCoins.get(coinType);
+        if (gotFromCoins) {
+          return gotFromCoins;
+        }
+      }
       const allCoins = [];
       while (true) {
-        const gotAllCoins = yield this.client.getAllCoins({
+        const gotCoins = yield this.client.getCoins({
           owner: this.signer,
+          coinType,
           cursor,
           limit
         });
-        for (const coin of gotAllCoins.data) {
+        for (const coin of gotCoins.data) {
           allCoins.push({
             coinAddress: extractStructTagFromType(coin.coinType).source_address,
             coinObjectId: coin.coinObjectId,
             balance: BigInt(coin.balance)
           });
         }
-        if (gotAllCoins.data.length < limit) {
+        if (gotCoins.data.length < limit) {
           break;
         }
-        cursor = gotAllCoins.data[limit - 1].coinObjectId;
+        cursor = gotCoins.data[limit - 1].coinObjectId;
       }
+      this.allCoins.set(coinType, allCoins);
       return allCoins;
     });
   }
@@ -6202,7 +6211,7 @@ var AggregatorClient8 = class {
       if (targetCoins.length > 1) {
         const vec = txb.makeMoveVec({ elements: targetCoins.slice(1) });
         txb.moveCall({
-          target: `${SUI_FRAMEWORK_ADDRESS}::pay::join_vec`,
+          target: `${utils.SUI_FRAMEWORK_ADDRESS}::pay::join_vec`,
           typeArguments: [routers[0].path[routers[0].path.length - 1].target],
           arguments: [targetCoins[0], vec]
         });
@@ -6214,7 +6223,7 @@ var AggregatorClient8 = class {
     return __async(this, null, function* () {
       let result;
       try {
-        result = yield swapInPools(this.client, params, this.signer);
+        result = yield swapInPools(this.client, params, this.signer, this.env);
       } catch (e) {
         console.error("swapInPools error:", e);
         return null;
@@ -6276,10 +6285,8 @@ var AggregatorClient8 = class {
         refreshAllCoins,
         payDeepFeeAmount
       } = params;
-      if (refreshAllCoins || this.allCoins.length === 0) {
-        this.allCoins = yield this.getAllCoins();
-      }
       const fromCoinType = routers[0].path[0].from;
+      let fromCoins = yield this.getCoins(fromCoinType, refreshAllCoins);
       const targetCoinType = routers[0].path[routers[0].path.length - 1].target;
       const amountIn = routers.reduce(
         (acc, router) => acc.add(router.amountIn),
@@ -6297,15 +6304,16 @@ var AggregatorClient8 = class {
       const amount = byAmountIn ? amountIn : amountLimit;
       const buildFromCoinRes = buildInputCoin(
         txb,
-        this.allCoins,
+        fromCoins,
         BigInt(amount.toString()),
         fromCoinType
       );
       let deepCoin;
       if (payDeepFeeAmount && payDeepFeeAmount > 0) {
+        let deepCoins = yield this.getCoins(this.deepbookv3DeepFeeType());
         deepCoin = buildInputCoin(
           txb,
-          this.allCoins,
+          deepCoins,
           BigInt(payDeepFeeAmount),
           this.deepbookv3DeepFeeType()
         ).targetCoin;
@@ -6320,9 +6328,10 @@ var AggregatorClient8 = class {
         deepbookv3DeepFee: deepCoin
       });
       if (isMergeTragetCoin) {
+        let targetCoins = yield this.getCoins(targetCoinType, refreshAllCoins);
         const targetCoinRes = buildInputCoin(
           txb,
-          this.allCoins,
+          targetCoins,
           BigInt(0),
           targetCoinType
         );
@@ -6342,9 +6351,9 @@ var AggregatorClient8 = class {
   // Include cetus、deepbookv2、flowxv2 & v3、kriyav2 & v3、turbos、aftermath、haedal、afsui、volo、bluemove
   publishedAt() {
     if (this.env === 0 /* Mainnet */) {
-      return "0xf98ed029af555e4a103febf26243dc33ac09a7ea1b2da7e414c728b25b729086";
+      return "0x11451575c775a3e633437b827ecbc1eb51a5964b0302210b28f5b89880be21a2";
     } else {
-      return "0x0ed287d6c3fe4962d0994ffddc1d19a15fba6a81533f3f0dcc2bbcedebce0637";
+      return "0x52eae33adeb44de55cfb3f281d4cc9e02d976181c0952f5323648b5717b33934";
     }
   }
   // Include deepbookv3, scallop
@@ -6352,7 +6361,7 @@ var AggregatorClient8 = class {
     if (this.env === 0 /* Mainnet */) {
       return "0x6d70ffa7aa3f924c3f0b573d27d29895a0ee666aaff821073f75cb14af7fd01a";
     } else {
-      return "0x0ed287d6c3fe4962d0994ffddc1d19a15fba6a81533f3f0dcc2bbcedebce0637";
+      return "0xfd8a73ef0a4b928da9c27fc287dc37c1ca64df71da8e8eac7ca9ece55eb5f448";
     }
   }
   deepbookv3DeepFeeType() {
@@ -6374,7 +6383,7 @@ var AggregatorClient8 = class {
     if (coins.length > 1) {
       let vec = txb.makeMoveVec({ elements: coins.slice(1) });
       txb.moveCall({
-        target: `${SUI_FRAMEWORK_ADDRESS}::pay::join_vec`,
+        target: `${utils.SUI_FRAMEWORK_ADDRESS}::pay::join_vec`,
         typeArguments: [coinType],
         arguments: [coins[0], vec]
       });
@@ -6724,4 +6733,48 @@ decimal.js/decimal.mjs:
    *)
 */
 
-export { AFSUI, AFTERMATH, AggregatorClient8 as AggregatorClient, BLUEMOVE, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, DEEPBOOKV3, DEFAULT_ENDPOINT, Env, FLOWXV2, FLOWXV3, HAEDAL, KRIYA, KRIYAV3, ONE, SCALLOP, TEN_POW_NINE, TURBOS, TWO, U128, U64_MAX, U64_MAX_BN, VOLO, ZERO, buildInputCoin, checkInvalidSuiAddress, compareCoins, completionCoin, composeType, createTarget, dealWithFastRouterSwapParamsForMsafe, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, getDeepbookV3Config, getRouterResult, isSortedSymbols, mintZeroCoin, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId, printTransaction, processEndpoint, restituteMsafeFastRouterSwapParams };
+exports.AFSUI = AFSUI;
+exports.AFTERMATH = AFTERMATH;
+exports.AggregatorClient = AggregatorClient8;
+exports.BLUEMOVE = BLUEMOVE;
+exports.CETUS = CETUS;
+exports.CLOCK_ADDRESS = CLOCK_ADDRESS;
+exports.DEEPBOOKV2 = DEEPBOOKV2;
+exports.DEEPBOOKV3 = DEEPBOOKV3;
+exports.DEFAULT_ENDPOINT = DEFAULT_ENDPOINT;
+exports.Env = Env;
+exports.FLOWXV2 = FLOWXV2;
+exports.FLOWXV3 = FLOWXV3;
+exports.HAEDAL = HAEDAL;
+exports.KRIYA = KRIYA;
+exports.KRIYAV3 = KRIYAV3;
+exports.ONE = ONE;
+exports.SCALLOP = SCALLOP;
+exports.TEN_POW_NINE = TEN_POW_NINE;
+exports.TURBOS = TURBOS;
+exports.TWO = TWO;
+exports.U128 = U128;
+exports.U64_MAX = U64_MAX;
+exports.U64_MAX_BN = U64_MAX_BN;
+exports.VOLO = VOLO;
+exports.ZERO = ZERO;
+exports.buildInputCoin = buildInputCoin;
+exports.checkInvalidSuiAddress = checkInvalidSuiAddress;
+exports.compareCoins = compareCoins;
+exports.completionCoin = completionCoin;
+exports.composeType = composeType;
+exports.createTarget = createTarget;
+exports.dealWithFastRouterSwapParamsForMsafe = dealWithFastRouterSwapParamsForMsafe;
+exports.extractAddressFromType = extractAddressFromType;
+exports.extractStructTagFromType = extractStructTagFromType;
+exports.fixSuiObjectId = fixSuiObjectId;
+exports.getDeepbookV3Config = getDeepbookV3Config;
+exports.getRouterResult = getRouterResult;
+exports.isSortedSymbols = isSortedSymbols;
+exports.mintZeroCoin = mintZeroCoin;
+exports.normalizeCoinType = normalizeCoinType;
+exports.parseRouterResponse = parseRouterResponse;
+exports.patchFixSuiObjectId = patchFixSuiObjectId;
+exports.printTransaction = printTransaction;
+exports.processEndpoint = processEndpoint;
+exports.restituteMsafeFastRouterSwapParams = restituteMsafeFastRouterSwapParams;

package/dist/{index.d.mts → index.d.cts}

@@ -112,7 +112,7 @@ declare class AggregatorClient {
     env: Env;
     private allCoins;
     constructor(endpoint?: string, signer?: string, client?: SuiClient, env?: Env);
-    getAllCoins(): Promise<CoinAsset[]>;
+    getCoins(coinType: string, refresh?: boolean): Promise<CoinAsset[]>;
     findRouters(params: FindRouterParams): Promise<RouterData | null>;
     expectInputSwap(txb: Transaction, inputCoin: TransactionObjectArgument, routers: Router[], amountOutLimit: BN, partner?: string, deepbookv3DeepFee?: TransactionObjectArgument): Promise<TransactionObjectArgument>;
     expectOutputSwap(txb: Transaction, inputCoin: TransactionObjectArgument, routers: Router[], partner?: string): Promise<TransactionObjectArgument>;

package/dist/index.d.ts

@@ -112,7 +112,7 @@ declare class AggregatorClient {
     env: Env;
     private allCoins;
     constructor(endpoint?: string, signer?: string, client?: SuiClient, env?: Env);
-    getAllCoins(): Promise<CoinAsset[]>;
+    getCoins(coinType: string, refresh?: boolean): Promise<CoinAsset[]>;
     findRouters(params: FindRouterParams): Promise<RouterData | null>;
     expectInputSwap(txb: Transaction, inputCoin: TransactionObjectArgument, routers: Router[], amountOutLimit: BN, partner?: string, deepbookv3DeepFee?: TransactionObjectArgument): Promise<TransactionObjectArgument>;
     expectOutputSwap(txb: Transaction, inputCoin: TransactionObjectArgument, routers: Router[], partner?: string): Promise<TransactionObjectArgument>;

package/dist/index.js

@@ -1,8 +1,6 @@
-'use strict';
-
-var client = require('@mysten/sui/client');
-var utils = require('@mysten/sui/utils');
-var transactions = require('@mysten/sui/transactions');
+import { SuiClient, getFullnodeUrl } from '@mysten/sui/client';
+import { normalizeSuiObjectId, SUI_FRAMEWORK_ADDRESS } from '@mysten/sui/utils';
+import { Transaction } from '@mysten/sui/transactions';
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -49,7 +47,7 @@ var __toESM = (mod2, isNodeMode, target) => (target = mod2 != null ? __create(__
   // file that has been converted to a CommonJS file using a Babel-
   // compatible transform (i.e. "__esModule" has not been set), then set
   // "default" to the CommonJS "module.exports" for node compatibility.
-  !mod2 || !mod2.__esModule ? __defProp(target, "default", { value: mod2, enumerable: true }) : target,
+  __defProp(target, "default", { value: mod2, enumerable: true }) ,
   mod2
 ));
 var __async = (__this, __arguments, generator) => {
@@ -5265,8 +5263,8 @@ var Turbos = class {
 // src/transaction/cetus.ts
 var Cetus = class {
   constructor(env, partner) {
-    this.globalConfig = env === 0 /* Mainnet */ ? "0xdaa46292632c3c4d8f31f23ea0f9b36a28ff3677e9684980e4438403a67a3d8f" : "0x6f4149091a5aea0e818e7243a13adcfb403842d670b9a2089de058512620687a";
-    this.partner = partner != null ? partner : env === 0 /* Mainnet */ ? "0x639b5e433da31739e800cd085f356e64cae222966d0f1b11bd9dc76b322ff58b" : "0x8e0b7668a79592f70fbfb1ae0aebaf9e2019a7049783b9a4b6fe7c6ae038b528";
+    this.globalConfig = env === 0 /* Mainnet */ ? "0xdaa46292632c3c4d8f31f23ea0f9b36a28ff3677e9684980e4438403a67a3d8f" : "0x9774e359588ead122af1c7e7f64e14ade261cfeecdb5d0eb4a5b3b4c8ab8bd3e";
+    this.partner = partner != null ? partner : env === 0 /* Mainnet */ ? "0x639b5e433da31739e800cd085f356e64cae222966d0f1b11bd9dc76b322ff58b" : "0x1f5fa5c820f40d43fc47815ad06d95e40a1942ff72a732a92e8ef4aa8cde70a5";
   }
   flash_swap(client, txb, path, by_amount_in) {
     const { direction, from, target } = path;
@@ -5390,7 +5388,7 @@ function extractStructTagFromType(type) {
     const isSuiCoin = _type === GAS_TYPE_ARG || _type === GAS_TYPE_ARG_LONG;
     const structTag = {
       full_address: _type,
-      address: isSuiCoin ? "0x2" : utils.normalizeSuiObjectId(parts[0]),
+      address: isSuiCoin ? "0x2" : normalizeSuiObjectId(parts[0]),
       module: parts[1],
       name: parts[2],
       type_arguments: [],
@@ -5415,7 +5413,7 @@ function normalizeCoinType(coinType) {
 }
 function fixSuiObjectId(value) {
   if (value.toLowerCase().startsWith("0x")) {
-    return utils.normalizeSuiObjectId(value);
+    return normalizeSuiObjectId(value);
   }
   return value;
 }
@@ -5764,20 +5762,19 @@ function sqrtPriceX64ToPrice(sqrtPriceStr, decimalsA, decimalsB) {
 }
 
 // src/transaction/swap.ts
-function swapInPools(client, params, sender) {
+function swapInPools(client, params, sender, env) {
   return __async(this, null, function* () {
     var _a, _b, _c, _d, _e;
     const { from, target, amount, byAmountIn, pools } = params;
     const fromCoin = completionCoin(from);
     const targetCoin = completionCoin(target);
-    const tx = new transactions.Transaction();
+    const tx = new Transaction();
     const direction = compareCoins(fromCoin, targetCoin);
-    const integratePublishedAt = "0x8faab90228e4c4df91c41626bbaefa19fc25c514405ac64de54578dec9e6f5ee";
+    const integratePublishedAt = env === 0 /* Mainnet */ ? "0x3a5aa90ffa33d09100d7b6941ea1c0ffe6ab66e77062ddd26320c1b073aabb10" : "0x19dd42e05fa6c9988a60d30686ee3feb776672b5547e328d6dab16563da65293";
     const coinA = direction ? fromCoin : targetCoin;
     const coinB = direction ? targetCoin : fromCoin;
     const typeArguments = [coinA, coinB];
-    console.log("typeArguments", typeArguments);
-    console.log("pools", pools);
+    console.log("typeArguments", typeArguments, integratePublishedAt);
     for (let i = 0; i < pools.length; i++) {
       const args = [
         tx.object(pools[i]),
@@ -5797,6 +5794,7 @@ function swapInPools(client, params, sender) {
         "InvalidWallet" /* InvalidWallet */
       );
     }
+    printTransaction(tx);
     const simulateRes = yield client.devInspectTransactionBlock({
       transactionBlock: tx,
       sender
@@ -5838,7 +5836,6 @@ function swapInPools(client, params, sender) {
       }
     }
     const event = valueData[tempIndex].parsedJson.data;
-    console.log("event", JSON.stringify(event, null, 2));
     const currentSqrtPrice = event.step_results[0].current_sqrt_price;
     const [decimalA, decimalB] = yield Promise.all([
       client.getCoinMetadata({ coinType: coinA }).then((metadata) => metadata == null ? void 0 : metadata.decimals),
@@ -6092,39 +6089,47 @@ var DEEPBOOKV3 = "DEEPBOOKV3";
 var SCALLOP = "SCALLOP";
 var DEFAULT_ENDPOINT = "https://api-sui.cetus.zone/router_v2";
 var AggregatorClient8 = class {
-  constructor(endpoint, signer, client$1, env) {
+  constructor(endpoint, signer, client, env) {
     this.endpoint = endpoint ? processEndpoint(endpoint) : DEFAULT_ENDPOINT;
-    this.client = client$1 || new client.SuiClient({ url: client.getFullnodeUrl("mainnet") });
+    this.client = client || new SuiClient({ url: getFullnodeUrl("mainnet") });
     this.signer = signer || "";
     this.env = env || 0 /* Mainnet */;
-    this.allCoins = [];
+    this.allCoins = /* @__PURE__ */ new Map();
   }
-  getAllCoins() {
+  getCoins(coinType, refresh = true) {
     return __async(this, null, function* () {
       if (this.signer === "") {
         throw new Error("Signer is required, but not provided.");
       }
       let cursor = null;
       let limit = 50;
+      if (!refresh) {
+        const gotFromCoins = this.allCoins.get(coinType);
+        if (gotFromCoins) {
+          return gotFromCoins;
+        }
+      }
       const allCoins = [];
       while (true) {
-        const gotAllCoins = yield this.client.getAllCoins({
+        const gotCoins = yield this.client.getCoins({
           owner: this.signer,
+          coinType,
           cursor,
           limit
         });
-        for (const coin of gotAllCoins.data) {
+        for (const coin of gotCoins.data) {
           allCoins.push({
             coinAddress: extractStructTagFromType(coin.coinType).source_address,
             coinObjectId: coin.coinObjectId,
             balance: BigInt(coin.balance)
           });
         }
-        if (gotAllCoins.data.length < limit) {
+        if (gotCoins.data.length < limit) {
           break;
         }
-        cursor = gotAllCoins.data[limit - 1].coinObjectId;
+        cursor = gotCoins.data[limit - 1].coinObjectId;
       }
+      this.allCoins.set(coinType, allCoins);
       return allCoins;
     });
   }
@@ -6204,7 +6209,7 @@ var AggregatorClient8 = class {
       if (targetCoins.length > 1) {
         const vec = txb.makeMoveVec({ elements: targetCoins.slice(1) });
         txb.moveCall({
-          target: `${utils.SUI_FRAMEWORK_ADDRESS}::pay::join_vec`,
+          target: `${SUI_FRAMEWORK_ADDRESS}::pay::join_vec`,
           typeArguments: [routers[0].path[routers[0].path.length - 1].target],
           arguments: [targetCoins[0], vec]
         });
@@ -6216,7 +6221,7 @@ var AggregatorClient8 = class {
     return __async(this, null, function* () {
       let result;
       try {
-        result = yield swapInPools(this.client, params, this.signer);
+        result = yield swapInPools(this.client, params, this.signer, this.env);
       } catch (e) {
         console.error("swapInPools error:", e);
         return null;
@@ -6278,10 +6283,8 @@ var AggregatorClient8 = class {
         refreshAllCoins,
         payDeepFeeAmount
       } = params;
-      if (refreshAllCoins || this.allCoins.length === 0) {
-        this.allCoins = yield this.getAllCoins();
-      }
       const fromCoinType = routers[0].path[0].from;
+      let fromCoins = yield this.getCoins(fromCoinType, refreshAllCoins);
       const targetCoinType = routers[0].path[routers[0].path.length - 1].target;
       const amountIn = routers.reduce(
         (acc, router) => acc.add(router.amountIn),
@@ -6299,15 +6302,16 @@ var AggregatorClient8 = class {
       const amount = byAmountIn ? amountIn : amountLimit;
       const buildFromCoinRes = buildInputCoin(
         txb,
-        this.allCoins,
+        fromCoins,
         BigInt(amount.toString()),
         fromCoinType
       );
       let deepCoin;
       if (payDeepFeeAmount && payDeepFeeAmount > 0) {
+        let deepCoins = yield this.getCoins(this.deepbookv3DeepFeeType());
         deepCoin = buildInputCoin(
           txb,
-          this.allCoins,
+          deepCoins,
           BigInt(payDeepFeeAmount),
           this.deepbookv3DeepFeeType()
         ).targetCoin;
@@ -6322,9 +6326,10 @@ var AggregatorClient8 = class {
         deepbookv3DeepFee: deepCoin
       });
       if (isMergeTragetCoin) {
+        let targetCoins = yield this.getCoins(targetCoinType, refreshAllCoins);
         const targetCoinRes = buildInputCoin(
           txb,
-          this.allCoins,
+          targetCoins,
           BigInt(0),
           targetCoinType
         );
@@ -6344,9 +6349,9 @@ var AggregatorClient8 = class {
   // Include cetus、deepbookv2、flowxv2 & v3、kriyav2 & v3、turbos、aftermath、haedal、afsui、volo、bluemove
   publishedAt() {
     if (this.env === 0 /* Mainnet */) {
-      return "0xf98ed029af555e4a103febf26243dc33ac09a7ea1b2da7e414c728b25b729086";
+      return "0x11451575c775a3e633437b827ecbc1eb51a5964b0302210b28f5b89880be21a2";
     } else {
-      return "0x0ed287d6c3fe4962d0994ffddc1d19a15fba6a81533f3f0dcc2bbcedebce0637";
+      return "0x52eae33adeb44de55cfb3f281d4cc9e02d976181c0952f5323648b5717b33934";
     }
   }
   // Include deepbookv3, scallop
@@ -6354,7 +6359,7 @@ var AggregatorClient8 = class {
     if (this.env === 0 /* Mainnet */) {
       return "0x6d70ffa7aa3f924c3f0b573d27d29895a0ee666aaff821073f75cb14af7fd01a";
     } else {
-      return "0x0ed287d6c3fe4962d0994ffddc1d19a15fba6a81533f3f0dcc2bbcedebce0637";
+      return "0xfd8a73ef0a4b928da9c27fc287dc37c1ca64df71da8e8eac7ca9ece55eb5f448";
     }
   }
   deepbookv3DeepFeeType() {
@@ -6376,7 +6381,7 @@ var AggregatorClient8 = class {
     if (coins.length > 1) {
       let vec = txb.makeMoveVec({ elements: coins.slice(1) });
       txb.moveCall({
-        target: `${utils.SUI_FRAMEWORK_ADDRESS}::pay::join_vec`,
+        target: `${SUI_FRAMEWORK_ADDRESS}::pay::join_vec`,
         typeArguments: [coinType],
         arguments: [coins[0], vec]
       });
@@ -6726,48 +6731,4 @@ decimal.js/decimal.mjs:
    *)
 */
 
-exports.AFSUI = AFSUI;
-exports.AFTERMATH = AFTERMATH;
-exports.AggregatorClient = AggregatorClient8;
-exports.BLUEMOVE = BLUEMOVE;
-exports.CETUS = CETUS;
-exports.CLOCK_ADDRESS = CLOCK_ADDRESS;
-exports.DEEPBOOKV2 = DEEPBOOKV2;
-exports.DEEPBOOKV3 = DEEPBOOKV3;
-exports.DEFAULT_ENDPOINT = DEFAULT_ENDPOINT;
-exports.Env = Env;
-exports.FLOWXV2 = FLOWXV2;
-exports.FLOWXV3 = FLOWXV3;
-exports.HAEDAL = HAEDAL;
-exports.KRIYA = KRIYA;
-exports.KRIYAV3 = KRIYAV3;
-exports.ONE = ONE;
-exports.SCALLOP = SCALLOP;
-exports.TEN_POW_NINE = TEN_POW_NINE;
-exports.TURBOS = TURBOS;
-exports.TWO = TWO;
-exports.U128 = U128;
-exports.U64_MAX = U64_MAX;
-exports.U64_MAX_BN = U64_MAX_BN;
-exports.VOLO = VOLO;
-exports.ZERO = ZERO;
-exports.buildInputCoin = buildInputCoin;
-exports.checkInvalidSuiAddress = checkInvalidSuiAddress;
-exports.compareCoins = compareCoins;
-exports.completionCoin = completionCoin;
-exports.composeType = composeType;
-exports.createTarget = createTarget;
-exports.dealWithFastRouterSwapParamsForMsafe = dealWithFastRouterSwapParamsForMsafe;
-exports.extractAddressFromType = extractAddressFromType;
-exports.extractStructTagFromType = extractStructTagFromType;
-exports.fixSuiObjectId = fixSuiObjectId;
-exports.getDeepbookV3Config = getDeepbookV3Config;
-exports.getRouterResult = getRouterResult;
-exports.isSortedSymbols = isSortedSymbols;
-exports.mintZeroCoin = mintZeroCoin;
-exports.normalizeCoinType = normalizeCoinType;
-exports.parseRouterResponse = parseRouterResponse;
-exports.patchFixSuiObjectId = patchFixSuiObjectId;
-exports.printTransaction = printTransaction;
-exports.processEndpoint = processEndpoint;
-exports.restituteMsafeFastRouterSwapParams = restituteMsafeFastRouterSwapParams;
+export { AFSUI, AFTERMATH, AggregatorClient8 as AggregatorClient, BLUEMOVE, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, DEEPBOOKV3, DEFAULT_ENDPOINT, Env, FLOWXV2, FLOWXV3, HAEDAL, KRIYA, KRIYAV3, ONE, SCALLOP, TEN_POW_NINE, TURBOS, TWO, U128, U64_MAX, U64_MAX_BN, VOLO, ZERO, buildInputCoin, checkInvalidSuiAddress, compareCoins, completionCoin, composeType, createTarget, dealWithFastRouterSwapParamsForMsafe, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, getDeepbookV3Config, getRouterResult, isSortedSymbols, mintZeroCoin, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId, printTransaction, processEndpoint, restituteMsafeFastRouterSwapParams };

package/dist/src/client.d.ts

@@ -56,7 +56,7 @@ export declare class AggregatorClient {
     env: Env;
     private allCoins;
     constructor(endpoint?: string, signer?: string, client?: SuiClient, env?: Env);
-    getAllCoins(): Promise<CoinAsset[]>;
+    getCoins(coinType: string, refresh?: boolean): Promise<CoinAsset[]>;
     findRouters(params: FindRouterParams): Promise<RouterData | null>;
     expectInputSwap(txb: Transaction, inputCoin: TransactionObjectArgument, routers: Router[], amountOutLimit: BN, partner?: string, deepbookv3DeepFee?: TransactionObjectArgument): Promise<TransactionObjectArgument>;
     expectOutputSwap(txb: Transaction, inputCoin: TransactionObjectArgument, routers: Router[], partner?: string): Promise<TransactionObjectArgument>;

package/dist/src/transaction/swap.d.ts

@@ -1,4 +1,4 @@
 import { SwapInPoolsParams } from "~/client";
-import { SwapInPoolsResult } from "..";
+import { Env, SwapInPoolsResult } from "..";
 import { SuiClient } from "@mysten/sui/client";
-export declare function swapInPools(client: SuiClient, params: SwapInPoolsParams, sender: string): Promise<SwapInPoolsResult>;
+export declare function swapInPools(client: SuiClient, params: SwapInPoolsParams, sender: string, env: Env): Promise<SwapInPoolsResult>;

package/dist/tests/test_data.test.d.ts

@@ -1,8 +1,10 @@
-export declare const T_USDC = "";
+export declare const T_USDC = "0x26b3bc67befc214058ca78ea9a2690298d731a2d4309485ec3d40198063c4abc::usdc::USDC";
+export declare const T_USDT = "0x26b3bc67befc214058ca78ea9a2690298d731a2d4309485ec3d40198063c4abc::usdt::USDT";
 export declare const T_DEEP = "0x36dbef866a1d62bf7328989a10fb2f07d769f4ee587c0de4a0a256e57e0a58a8::deep::DEEP";
 export declare const T_DBUSDC = "0xf7152c05930480cd740d7311b5b8b45c6f488e3a53a11c3f74a6fac36a52e0d7::DBUSDC::DBUSDC";
 export declare const T_DBUSDT = "0xf7152c05930480cd740d7311b5b8b45c6f488e3a53a11c3f74a6fac36a52e0d7::DBUSDT::DBUSDT";
-export declare const M_USDC = "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN";
+export declare const M_USDC = "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC";
+export declare const M_wUSDC = "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN";
 export declare const M_CETUS = "0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b::cetus::CETUS";
 export declare const M_NAVI = "0xa99b8952d4f7d947ea77fe0ecdcc9e5fc0bcab2841d6e2a5aa00c3044e5544b5::navx::NAVX";
 export declare const M_SUI = "0x2::sui::SUI";

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@cetusprotocol/aggregator-sdk",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "sideEffects": false,
   "main": "dist/index.js",
+  "type": "module",
   "types": "dist/index.d.ts",
   "module": "dist/index.js",
   "scripts": {

package/src/client.ts

@@ -95,42 +95,53 @@ export class AggregatorClient {
   public signer: string
   public client: SuiClient
   public env: Env
-  private allCoins: CoinAsset[]
+  private allCoins: Map<string, CoinAsset[]>
 
   constructor(endpoint?: string, signer?: string, client?: SuiClient, env?: Env) {
     this.endpoint = endpoint ? processEndpoint(endpoint) : DEFAULT_ENDPOINT
     this.client = client || new SuiClient({url: getFullnodeUrl('mainnet')})
     this.signer = signer || ""
     this.env = env || Env.Mainnet
-    this.allCoins = []
+    this.allCoins = new Map<string, CoinAsset[]>()
   }
 
-  async getAllCoins(): Promise<CoinAsset[]> {
+  async getCoins(coinType: string, refresh: boolean = true): Promise<CoinAsset[]> {
     if (this.signer === "") {
       throw new Error("Signer is required, but not provided.")
     }
 
     let cursor = null
     let limit = 50
+
+    if (!refresh) {
+      const gotFromCoins = this.allCoins.get(coinType)
+      if (gotFromCoins) {
+        return gotFromCoins
+      }
+    }
+
     const allCoins: CoinAsset[] = []
     while (true) {
-      const gotAllCoins = await this.client.getAllCoins({
+      const gotCoins = await this.client.getCoins({
         owner: this.signer,
+        coinType,
         cursor,
         limit,
       })
-      for (const coin of gotAllCoins.data) {
+      for (const coin of gotCoins.data) {
         allCoins.push({
           coinAddress: extractStructTagFromType(coin.coinType).source_address,
           coinObjectId: coin.coinObjectId,
           balance: BigInt(coin.balance),
         })
       }
-      if (gotAllCoins.data.length < limit) {
+      if (gotCoins.data.length < limit) {
         break
       }
-      cursor = gotAllCoins.data[limit - 1].coinObjectId
+      cursor = gotCoins.data[limit - 1].coinObjectId
     }
+
+    this.allCoins.set(coinType, allCoins)
     return allCoins
   }
 
@@ -235,7 +246,7 @@ export class AggregatorClient {
   ): Promise<SwapInPoolsResult | null> {
     let result
     try {
-      result = await swapInPools(this.client, params, this.signer)
+      result = await swapInPools(this.client, params, this.signer, this.env)
     } catch (e) {
       console.error("swapInPools error:", e)
       return null
@@ -300,10 +311,12 @@ export class AggregatorClient {
       refreshAllCoins,
       payDeepFeeAmount,
     } = params
-    if (refreshAllCoins || this.allCoins.length === 0) {
-      this.allCoins = await this.getAllCoins()
-    }
+
     const fromCoinType = routers[0].path[0].from
+
+
+    let fromCoins = await this.getCoins(fromCoinType, refreshAllCoins)
+
     const targetCoinType = routers[0].path[routers[0].path.length - 1].target
     const amountIn = routers.reduce(
       (acc, router) => acc.add(router.amountIn),
@@ -321,16 +334,17 @@ export class AggregatorClient {
     const amount = byAmountIn ? amountIn : amountLimit
     const buildFromCoinRes = buildInputCoin(
       txb,
-      this.allCoins,
+      fromCoins,
       BigInt(amount.toString()),
       fromCoinType
     )
 
     let deepCoin
     if (payDeepFeeAmount && payDeepFeeAmount > 0) {
+      let deepCoins = await this.getCoins(this.deepbookv3DeepFeeType())
       deepCoin = buildInputCoin(
         txb,
-        this.allCoins,
+        deepCoins,
         BigInt(payDeepFeeAmount),
         this.deepbookv3DeepFeeType()
       ).targetCoin
@@ -347,9 +361,10 @@ export class AggregatorClient {
     })
 
     if (isMergeTragetCoin) {
+      let targetCoins = await this.getCoins(targetCoinType, refreshAllCoins)
       const targetCoinRes = buildInputCoin(
         txb,
-        this.allCoins,
+        targetCoins,
         BigInt(0),
         targetCoinType
       )
@@ -369,9 +384,10 @@ export class AggregatorClient {
   // Include cetus、deepbookv2、flowxv2 & v3、kriyav2 & v3、turbos、aftermath、haedal、afsui、volo、bluemove
   publishedAt(): string {
     if (this.env === Env.Mainnet) {
-      return "0xf98ed029af555e4a103febf26243dc33ac09a7ea1b2da7e414c728b25b729086" // version 3
+      return "0x11451575c775a3e633437b827ecbc1eb51a5964b0302210b28f5b89880be21a2" // version 5
     } else {
-      return "0x0ed287d6c3fe4962d0994ffddc1d19a15fba6a81533f3f0dcc2bbcedebce0637"
+      // return "0x0ed287d6c3fe4962d0994ffddc1d19a15fba6a81533f3f0dcc2bbcedebce0637" // version 2
+      return "0x52eae33adeb44de55cfb3f281d4cc9e02d976181c0952f5323648b5717b33934"
     }
   }
 
@@ -381,7 +397,7 @@ export class AggregatorClient {
       // return "0x43811be4677f5a5de7bf2dac740c10abddfaa524aee6b18e910eeadda8a2f6ae" // version 1, deepbookv3
       return "0x6d70ffa7aa3f924c3f0b573d27d29895a0ee666aaff821073f75cb14af7fd01a" // version 3, deepbookv3 & scallop
     } else {
-      return "0x0ed287d6c3fe4962d0994ffddc1d19a15fba6a81533f3f0dcc2bbcedebce0637"
+      return "0xfd8a73ef0a4b928da9c27fc287dc37c1ca64df71da8e8eac7ca9ece55eb5f448"
     }
   }
 

package/src/transaction/cetus.ts

@@ -19,13 +19,13 @@ export class Cetus implements Dex {
     this.globalConfig =
       env === Env.Mainnet
         ? "0xdaa46292632c3c4d8f31f23ea0f9b36a28ff3677e9684980e4438403a67a3d8f"
-        : "0x6f4149091a5aea0e818e7243a13adcfb403842d670b9a2089de058512620687a"
+        : "0x9774e359588ead122af1c7e7f64e14ade261cfeecdb5d0eb4a5b3b4c8ab8bd3e"
 
     this.partner =
       partner ??
       (env === Env.Mainnet
         ? "0x639b5e433da31739e800cd085f356e64cae222966d0f1b11bd9dc76b322ff58b"
-        : "0x8e0b7668a79592f70fbfb1ae0aebaf9e2019a7049783b9a4b6fe7c6ae038b528")
+        : "0x1f5fa5c820f40d43fc47815ad06d95e40a1942ff72a732a92e8ef4aa8cde70a5")
   }
 
   flash_swap(

package/src/transaction/scallop.ts

@@ -31,6 +31,7 @@ export class Scallop implements Dex {
   ): Promise<TransactionObjectArgument> {
     const { direction, from, target } = path
 
+    // in scallop swap, the first coin type is always the common coin, the second coin type is always the special
     const [func, coinAType, coinBType] = direction
       ? ["swap_a2b", from, target]
       : ["swap_b2a", from, target]

package/src/transaction/swap.ts

@@ -1,18 +1,18 @@
 import { Transaction } from "@mysten/sui/transactions"
 import { SwapInPoolsParams } from "~/client"
 import { compareCoins, completionCoin } from "~/utils/coin"
-import { SwapInPoolsResult, U64_MAX_BN, ZERO } from ".."
+import { Env, SwapInPoolsResult, U64_MAX_BN, ZERO } from ".."
 import { ConfigErrorCode, TransactionErrorCode } from "~/errors"
-import { checkInvalidSuiAddress } from "~/utils/transaction"
+import { checkInvalidSuiAddress, printTransaction } from "~/utils/transaction"
 import { SuiClient } from "@mysten/sui/client"
 import { BN } from "bn.js"
 import { sqrtPriceX64ToPrice } from "~/math"
-import { error } from "console"
 
 export async function swapInPools(
   client: SuiClient,
   params: SwapInPoolsParams,
-  sender: string
+  sender: string,
+  env: Env
 ): Promise<SwapInPoolsResult> {
   const { from, target, amount, byAmountIn, pools } = params
   const fromCoin = completionCoin(from)
@@ -20,15 +20,14 @@ export async function swapInPools(
 
   const tx = new Transaction()
   const direction = compareCoins(fromCoin, targetCoin)
-  const integratePublishedAt =
-    "0x8faab90228e4c4df91c41626bbaefa19fc25c514405ac64de54578dec9e6f5ee"
+  const integratePublishedAt = env === Env.Mainnet ?
+    "0x3a5aa90ffa33d09100d7b6941ea1c0ffe6ab66e77062ddd26320c1b073aabb10" :
+    "0x19dd42e05fa6c9988a60d30686ee3feb776672b5547e328d6dab16563da65293"
   const coinA = direction ? fromCoin : targetCoin
   const coinB = direction ? targetCoin : fromCoin
 
   const typeArguments = [coinA, coinB]
-  console.log("typeArguments", typeArguments)
-
-  console.log("pools", pools)
+  console.log("typeArguments", typeArguments, integratePublishedAt)
 
   for (let i = 0; i < pools.length; i++) {
     const args = [
@@ -51,6 +50,8 @@ export async function swapInPools(
     )
   }
 
+  printTransaction(tx)
+
   const simulateRes = await client.devInspectTransactionBlock({
     transactionBlock: tx,
     sender,
@@ -97,7 +98,6 @@ export async function swapInPools(
   }
 
   const event = valueData[tempIndex].parsedJson.data
-  console.log("event", JSON.stringify(event, null, 2))
 
   const currentSqrtPrice = event.step_results[0].current_sqrt_price
 

package/tests/router.test.ts

@@ -1,21 +1,7 @@
 import { describe, test } from "@jest/globals"
 import dotenv from "dotenv"
 import { AggregatorClient } from "~/client"
-import {
-  M_CETUS,
-  M_ETH,
-  M_HASUI,
-  M_MICHI,
-  M_NAVI,
-  M_SHaSUI,
-  M_SSUI,
-  M_SSWP,
-  M_SUI,
-  M_USDC,
-  T_DBUSDC,
-  T_DBUSDT,
-  T_DEEP,
-} from "./test_data.test"
+import * as testData from "./test_data.test"
 import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519"
 import { printTransaction } from "~/utils/transaction"
 import BN from "bn.js"
@@ -47,48 +33,40 @@ describe("router module", () => {
       keypair = buildTestAccount()
     }
 
-    // const wallet = keypair.getPublicKey().toSuiAddress()
-
-    // console.log("wallet", wallet, "\n", wallet.toString())
-
-    // const wallet =
-      // "0x2a6174f94a2c1d648de290297be27867527a6aaa263a4e0a567c9cd7656d3651"
-    const wallet =
-      "0xca171941521153181ff729d53489eaae7e99c3f4692884afd7cca61154e4cec4"
-    // const wallet =
-    // "0xaabf2fedcb36146db164bec930b74a47969c4df98216e049342a3c49b6d11580"
-    // const wallet = "0x410456cfc689666936b6bf80fbec958b69499b9f7183ecba07de577c17248a44"
-    // const wallet = "0xca171941521153181ff729d53489eaae7e99c3f4692884afd7cca61154e4cec4"
+    const wallet = keypair.getPublicKey().toSuiAddress()
     console.log("wallet: ", wallet)
 
-    const endpoint =
-      "https://api-sui-cloudfront.cetus.zone/router_v2/find_routes"
-    // const endpoint =
-      // "https://api-sui.devcetus.com/router_v2/find_routes"
+    // // const endpoint =
+    // //   "https://api-sui-cloudfront.cetus.zone/router_v2/find_routes"
+    const endpoint = aggregatorURL
 
     const suiClient = new SuiClient({
-      url: "https://cetus-mainnet-rpc.blockvision.org:443/2R8NDfQ1v3UAqVAY8PwWQdB4FIb",
+      url: fullNodeURL,
     })
+    // const suiClient = new SuiClient({
+    //   url: "https://fullnode.testnet.sui.io:443",
+    // })
+
     client = new AggregatorClient(endpoint, wallet, suiClient, Env.Mainnet)
   })
 
-  test("Get all coins", () => {
-    return client.getAllCoins().then((coins) => {
+  test("Get coins", () => {
+    return client.getCoins(testData.M_wUSDC).then((coins) => {
       console.log(coins)
     })
   })
 
   test("Downgrade swap in route", async () => {
-    const amount = 100000000
+    const amount = 1000000
     const byAmountIn = true
 
     const res: any = await client.swapInPools({
-      from: "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI",
-      target: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC",
+      from: testData.M_USDC,
+      target: testData.M_SUI,
       amount: new BN(amount),
       byAmountIn,
       pools: [
-        '0x51e883ba7c0b566a26cbc8a94cd33eb0abd418a77cc1e60ad22fd9b1f29cd2ab', '0x03d7739b33fe221a830ff101042fa81fd19188feca04a335f7dea4e37c0fca81', '0xb8d7d9e66a60c239e7a60110efcf8de6c705580ed924d0dde141f4a0e2c90105'
+        '0xb8d7d9e66a60c239e7a60110efcf8de6c705580ed924d0dde141f4a0e2c90105'
       ],
     })
 
@@ -106,6 +84,8 @@ describe("router module", () => {
         refreshAllCoins: true,
       })
 
+      printTransaction(txb)
+
       let result = await client.devInspectTransactionBlock(txb)
       console.log("🚀 ~ file: router.test.ts:114 ~ test ~ result:", result)
     }
@@ -114,8 +94,8 @@ describe("router module", () => {
   test("Find router", async () => {
     const amount = "4239267610000000000"
     const res = await client.findRouters({
-      from: M_SUI,
-      target: M_USDC,
+      from: testData.M_SUI,
+      target: testData.M_USDC,
       amount: new BN(amount),
       byAmountIn: true,
       depth: 3,
@@ -132,9 +112,9 @@ describe("router module", () => {
 
   test("Build router tx", async () => {
     const byAmountIn = true
-    const amount = "18294510"
-    const target = M_ETH
-    const from = M_SHaSUI
+    const amount = "320000"
+    const target = "0x2::sui::SUI"
+    const from = "0x26b3bc67befc214058ca78ea9a2690298d731a2d4309485ec3d40198063c4abc::eth::ETH"
 
     const res = await client.findRouters({
       from,
@@ -172,6 +152,7 @@ describe("router module", () => {
         txb,
         slippage: 0.01,
         isMergeTragetCoin: false,
+        partner: "0x1f5fa5c820f40d43fc47815ad06d95e40a1942ff72a732a92e8ef4aa8cde70a5",
         refreshAllCoins: true,
         payDeepFeeAmount: 0,
       })
@@ -195,8 +176,8 @@ describe("router module", () => {
     const byAmountIn = false
     const amount = "10000000000"
 
-    const from = M_USDC
-    const target = M_SSWP
+    const from = testData.M_USDC
+    const target = testData.M_SSWP
 
     const res = await client.findRouters({
       from,
@@ -238,8 +219,8 @@ describe("router module", () => {
 
   test("Test Multi Input", async () => {
     const amounts = [1000000000, 2000000000, 10000000000000]
-    const froms = [M_USDC, M_SUI, M_CETUS, M_NAVI]
-    const tos = [M_SUI, M_USDC, M_USDC, M_SUI]
+    const froms = [testData.M_USDC, testData.M_SUI, testData.M_CETUS, testData.M_NAVI]
+    const tos = [testData.M_SUI, testData.M_USDC, testData.M_USDC, testData.M_SUI]
 
     for (let i = 0; i < froms.length; i++) {
       const from = froms[i]
@@ -295,13 +276,13 @@ describe("router module", () => {
     // const from = M_USDC
     // const target = M_SUI
 
-    const from = M_SUI
+    const from = testData.M_SUI
     // const target =
     //   "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI"
     // const target =
     //   "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc::afsui::AFSUI"
 
-    const target = M_HASUI
+    const target = testData.M_HASUI
 
     const res = await client.findRouters({
       from,

package/tests/test_data.test.ts

@@ -1,11 +1,13 @@
 // Testnet
-export const T_USDC = ""
+export const T_USDC = "0x26b3bc67befc214058ca78ea9a2690298d731a2d4309485ec3d40198063c4abc::usdc::USDC"
+export const T_USDT = "0x26b3bc67befc214058ca78ea9a2690298d731a2d4309485ec3d40198063c4abc::usdt::USDT"
 export const T_DEEP = "0x36dbef866a1d62bf7328989a10fb2f07d769f4ee587c0de4a0a256e57e0a58a8::deep::DEEP"
 export const T_DBUSDC = "0xf7152c05930480cd740d7311b5b8b45c6f488e3a53a11c3f74a6fac36a52e0d7::DBUSDC::DBUSDC"
 export const T_DBUSDT = "0xf7152c05930480cd740d7311b5b8b45c6f488e3a53a11c3f74a6fac36a52e0d7::DBUSDT::DBUSDT"
 
 // Mainnet
-export const M_USDC =
+export const M_USDC = "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC"
+export const M_wUSDC =
   "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN"
 export const M_CETUS =
   "0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b::cetus::CETUS"