@cetusprotocol/aggregator-sdk 0.2.0 → 0.2.2

package/dist/src/api.d.ts

@@ -10,11 +10,19 @@ export interface FindRouterParams {
     splitFactor?: number;
     splitCount?: number;
     providers?: string[];
+    liquidityChanges?: PreSwapLpChangeParams[];
+}
+export interface PreSwapLpChangeParams {
+    poolID: string;
+    ticklower: number;
+    tickUpper: number;
+    deltaLiquidity: number;
 }
 export type ExtendedDetails = {
     aftermathPoolFlatness?: number;
     aftermathLpSupplyType?: string;
     turbosFeeType?: string;
+    afterSqrtPrice?: string;
 };
 export type Path = {
     id: string;

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

@@ -1 +1,2 @@
 export * from './contracts';
+export * from './msafe';

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

@@ -0,0 +1,2 @@
+export declare const dealWithFastRouterSwapParamsForMsafe: (data: any) => any;
+export declare const restituteMsafeFastRouterSwapParams: (data: any) => any;

package/package.json

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

package/src/api.ts

@@ -18,12 +18,21 @@ export interface FindRouterParams {
   splitFactor?: number
   splitCount?: number
   providers?: string[]
+  liquidityChanges?: PreSwapLpChangeParams[]
+}
+
+export interface PreSwapLpChangeParams {
+  poolID: string
+  ticklower: number
+  tickUpper: number
+  deltaLiquidity: number
 }
 
 export type ExtendedDetails = {
   aftermathPoolFlatness?: number
   aftermathLpSupplyType?: string
   turbosFeeType?: string
+  afterSqrtPrice?: string
 }
 
 export type Path = {
@@ -69,45 +78,17 @@ export async function getRouterResult(
   endpoint: string,
   params: FindRouterParams
 ): Promise<RouterData | null> {
-  const {
-    from,
-    target,
-    amount,
-    byAmountIn,
-    depth,
-    splitAlgorithm,
-    splitFactor,
-    splitCount,
-    providers,
-  } = params
-  const fromCoin = completionCoin(from)
-  const targetCoin = completionCoin(target)
-
-  let url = `${endpoint}?from=${fromCoin}&target=${targetCoin}&amount=${amount.toString()}&by_amount_in=${byAmountIn}`
-
-  if (depth) {
-    url += `&depth=${depth}`
+  let response
+  if (params.liquidityChanges && params.liquidityChanges.length > 0) {
+    response = await postRouterWithLiquidityChanges(endpoint, params)
+  } else {
+    response = await getRouter(endpoint, params)
   }
 
-  if (splitAlgorithm) {
-    url += `&split_algorithm=${splitAlgorithm}`
+  if (!response) {
+    return null
   }
 
-  if (splitFactor) {
-    url += `&split_factor=${splitFactor}`
-  }
-
-  if (splitCount) {
-    url += `&split_count=${splitCount}`
-  }
-
-  if (providers) {
-    if (providers.length > 0) {
-      url += `&providers=${providers.join(",")}`
-    }
-  }
-
-  const response = await fetch(url)
   if (!response.ok) {
     return {
       amountIn: ZERO,
@@ -142,3 +123,111 @@ export async function getRouterResult(
     },
   }
 }
+
+async function getRouter(endpoint: string, params: FindRouterParams) {
+  try {
+    const {
+      from,
+      target,
+      amount,
+      byAmountIn,
+      depth,
+      splitAlgorithm,
+      splitFactor,
+      splitCount,
+      providers,
+    } = params
+    const fromCoin = completionCoin(from)
+    const targetCoin = completionCoin(target)
+
+    let url = `${endpoint}?from=${fromCoin}&target=${targetCoin}&amount=${amount.toString()}&by_amount_in=${byAmountIn}`
+
+    if (depth) {
+      url += `&depth=${depth}`
+    }
+
+    if (splitAlgorithm) {
+      url += `&split_algorithm=${splitAlgorithm}`
+    }
+
+    if (splitFactor) {
+      url += `&split_factor=${splitFactor}`
+    }
+
+    if (splitCount) {
+      url += `&split_count=${splitCount}`
+    }
+
+    if (providers) {
+      if (providers.length > 0) {
+        url += `&providers=${providers.join(",")}`
+      }
+    }
+
+    const response = await fetch(url)
+    return response
+  } catch (error) {
+    console.error(error)
+    return null
+  }
+}
+
+async function postRouterWithLiquidityChanges(
+  endpoint: string,
+  params: FindRouterParams
+) {
+  const {
+    from,
+    target,
+    amount,
+    byAmountIn,
+    depth,
+    splitAlgorithm,
+    splitFactor,
+    splitCount,
+    providers,
+    liquidityChanges,
+  } = params
+
+  const fromCoin = completionCoin(from)
+  const targetCoin = completionCoin(target)
+
+  const url = `${endpoint}`
+
+  const providersStr = providers?.join(",")
+
+  const requestData = {
+    from: fromCoin,
+    target: targetCoin,
+    amount: Number(amount.toString()),
+    by_amount_in: byAmountIn,
+    depth,
+    split_algorithm: splitAlgorithm,
+    split_factor: splitFactor,
+    split_count: splitCount,
+    providers: providersStr,
+    liquidity_changes: liquidityChanges!.map((change) => ({
+      pool: change.poolID,
+      tick_lower: change.ticklower,
+      tick_upper: change.tickUpper,
+      delta_liquidity: change.deltaLiquidity,
+    })),
+  }
+
+  console.log("requestData", JSON.stringify(requestData, null, 2))
+
+  try {
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(requestData),
+    })
+
+    return response
+  } catch (error) {
+    console.error("Error:", error)
+    return null
+  }
+}

package/src/client.ts

@@ -337,7 +337,7 @@ export class AggregatorClient {
     if (this.env === Env.Mainnet) {
       return "0xeffc8ae61f439bb34c9b905ff8f29ec56873dcedf81c7123ff2f1f67c45ec302"
     } else {
-      return "0x0"
+      return "0x6cbaa3e9fbe902d90191b12f315932bc58079cba422bafbd4b4369f80e61f595"
     }
   }
 
@@ -454,11 +454,16 @@ export function parseRouterResponse(data: any): RouterData {
           }
 
           let extendedDetails
-          if (path.provider === TURBOS || path.provider === AFTERMATH) {
+          if (
+            path.provider === TURBOS ||
+            path.provider === AFTERMATH ||
+            path.provider === CETUS
+          ) {
             extendedDetails = {
               aftermathLpSupplyType:
                 path.extended_details?.aftermath_lp_supply_type,
               turbosFeeType: path.extended_details?.turbos_fee_type,
+              afterSqrtPrice: path.extended_details?.after_sqrt_price,
             }
           }
 

package/src/transaction/cetus.ts

@@ -22,8 +22,9 @@ export class Cetus implements Dex {
         : "0x6f4149091a5aea0e818e7243a13adcfb403842d670b9a2089de058512620687a"
 
     this.partner =
-      partner ??
-      "0x639b5e433da31739e800cd085f356e64cae222966d0f1b11bd9dc76b322ff58b"
+      partner ?? env === Env.Mainnet
+        ? "0x639b5e433da31739e800cd085f356e64cae222966d0f1b11bd9dc76b322ff58b"
+        : "0x8e0b7668a79592f70fbfb1ae0aebaf9e2019a7049783b9a4b6fe7c6ae038b528"
   }
 
   flash_swap(

package/src/transaction/swap.ts

@@ -131,6 +131,9 @@ export async function swapInPools(
             feeRate: event.fee_rate,
             amountIn: event.amount_in,
             amountOut: event.amount_out,
+            extendedDetails: {
+              afterSqrtPrice: event.after_sqrt_price,
+            },
           },
         ],
         amountIn: new BN(event.amount_in ?? 0),

package/src/utils/index.ts

@@ -1 +1,2 @@
 export * from './contracts'
+export * from './msafe'

package/src/utils/msafe.ts

@@ -0,0 +1,31 @@
+
+import BN from 'bn.js'
+import Decimal from "decimal.js"
+
+export const dealWithFastRouterSwapParamsForMsafe = (data: any) => {
+    const result =data.map((route: any) => {
+      return {
+        ...route,
+        amountIn: route.amountIn.toString(),
+        amountOut: route.amountOut.toString(),
+        initialPrice: route.initialPrice.toString(),
+        path: route.path
+      }
+    })
+    
+    return result
+  }
+
+  export const restituteMsafeFastRouterSwapParams = (data: any) => {
+    const result =data.map((route: any) => {
+      return {
+        ...route,
+        amountIn: new BN(route.amountIn),
+        amountOut: new BN(route.amountOut),
+        initialPrice: new Decimal(route.initialPrice.toString()),
+        path: route.path
+      }
+    })
+    
+    return result
+  }

package/tests/router.test.ts

@@ -1,7 +1,14 @@
 import { describe, test } from "@jest/globals"
 import dotenv from "dotenv"
 import { AggregatorClient } from "~/client"
-import { M_CETUS, M_NAVI, M_SSWP, M_SUI, M_USDC } from "./test_data.test"
+import {
+  M_CETUS,
+  M_HASUI,
+  M_NAVI,
+  M_SSWP,
+  M_SUI,
+  M_USDC,
+} from "./test_data.test"
 import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519"
 import { printTransaction } from "~/utils/transaction"
 import BN from "bn.js"
@@ -116,7 +123,7 @@ describe("router module", () => {
       byAmountIn: true,
       depth: 3,
       splitCount: 1,
-      // providers: ["CETUS"],
+      providers: ["CETUS"],
     })
 
     if (res != null) {
@@ -290,4 +297,88 @@ describe("router module", () => {
       }
     }
   }, 60000000)
+
+  test("Build router with liquidity changes", async () => {
+    const byAmountIn = true
+    const amount = "1000000000"
+
+    // const from = M_USDC
+    // const target = M_SUI
+
+    const from = M_SUI
+    // const target =
+    //   "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI"
+    // const target =
+    //   "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc::afsui::AFSUI"
+
+    const target = M_HASUI
+
+    const res = await client.findRouters({
+      from,
+      target,
+      amount: new BN(amount),
+      byAmountIn,
+      depth: 2,
+      providers: [
+        "CETUS",
+        // "DEEPBOOK",
+        // "AFTERMATH",
+        // "FLOWX",
+        // "KRIYA",
+        // "KRIYAV3",
+        // "TURBOS",
+        // "FLOWXV3",
+      ],
+      liquidityChanges: [
+        {
+          poolID:
+            "0x871d8a227114f375170f149f7e9d45be822dd003eba225e83c05ac80828596bc",
+          ticklower: 100,
+          tickUpper: 394,
+          deltaLiquidity: -5498684,
+        },
+        {
+          poolID:
+            "0x871d8a227114f375170f149f7e9d45be822dd003eba225e83c05ac80828596bc",
+          ticklower: 100,
+          tickUpper: 394,
+          deltaLiquidity: 986489,
+        },
+      ],
+    })
+
+    if (res != null) {
+      console.log(JSON.stringify(res, null, 2))
+    }
+
+    console.log("amount in", res?.amountIn.toString())
+    console.log("amount out", res?.amountOut.toString())
+
+    const txb = new Transaction()
+
+    if (res != null) {
+      console.log(JSON.stringify(res, null, 2))
+      await client.fastRouterSwap({
+        routers: res.routes,
+        byAmountIn,
+        txb,
+        slippage: 0.01,
+        isMergeTragetCoin: false,
+        refreshAllCoins: true,
+      })
+
+      printTransaction(txb)
+
+      let result = await client.devInspectTransactionBlock(txb)
+      console.log("🚀 ~ file: router.test.ts:180 ~ test ~ result:", result)
+
+      // if (result.effects.status.status === "success") {
+      //   console.log("Sim exec transaction success")
+      //   const result = await client.signAndExecuteTransaction(txb, keypair)
+      //   // console.log("result", result)
+      // } else {
+      //   console.log("result", result)
+      // }
+    }
+  }, 600000)
 })