@cetusprotocol/aggregator-sdk 0.0.2 → 0.0.4

package/dist/index.d.mts

@@ -114,6 +114,7 @@ type RouterData = {
     amountIn: BN;
     amountOut: BN;
     routes: Router[];
+    insufficientLiquidity: boolean;
 };
 type AggregatorResponse = {
     code: number;
@@ -165,7 +166,7 @@ declare class AggregatorClient {
     swapInPools(params: SwapInPoolsParams): Promise<SwapInPoolsResult | null>;
     routerSwap(params: BuildRouterSwapParams): Promise<Transaction>;
     signAndExecuteTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_client.SuiTransactionBlockResponse>;
-    devInspectTransactionBlock(txb: Transaction, signer: Signer): Promise<_mysten_sui_client.DevInspectResults>;
+    devInspectTransactionBlock(txb: Transaction): Promise<_mysten_sui_client.DevInspectResults>;
     sendTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_client.SuiTransactionBlockResponse>;
 }
 

package/dist/index.d.ts

@@ -114,6 +114,7 @@ type RouterData = {
     amountIn: BN;
     amountOut: BN;
     routes: Router[];
+    insufficientLiquidity: boolean;
 };
 type AggregatorResponse = {
     code: number;
@@ -165,7 +166,7 @@ declare class AggregatorClient {
     swapInPools(params: SwapInPoolsParams): Promise<SwapInPoolsResult | null>;
     routerSwap(params: BuildRouterSwapParams): Promise<Transaction>;
     signAndExecuteTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_client.SuiTransactionBlockResponse>;
-    devInspectTransactionBlock(txb: Transaction, signer: Signer): Promise<_mysten_sui_client.DevInspectResults>;
+    devInspectTransactionBlock(txb: Transaction): Promise<_mysten_sui_client.DevInspectResults>;
     sendTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_client.SuiTransactionBlockResponse>;
 }
 

package/dist/index.js

@@ -5347,7 +5347,14 @@ function buildInputCoin(txb, allCoins, amount, coinType) {
       targetCoinAmount: 0
     };
   }
-  if (CoinUtils.isSuiCoin(coinType)) {
+  let totalCoinBalance = CoinUtils.calculateTotalBalance(usedCoinAsests);
+  if (totalCoinBalance < amount) {
+    throw new AggregateError(
+      "Insufficient balance when build merge coin",
+      "InsufficientBalance" /* InsufficientBalance */
+    );
+  }
+  if (CoinUtils.isSuiCoin(coinType) && amount <= BigInt(95e10)) {
     const resultCoin = txb.splitCoins(txb.gas, [
       txb.pure.u64(amount.toString())
     ]);
@@ -5357,13 +5364,6 @@ function buildInputCoin(txb, allCoins, amount, coinType) {
       targetCoinAmount: Number(amount.toString())
     };
   }
-  let totalCoinBalance = CoinUtils.calculateTotalBalance(usedCoinAsests);
-  if (totalCoinBalance < amount) {
-    throw new AggregateError(
-      "Insufficient balance when build merge coin",
-      "InsufficientBalance" /* InsufficientBalance */
-    );
-  }
   let sortCoinAssets = CoinUtils.sortByBalance(usedCoinAsests);
   let totalThreeCoinBalance = sortCoinAssets.slice(0, 3).reduce((acc, coin) => acc + coin.balance, BigInt(0));
   if (totalThreeCoinBalance < BigInt(amount)) {
@@ -6459,7 +6459,8 @@ function swapInPools(client, params, config2) {
           amountOut: new import_bn3.BN((_e = event.amount_out) != null ? _e : 0),
           initialPrice
         }
-      ]
+      ],
+      insufficientLiquidity: false
     };
     const result = {
       isExceed: event.is_exceed,
@@ -6540,6 +6541,14 @@ var AggregatorClient = class {
         const res = parseRouterResponse(data.data);
         return res;
       }
+      if (data.msg === "liquidity is not enough") {
+        return {
+          amountIn: ZERO,
+          amountOut: ZERO,
+          routes: [],
+          insufficientLiquidity: true
+        };
+      }
       return null;
     });
   }
@@ -6549,6 +6558,7 @@ var AggregatorClient = class {
       try {
         result = yield swapInPools(this.client, params, this.config);
       } catch (e) {
+        console.error("swapInPools error:", e);
         return null;
       }
       return result;
@@ -6664,11 +6674,12 @@ var AggregatorClient = class {
       return res;
     });
   }
-  devInspectTransactionBlock(txb, signer) {
+  devInspectTransactionBlock(txb) {
     return __async(this, null, function* () {
+      console.log(this.wallet);
       const res = yield this.client.devInspectTransactionBlock({
         transactionBlock: txb,
-        sender: signer.getPublicKey().toSuiAddress()
+        sender: this.wallet
       });
       return res;
     });
@@ -6687,6 +6698,7 @@ function parseRouterResponse(data) {
   return {
     amountIn: new import_bn4.default(data.amount_in.toString()),
     amountOut: new import_bn4.default(data.amount_out.toString()),
+    insufficientLiquidity: false,
     routes: data.routes.map((route) => {
       return {
         path: route.path.map((path) => {

package/dist/index.mjs

@@ -5345,7 +5345,14 @@ function buildInputCoin(txb, allCoins, amount, coinType) {
       targetCoinAmount: 0
     };
   }
-  if (CoinUtils.isSuiCoin(coinType)) {
+  let totalCoinBalance = CoinUtils.calculateTotalBalance(usedCoinAsests);
+  if (totalCoinBalance < amount) {
+    throw new AggregateError(
+      "Insufficient balance when build merge coin",
+      "InsufficientBalance" /* InsufficientBalance */
+    );
+  }
+  if (CoinUtils.isSuiCoin(coinType) && amount <= BigInt(95e10)) {
     const resultCoin = txb.splitCoins(txb.gas, [
       txb.pure.u64(amount.toString())
     ]);
@@ -5355,13 +5362,6 @@ function buildInputCoin(txb, allCoins, amount, coinType) {
       targetCoinAmount: Number(amount.toString())
     };
   }
-  let totalCoinBalance = CoinUtils.calculateTotalBalance(usedCoinAsests);
-  if (totalCoinBalance < amount) {
-    throw new AggregateError(
-      "Insufficient balance when build merge coin",
-      "InsufficientBalance" /* InsufficientBalance */
-    );
-  }
   let sortCoinAssets = CoinUtils.sortByBalance(usedCoinAsests);
   let totalThreeCoinBalance = sortCoinAssets.slice(0, 3).reduce((acc, coin) => acc + coin.balance, BigInt(0));
   if (totalThreeCoinBalance < BigInt(amount)) {
@@ -6457,7 +6457,8 @@ function swapInPools(client, params, config2) {
           amountOut: new import_bn3.BN((_e = event.amount_out) != null ? _e : 0),
           initialPrice
         }
-      ]
+      ],
+      insufficientLiquidity: false
     };
     const result = {
       isExceed: event.is_exceed,
@@ -6538,6 +6539,14 @@ var AggregatorClient = class {
         const res = parseRouterResponse(data.data);
         return res;
       }
+      if (data.msg === "liquidity is not enough") {
+        return {
+          amountIn: ZERO,
+          amountOut: ZERO,
+          routes: [],
+          insufficientLiquidity: true
+        };
+      }
       return null;
     });
   }
@@ -6547,6 +6556,7 @@ var AggregatorClient = class {
       try {
         result = yield swapInPools(this.client, params, this.config);
       } catch (e) {
+        console.error("swapInPools error:", e);
         return null;
       }
       return result;
@@ -6662,11 +6672,12 @@ var AggregatorClient = class {
       return res;
     });
   }
-  devInspectTransactionBlock(txb, signer) {
+  devInspectTransactionBlock(txb) {
     return __async(this, null, function* () {
+      console.log(this.wallet);
       const res = yield this.client.devInspectTransactionBlock({
         transactionBlock: txb,
-        sender: signer.getPublicKey().toSuiAddress()
+        sender: this.wallet
       });
       return res;
     });
@@ -6685,6 +6696,7 @@ function parseRouterResponse(data) {
   return {
     amountIn: new import_bn4.default(data.amount_in.toString()),
     amountOut: new import_bn4.default(data.amount_out.toString()),
+    insufficientLiquidity: false,
     routes: data.routes.map((route) => {
       return {
         path: route.path.map((path) => {

package/dist/src/client.d.ts

@@ -31,6 +31,7 @@ export type RouterData = {
     amountIn: BN;
     amountOut: BN;
     routes: Router[];
+    insufficientLiquidity: boolean;
 };
 export type AggregatorResponse = {
     code: number;
@@ -82,6 +83,6 @@ export declare class AggregatorClient {
     swapInPools(params: SwapInPoolsParams): Promise<SwapInPoolsResult | null>;
     routerSwap(params: BuildRouterSwapParams): Promise<Transaction>;
     signAndExecuteTransaction(txb: Transaction, signer: Signer): Promise<import("@mysten/sui/client").SuiTransactionBlockResponse>;
-    devInspectTransactionBlock(txb: Transaction, signer: Signer): Promise<import("@mysten/sui/client").DevInspectResults>;
+    devInspectTransactionBlock(txb: Transaction): Promise<import("@mysten/sui/client").DevInspectResults>;
     sendTransaction(txb: Transaction, signer: Signer): Promise<import("@mysten/sui/client").SuiTransactionBlockResponse>;
 }

package/dist/src/utils/coin.d.ts

@@ -1,4 +1,2 @@
 export declare function completionCoin(s: string): string;
 export declare function compareCoins(coinA: string, coinB: string): boolean;
-export declare function parseTurbosPoolFeeType(typeData: string): string | null;
-export declare function parseAftermathFeeType(typeData: string): string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cetusprotocol/aggregator-sdk",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "sideEffects": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -38,4 +38,4 @@
     "ts-jest": "^29.1.3",
     "typescript": "^5.4.5"
   }
-}
+}

package/src/client.ts

@@ -1,7 +1,7 @@
 import type { AggregatorConfig } from "./config"
 import Decimal from "decimal.js"
 import { SuiClient } from "@mysten/sui/client"
-import { CoinAsset } from "./types/sui"
+import { CoinAsset, SuiAddress } from "./types/sui"
 import { createTarget, extractStructTagFromType } from "./utils"
 import { Transaction } from "@mysten/sui/transactions"
 import {
@@ -16,7 +16,7 @@ import BN from "bn.js"
 import { swapInPools } from "./transaction/swap"
 import { completionCoin } from "./utils/coin"
 import { SUI_FRAMEWORK_ADDRESS } from "@mysten/sui/utils"
-import { AFTERMATH_AMM, JOIN_FUNC, PAY_MODULE, TURBOS_DEX } from "./const"
+import { AFTERMATH_AMM, JOIN_FUNC, PAY_MODULE, TURBOS_DEX, ZERO } from "./const"
 
 export type ExtendedDetails = {
   aftermathPoolFlatness?: number
@@ -48,6 +48,7 @@ export type RouterData = {
   amountIn: BN
   amountOut: BN
   routes: Router[]
+  insufficientLiquidity: boolean
 }
 
 export type AggregatorResponse = {
@@ -190,6 +191,14 @@ export class AggregatorClient {
       return res
     }
 
+    if (data.msg === "liquidity is not enough") {
+      return {
+        amountIn: ZERO,
+        amountOut: ZERO,
+        routes: [],
+        insufficientLiquidity: true,
+      }
+    }
     return null
   }
 
@@ -200,6 +209,7 @@ export class AggregatorClient {
     try {
       result = await swapInPools(this.client, params, this.config)
     } catch (e) {
+      console.error("swapInPools error:", e)
       return null
     }
 
@@ -226,6 +236,7 @@ export class AggregatorClient {
     )
 
     const txb = new Transaction()
+    // txb.setGasBudget(42392686100000000)
 
     if (refreshAllCoins || this.allCoins.length === 0) {
       this.allCoins = await this.getAllCoins()
@@ -320,10 +331,11 @@ export class AggregatorClient {
     return res
   }
 
-  async devInspectTransactionBlock(txb: Transaction, signer: Signer) {
+  async devInspectTransactionBlock(txb: Transaction) {
+    console.log(this.wallet)
     const res = await this.client.devInspectTransactionBlock({
       transactionBlock: txb,
-      sender: signer.getPublicKey().toSuiAddress(),
+      sender: this.wallet,
     })
 
     return res
@@ -343,6 +355,7 @@ function parseRouterResponse(data: any): RouterData {
   return {
     amountIn: new BN(data.amount_in.toString()),
     amountOut: new BN(data.amount_out.toString()),
+    insufficientLiquidity: false,
     routes: data.routes.map((route: any) => {
       return {
         path: route.path.map((path: any) => {

package/src/math.ts

@@ -7,7 +7,11 @@ import { ZERO } from "./const"
 import Decimal from "decimal.js"
 
 // `slippage` is a percentage, for example, 0.01 means 1%.
-export function CalculateAmountLimit(expectAmount: BN, byAmountIn: boolean, slippage: number): number {
+export function CalculateAmountLimit(
+  expectAmount: BN,
+  byAmountIn: boolean,
+  slippage: number
+): number {
   let amountLimit = ZERO
   if (byAmountIn) {
     amountLimit = expectAmount.muln(1 - slippage)
@@ -18,20 +22,22 @@ export function CalculateAmountLimit(expectAmount: BN, byAmountIn: boolean, slip
   return Number(amountLimit.toString())
 }
 
-const MAX_SQER_PRICE_X64 = '79226673515401279992447579055'
-const MIN_SQER_PRICE_X64 = '4295048016'
+const MAX_SQER_PRICE_X64 = "79226673515401279992447579055"
+const MIN_SQER_PRICE_X64 = "4295048016"
 
 export function GetDefaultSqrtPriceLimit(a2b: boolean): BN {
   if (a2b) {
     return new BN(MIN_SQER_PRICE_X64)
   } else {
-      return new BN(MAX_SQER_PRICE_X64)
+    return new BN(MAX_SQER_PRICE_X64)
   }
 }
 
-export function sqrtPriceX64ToPrice(sqrtPriceStr: string, decimalsA: number, decimalsB: number): Decimal {
+export function sqrtPriceX64ToPrice(
+  sqrtPriceStr: string,
+  decimalsA: number,
+  decimalsB: number
+): Decimal {
   const sqrtPriceX64 = new Decimal(sqrtPriceStr).mul(Decimal.pow(2, -64))
-  return sqrtPriceX64
-    .pow(2)
-    .mul(Decimal.pow(10, decimalsA - decimalsB))
+  return sqrtPriceX64.pow(2).mul(Decimal.pow(10, decimalsA - decimalsB))
 }

package/src/transaction/common.ts

@@ -51,7 +51,15 @@ export function buildInputCoin(
     }
   }
 
-  if (CoinUtils.isSuiCoin(coinType)) {
+  let totalCoinBalance = CoinUtils.calculateTotalBalance(usedCoinAsests)
+  if (totalCoinBalance < amount) {
+    throw new AggregateError(
+      "Insufficient balance when build merge coin",
+      TransactionErrorCode.InsufficientBalance
+    )
+  }
+
+  if (CoinUtils.isSuiCoin(coinType) && amount <= BigInt(950000000000)) {
     const resultCoin = txb.splitCoins(txb.gas, [
       txb.pure.u64(amount.toString()),
     ])
@@ -62,14 +70,6 @@ export function buildInputCoin(
     }
   }
 
-  let totalCoinBalance = CoinUtils.calculateTotalBalance(usedCoinAsests)
-  if (totalCoinBalance < amount) {
-    throw new AggregateError(
-      "Insufficient balance when build merge coin",
-      TransactionErrorCode.InsufficientBalance
-    )
-  }
-
   // sort used coin by amount, asc
   let sortCoinAssets = CoinUtils.sortByBalance(usedCoinAsests)
 

package/src/transaction/router.ts

@@ -26,7 +26,6 @@ import { transferOrDestoryCoin } from "./common"
 import { GetDefaultSqrtPriceLimit } from "../math"
 import { flowxAmmSwapMovecall } from "./flowx"
 import { turbosSwapMovecall } from "./turbos"
-import { parseAftermathFeeType, parseTurbosPoolFeeType } from "~/utils/coin"
 import { AftermathAmmSwapMovecall } from "./aftermath"
 import { TransactionErrorCode } from "~/errors"
 

package/src/transaction/swap.ts

@@ -152,6 +152,7 @@ export async function swapInPools(
         initialPrice,
       },
     ],
+    insufficientLiquidity: false,
   }
 
   const result = {

package/src/utils/coin.ts

@@ -38,24 +38,3 @@ export function compareCoins(coinA: string, coinB: string): boolean {
   // If both strings are the same length and all characters are equal
   return true // or coinB, they are equal
 }
-
-export function parseTurbosPoolFeeType(typeData: string) {
-  // "0x91bfbc386a41afcfd9b2533058d7e915a1d3829089cc268ff4333d54d6339ca1::pool::Pool<0xc91acfb75009c5ff2fd57c54f3caaee12ad1fbe997681334adc0b574fc277a07::icorgi::ICORGI, 0x2::sui::SUI, 0x91bfbc386a41afcfd9b2533058d7e915a1d3829089cc268ff4333d54d6339ca1::fee10000bps::FEE10000BPS>"
-  const regex = /,([^,>]*>)/g
-  const matches = [...typeData.matchAll(regex)]
-  if (matches.length > 0) {
-    const lastMatch = matches[matches.length - 1][1]
-    return lastMatch.substring(0, lastMatch.length - 1).trim()
-  }
-  return null
-}
-
-export function parseAftermathFeeType(typeData: string) {
-  // 0xefe170ec0be4d762196bedecd7a065816576198a6527c99282a2551aaa7da38c::pool::Pool<0xf66c5ba62888cd0694677bbfbd2332d08ead3b8a4332c40006c474e83b1a6786::af_lp::AF_LP>
-  // get 0xf66c5ba62888cd0694677bbfbd2332d08ead3b8a4332c40006c474e83b1a6786::af_lp::AF_LP
-  const regex = /<([^>]*)>/
-  const matches = typeData.match(regex)
-  if (matches) {
-    return matches[1]
-  }
-}

package/tests/math.test.ts

@@ -0,0 +1,13 @@
+import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519"
+import { sqrtPriceX64ToPrice } from "~/math"
+
+describe("test math functions", () => {
+  test("test sqrt price x64 to price", () => {
+    const sqrtPriceStr = "1312674575678912631"
+    const decimalsA = 9
+    const decimalsB = 6
+
+    const price = sqrtPriceX64ToPrice(sqrtPriceStr, decimalsA, decimalsB)
+    console.log("price", price.toFixed(9))
+  })
+})

package/tests/router.test.ts

@@ -15,6 +15,7 @@ import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519"
 import { printTransaction } from "~/utils/transaction"
 import BN from "bn.js"
 import { fromHEX } from "@mysten/bcs"
+import { fromB64 } from "@mysten/sui/utils"
 
 dotenv.config()
 
@@ -35,16 +36,17 @@ describe("router module", () => {
     const secret = process.env.SUI_WALLET_SECRET!
 
     // const byte = Buffer.from(secret, "hex")
-    const byte = Buffer.from(secret, "base64")
-    const u8Array = new Uint8Array(byte)
     // keypair = secret
     //   ? Ed25519Keypair.fromSecretKey(u8Array.slice(1, 33))
     //   : buildTestAccount()
+    const byte = Buffer.from(secret, "base64")
+    const u8Array = new Uint8Array(byte)
 
-    keypair = Ed25519Keypair.fromSecretKey(fromHEX(secret))
+    keypair = Ed25519Keypair.fromSecretKey(fromB64(secret).slice(1, 33))
 
     const wallet = keypair.getPublicKey().toSuiAddress()
     console.log("wallet", wallet)
+
     // const wallet =
     // "0x1d30e55c730f92a02a33dbdf6b052cd178e5d924aa58c5e2350a24852250ae58"
     // const wallet = "0xaabf2fedcb36146db164bec930b74a47969c4df98216e049342a3c49b6d11580"
@@ -93,12 +95,12 @@ describe("router module", () => {
     const amount = 1000000
 
     const res = await client.swapInPools({
-      from: M_NAVI,
+      from: M_USDC,
       target: M_SUI,
       amount: new BN(amount),
-      byAmountIn: false,
+      byAmountIn: true,
       pools: [
-        "0x0254747f5ca059a1972cd7f6016485d51392a3fde608107b93bbaebea550f703",
+        "0xcf994611fd4c48e277ce3ffd4d4364c914af2c3cbb05f7bf6facd371de688630",
       ],
     })
 
@@ -108,26 +110,18 @@ describe("router module", () => {
   })
 
   test("Find router", async () => {
-    const amount = "10000000000000000"
+    const amount = "42392676100000000"
 
     const res = await client.findRouter({
       from: M_SUI,
       target: M_USDC,
       amount: new BN(amount),
       byAmountIn: true,
-      depth: 1,
+      depth: 3,
       splitAlgorithm: null,
       splitFactor: null,
       splitCount: 1,
-      providers: [
-        "AFTERMATH",
-        "CETUS",
-        "DEEPBOOK",
-        "KRIYA",
-        "FLOWX",
-        "AFTERMATH",
-        "TRUBOS",
-      ],
+      providers: ["CETUS"],
     })
 
     if (res != null) {
@@ -140,10 +134,10 @@ describe("router module", () => {
 
   test("Build router tx", async () => {
     const byAmountIn = true
-    const amount = 500000000
+    const amount = "42392676100000000"
 
     const from = M_SUI
-    const target = M_NAVI
+    const target = M_USDC
 
     const res = await client.findRouter({
       from,
@@ -154,7 +148,7 @@ describe("router module", () => {
       splitAlgorithm: null,
       splitFactor: null,
       splitCount: null,
-      providers: ["CETUS", "DEEPBOOK", "KRIYA", "FLOWX", "AFTERMATH", "TURBOS"],
+      providers: ["CETUS"],
     })
 
     if (res != null) {
@@ -175,12 +169,11 @@ describe("router module", () => {
         fromCoinType: from,
         targetCoinType: target,
         partner: undefined,
-        isMergeTragetCoin: true,
+        isMergeTragetCoin: false,
+        refreshAllCoins: true,
       })
 
-      printTransaction(routerTx)
-
-      let result = await client.devInspectTransactionBlock(routerTx, keypair)
+      let result = await client.devInspectTransactionBlock(routerTx)
 
       if (result.effects.status.status === "success") {
         console.log("Sim exec transaction success")
@@ -233,10 +226,7 @@ describe("router module", () => {
               isMergeTragetCoin: false,
             })
 
-            let result = await client.devInspectTransactionBlock(
-              routerTx,
-              keypair
-            )
+            let result = await client.devInspectTransactionBlock(routerTx)
             // console.log('result', result)
 
             if (result.effects.status.status === "success") {

package/src/utils/coin.spec.ts

@@ -1,10 +0,0 @@
-import { parseTurbosPoolFeeType } from "./coin"
-
-describe("Coin Utils", () => {
-  it("should fetch token infos by URL and return data", async () => {
-    const typeDate =
-      "0x91bfbc386a41afcfd9b2533058d7e915a1d3829089cc268ff4333d54d6339ca1::pool::Pool<0xc91acfb75009c5ff2fd57c54f3caaee12ad1fbe997681334adc0b574fc277a07::icorgi::ICORGI, 0x2::sui::SUI, 0x91bfbc386a41afcfd9b2533058d7e915a1d3829089cc268ff4333d54d6339ca1::fee10000bps::FEE10000BPS>"
-    const result = parseTurbosPoolFeeType(typeDate)
-    console.log("parse turbos pool type", result)
-  })
-})