@cetusprotocol/aggregator-sdk 0.0.7 → 0.0.8

package/dist/index.js

@@ -5364,17 +5364,14 @@ function buildInputCoin(txb, allCoins, amount, coinType) {
       targetCoinAmount: 0
     };
   }
-  console.log("used coin asests", usedCoinAsests);
   let totalCoinBalance = CoinUtils.calculateTotalBalance(usedCoinAsests);
-  console.log("totalCoinBalance", totalCoinBalance);
-  console.log("amount", amount);
   if (totalCoinBalance < amount) {
     throw new AggregateError(
       "Insufficient balance when build merge coin",
       "InsufficientBalance" /* InsufficientBalance */
     );
   }
-  if (CoinUtils.isSuiCoin(coinType) && amount <= BigInt(95e10)) {
+  if (CoinUtils.isSuiCoin(coinType)) {
     const resultCoin = txb.splitCoins(txb.gas, [
       txb.pure.u64(amount.toString())
     ]);
@@ -5933,7 +5930,7 @@ function flowxAmmSwapMovecall(swapParams, txb, config2) {
 }
 
 // src/transaction/turbos.ts
-function turbosSwapMovecall(swapParams, txb, config2) {
+function turbosClmmSwapMovecall(swapParams, txb, config2) {
   return __async(this, null, function* () {
     const aggregatorPackage = config2.getPackage(AGGREGATOR);
     if (aggregatorPackage == null) {
@@ -6093,7 +6090,6 @@ function expectInputRouterSwap(client, params, txb, fromCoin, config2, partner)
             coinAType: path.a2b ? path.from : path.target,
             coinBType: path.a2b ? path.target : path.from
           };
-          firstPathPool && router.path.length > 1;
           const swapResult = yield cetusSwapWithOutLimit(
             swapParams,
             nextFromCoin,
@@ -6198,7 +6194,7 @@ function expectInputRouterSwap(client, params, txb, fromCoin, config2, partner)
             coinBType: path.a2b ? path.target : path.from,
             feeType
           };
-          const swapResult = yield turbosSwapMovecall(swapParams, txb, config2);
+          const swapResult = yield turbosClmmSwapMovecall(swapParams, txb, config2);
           intermediateTargetCoin = swapResult.targetCoin;
           nextFromCoin = intermediateTargetCoin;
           nextFlashAmount = swapResult.amountOut;

package/dist/index.mjs

@@ -5362,17 +5362,14 @@ function buildInputCoin(txb, allCoins, amount, coinType) {
       targetCoinAmount: 0
     };
   }
-  console.log("used coin asests", usedCoinAsests);
   let totalCoinBalance = CoinUtils.calculateTotalBalance(usedCoinAsests);
-  console.log("totalCoinBalance", totalCoinBalance);
-  console.log("amount", amount);
   if (totalCoinBalance < amount) {
     throw new AggregateError(
       "Insufficient balance when build merge coin",
       "InsufficientBalance" /* InsufficientBalance */
     );
   }
-  if (CoinUtils.isSuiCoin(coinType) && amount <= BigInt(95e10)) {
+  if (CoinUtils.isSuiCoin(coinType)) {
     const resultCoin = txb.splitCoins(txb.gas, [
       txb.pure.u64(amount.toString())
     ]);
@@ -5931,7 +5928,7 @@ function flowxAmmSwapMovecall(swapParams, txb, config2) {
 }
 
 // src/transaction/turbos.ts
-function turbosSwapMovecall(swapParams, txb, config2) {
+function turbosClmmSwapMovecall(swapParams, txb, config2) {
   return __async(this, null, function* () {
     const aggregatorPackage = config2.getPackage(AGGREGATOR);
     if (aggregatorPackage == null) {
@@ -6091,7 +6088,6 @@ function expectInputRouterSwap(client, params, txb, fromCoin, config2, partner)
             coinAType: path.a2b ? path.from : path.target,
             coinBType: path.a2b ? path.target : path.from
           };
-          firstPathPool && router.path.length > 1;
           const swapResult = yield cetusSwapWithOutLimit(
             swapParams,
             nextFromCoin,
@@ -6196,7 +6192,7 @@ function expectInputRouterSwap(client, params, txb, fromCoin, config2, partner)
             coinBType: path.a2b ? path.target : path.from,
             feeType
           };
-          const swapResult = yield turbosSwapMovecall(swapParams, txb, config2);
+          const swapResult = yield turbosClmmSwapMovecall(swapParams, txb, config2);
           intermediateTargetCoin = swapResult.targetCoin;
           nextFromCoin = intermediateTargetCoin;
           nextFlashAmount = swapResult.amountOut;

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

@@ -19,4 +19,4 @@ export type TurbosSwapResult = {
     amountOut: TransactionArgument;
     txb: Transaction;
 };
-export declare function turbosSwapMovecall(swapParams: TurbosSwapParams, txb: Transaction, config: AggregatorConfig): Promise<TurbosSwapResult>;
+export declare function turbosClmmSwapMovecall(swapParams: TurbosSwapParams, txb: Transaction, config: AggregatorConfig): Promise<TurbosSwapResult>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cetusprotocol/aggregator-sdk",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "sideEffects": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/transaction/common.ts

@@ -51,12 +51,7 @@ export function buildInputCoin(
     }
   }
 
-  console.log("used coin asests", usedCoinAsests)
-
   let totalCoinBalance = CoinUtils.calculateTotalBalance(usedCoinAsests)
-
-  console.log("totalCoinBalance", totalCoinBalance)
-  console.log("amount", amount)
   if (totalCoinBalance < amount) {
     throw new AggregateError(
       "Insufficient balance when build merge coin",
@@ -64,7 +59,7 @@ export function buildInputCoin(
     )
   }
 
-  if (CoinUtils.isSuiCoin(coinType) && amount <= BigInt(950000000000)) {
+  if (CoinUtils.isSuiCoin(coinType)) {
     const resultCoin = txb.splitCoins(txb.gas, [
       txb.pure.u64(amount.toString()),
     ])

package/src/transaction/router.ts

@@ -25,7 +25,7 @@ import {
 import { transferOrDestoryCoin } from "./common"
 import { GetDefaultSqrtPriceLimit } from "../math"
 import { flowxAmmSwapMovecall } from "./flowx"
-import { turbosSwapMovecall } from "./turbos"
+import { turbosClmmSwapMovecall } from "./turbos"
 import { AftermathAmmSwapMovecall } from "./aftermath"
 import { TransactionErrorCode } from "~/errors"
 
@@ -47,7 +47,6 @@ export async function expectInputRouterSwap(
     const router = params.routers[i]
     let intermediateTargetCoin: TransactionObjectArgument
     let nextFromCoin = fromCoins[i] as TransactionObjectArgument
-
     let nextFlashAmount: TransactionArgument = txb.pure.u64(splitAmounts[i])
 
     for (let j = 0; j < router.path.length; j++) {
@@ -67,7 +66,6 @@ export async function expectInputRouterSwap(
           coinBType: path.a2b ? path.target : path.from,
         }
 
-        const returnPayAmount = firstPathPool && router.path.length > 1
         const swapResult = await cetusSwapWithOutLimit(
           swapParams,
           nextFromCoin,
@@ -192,7 +190,7 @@ export async function expectInputRouterSwap(
           feeType,
         }
 
-        const swapResult = await turbosSwapMovecall(swapParams, txb, config)
+        const swapResult = await turbosClmmSwapMovecall(swapParams, txb, config)
 
         intermediateTargetCoin = swapResult.targetCoin
         nextFromCoin = intermediateTargetCoin

package/src/transaction/swap.ts

@@ -2,14 +2,7 @@ import { Transaction } from "@mysten/sui/transactions"
 import { SwapInPoolsParams } from "~/client"
 import { AggregatorConfig } from "~/config"
 import { compareCoins, completionCoin } from "~/utils/coin"
-import {
-  CETUS_DEX,
-  INTEGRATE,
-  RouterData,
-  SwapInPoolsResult,
-  U64_MAX_BN,
-  ZERO,
-} from ".."
+import { CETUS_DEX, INTEGRATE, SwapInPoolsResult, U64_MAX_BN, ZERO } from ".."
 import { ConfigErrorCode, TransactionErrorCode } from "~/errors"
 import { checkInvalidSuiAddress } from "~/utils/transaction"
 import { SuiClient } from "@mysten/sui/client"

package/src/transaction/turbos.ts

@@ -36,7 +36,7 @@ export type TurbosSwapResult = {
   txb: Transaction
 }
 
-export async function turbosSwapMovecall(
+export async function turbosClmmSwapMovecall(
   swapParams: TurbosSwapParams,
   txb: Transaction,
   config: AggregatorConfig

package/tests/router.test.ts

@@ -2,15 +2,7 @@ import { describe, expect, test } from "@jest/globals"
 import dotenv from "dotenv"
 import { AggregatorClient } from "~/client"
 import { AggregatorConfig, ENV } from "~/config"
-import {
-  M_CETUS,
-  M_HASUI,
-  M_NAVI,
-  M_SUI,
-  M_USDC,
-  M_VAPOR,
-  M_VSUI,
-} from "../src/test_data.test"
+import { M_CETUS, M_HASUI, M_NAVI, M_SUI, M_USDC } from "../src/test_data.test"
 import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519"
 import { printTransaction } from "~/utils/transaction"
 import BN from "bn.js"
@@ -42,15 +34,19 @@ describe("router module", () => {
     //   : buildTestAccount()
     const byte = Buffer.from(secret, "base64")
     const u8Array = new Uint8Array(byte)
+    const secretKey = fromB64(secret)
+    console.log("secret key", secretKey.toString())
 
-    // keypair = Ed25519Keypair.fromSecretKey(fromB64(secret).slice(1, 33))
+    keypair = Ed25519Keypair.fromSecretKey(fromB64(secret).slice(1, 33))
 
     // const wallet = keypair.getPublicKey().toSuiAddress()
-    // console.log("wallet", wallet)
 
+    // console.log("wallet", wallet, "\n", wallet.toString())
+
+    // const wallet =
+    // "0xfba94aa36e93ccc7d84a6a57040fc51983223f1b522a8d0be3c3bf2c98977ebb"
     const wallet =
-      "0xfba94aa36e93ccc7d84a6a57040fc51983223f1b522a8d0be3c3bf2c98977ebb"
-    // const wallet = "0xaabf2fedcb36146db164bec930b74a47969c4df98216e049342a3c49b6d11580"
+      "0xaabf2fedcb36146db164bec930b74a47969c4df98216e049342a3c49b6d11580"
     // const wallet = "0x410456cfc689666936b6bf80fbec958b69499b9f7183ecba07de577c17248a44"
     // const wallet = "0xca171941521153181ff729d53489eaae7e99c3f4692884afd7cca61154e4cec4"
     // console.log("wallet: ", wallet)
@@ -135,10 +131,10 @@ describe("router module", () => {
 
   test("Build router tx", async () => {
     const byAmountIn = true
-    const amount = "1000000"
+    const amount = "3000000000000"
 
-    const from = M_USDC
-    const target = M_SUI
+    const from = M_SUI
+    const target = M_USDC
 
     const res = await client.findRouter({
       from,