@cetusprotocol/aggregator-sdk 0.0.0-experimental-20241011180351 → 0.0.0-experimental-20241011205228

package/src/client.ts

@@ -15,11 +15,6 @@ import {
   getRouterResult,
   Router,
   RouterData,
-  getDeepbookV3Config,
-  DeepbookV3ConfigResponse,
-  processEndpoint,
-  DeepbookV3Config,
-  ZERO,
 } from "."
 import { Aftermath } from "./transaction/aftermath"
 import { DeepbookV2 } from "./transaction/deepbook_v2"
@@ -37,7 +32,6 @@ import { Volo } from "./transaction/volo"
 import { Bluemove } from "./transaction/bluemove"
 import { CoinAsset } from "./types/sui"
 import { buildInputCoin } from "./utils/coin"
-import { DeepbookV3 } from "./transaction/deepbook_v3"
 
 export const CETUS = "CETUS"
 export const DEEPBOOKV2 = "DEEPBOOK"
@@ -51,7 +45,6 @@ export const HAEDAL = "HAEDAL"
 export const VOLO = "VOLO"
 export const AFSUI = "AFSUI"
 export const BLUEMOVE = "BLUEMOVE"
-export const DEEPBOOKV3 = "DEEPBOOKV3"
 
 export type BuildRouterSwapParams = {
   routers: Router[]
@@ -60,9 +53,6 @@ export type BuildRouterSwapParams = {
   slippage: number
   txb: Transaction
   partner?: string
-  // This parameter is used to pass the Deep token object. When using the DeepBook V3 provider,
-  // users must pay fees with Deep tokens in non-whitelisted pools.
-  deepbookv3DeepFee?: TransactionObjectArgument 
 }
 
 export type BuildFastRouterSwapParams = {
@@ -73,7 +63,6 @@ export type BuildFastRouterSwapParams = {
   partner?: string
   isMergeTragetCoin?: boolean
   refreshAllCoins?: boolean
-  payDeepFeeAmount?: number
 }
 
 export interface SwapInPoolsParams {
@@ -97,7 +86,7 @@ export class AggregatorClient {
   private allCoins: CoinAsset[]
 
   constructor(endpoint: string, signer: string, client: SuiClient, env: Env) {
-    this.endpoint = processEndpoint(endpoint)
+    this.endpoint = endpoint
     this.client = client
     this.signer = signer
     this.env = env
@@ -138,8 +127,7 @@ export class AggregatorClient {
     inputCoin: TransactionObjectArgument,
     routers: Router[],
     amountOutLimit: BN,
-    partner?: string,
-    deepbookv3DeepFee?: TransactionObjectArgument,
+    partner?: string
   ) {
     if (routers.length === 0) {
       throw new Error("No router found")
@@ -156,15 +144,12 @@ export class AggregatorClient {
       let nextCoin = inputCoins[i] as TransactionObjectArgument
       for (const path of routers[i].path) {
         const dex = this.newDex(path.provider, partner)
-        nextCoin = await dex.swap(this, txb, path, nextCoin, deepbookv3DeepFee)
+        nextCoin = await dex.swap(this, txb, path, nextCoin)
       }
 
       outputCoins.push(nextCoin)
     }
     this.transferOrDestoryCoin(txb, inputCoin, inputCoinType)
-    if (deepbookv3DeepFee) {
-      this.transferOrDestoryCoin(txb, deepbookv3DeepFee, this.deepbookv3DeepFeeType())
-    }
     const mergedTargetCointhis = this.checkCoinThresholdAndMergeCoin(
       txb,
       outputCoins,
@@ -244,7 +229,7 @@ export class AggregatorClient {
   async routerSwap(
     params: BuildRouterSwapParams
   ): Promise<TransactionObjectArgument> {
-    const { routers, inputCoin, slippage, byAmountIn, txb, partner, deepbookv3DeepFee } = params
+    const { routers, inputCoin, slippage, byAmountIn, txb, partner } = params
     const amountIn = routers.reduce(
       (acc, router) => acc.add(router.amountIn),
       new BN(0)
@@ -265,8 +250,7 @@ export class AggregatorClient {
         inputCoin,
         routers,
         new BN(amountLimit),
-        partner,
-        deepbookv3DeepFee
+        partner
       )
       return targetCoin
     }
@@ -296,7 +280,6 @@ export class AggregatorClient {
       partner,
       isMergeTragetCoin,
       refreshAllCoins,
-      payDeepFeeAmount,
     } = params
     if (refreshAllCoins || this.allCoins.length === 0) {
       this.allCoins = await this.getAllCoins()
@@ -323,24 +306,6 @@ export class AggregatorClient {
       BigInt(amount.toString()),
       fromCoinType
     )
-
-    let buildDeepFeeCoinRes
-    if (payDeepFeeAmount && payDeepFeeAmount > 0) {
-      buildDeepFeeCoinRes = buildInputCoin(
-        txb,
-        this.allCoins,
-        BigInt(payDeepFeeAmount),
-        this.deepbookv3DeepFeeType()
-      )
-    } else {
-      buildDeepFeeCoinRes = buildInputCoin(
-        txb,
-        this.allCoins,
-        BigInt(0),
-        this.deepbookv3DeepFeeType()
-      )
-    }
-
     const targetCoin = await this.routerSwap({
       routers,
       inputCoin: buildFromCoinRes.targetCoin,
@@ -348,7 +313,6 @@ export class AggregatorClient {
       byAmountIn,
       txb,
       partner,
-      deepbookv3DeepFee: buildDeepFeeCoinRes.targetCoin,
     })
 
     if (isMergeTragetCoin) {
@@ -373,17 +337,10 @@ export class AggregatorClient {
 
   publishedAt(): string {
     if (this.env === Env.Mainnet) {
-      return "0x764b8132a94d35abc9dfd91b23a0757b2a717d5ecb04c03098794aa2a508db91"
+      // return "0x764b8132a94d35abc9dfd91b23a0757b2a717d5ecb04c03098794aa2a508db91"
+      return "0x7eb2f30d541c06fa7bcf26444845df56361647df0e778b82e5707fb26754c398"
     } else {
-      return "0xf92cdec6c2d73a12d8afa8dd41199b3e95b621272bbc655996539cd30de6a462"
-    }
-  }
-
-  deepbookv3DeepFeeType(): string {
-    if (this.env === Env.Mainnet) {
-      return "0x36dbef866a1d62bf7328989a10fb2f07d769f4ee587c0de4a0a256e57e0a58a8::deep::DEEP"
-    } else {
-      return "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP"
+      return "0x6cbaa3e9fbe902d90191b12f315932bc58079cba422bafbd4b4369f80e61f595"
     }
   }
 
@@ -416,7 +373,7 @@ export class AggregatorClient {
       targetCoin = coins[0]
     }
 
-    txb.moveCall({
+    const res = txb.moveCall({
       target: `${this.publishedAt()}::utils::check_coin_threshold`,
       typeArguments: [coinType],
       arguments: [targetCoin, txb.pure.u64(amountLimit.toString())],
@@ -430,8 +387,6 @@ export class AggregatorClient {
         return new Cetus(this.env, partner)
       case DEEPBOOKV2:
         return new DeepbookV2(this.env)
-      case DEEPBOOKV3:
-        return new DeepbookV3(this.env)
       case KRIYA:
         return new KriyaV2(this.env)
       case KRIYAV3:
@@ -487,27 +442,10 @@ export class AggregatorClient {
     })
     return res
   }
-
-  async getDeepbookV3Config(): Promise<DeepbookV3Config | null> {
-    const res = await getDeepbookV3Config(this.endpoint)
-    if (res) {
-      return res.data
-    }
-    return null
-  }
 }
 
 export function parseRouterResponse(data: any): RouterData {
-  let totalDeepFee = 0
-  for (const route of data.routes) {
-    for (const path of route.path) {
-      if (path.extended_details && path.extended_details.deepbookv3_deep_fee) {
-        totalDeepFee += Number(path.extended_details.deepbookv3_deep_fee)
-      }
-    }
-  }
-
-  let routerData: RouterData = {
+  return {
     amountIn: new BN(data.amount_in.toString()),
     amountOut: new BN(data.amount_out.toString()),
     insufficientLiquidity: false,
@@ -524,15 +462,13 @@ export function parseRouterResponse(data: any): RouterData {
           if (
             path.provider === TURBOS ||
             path.provider === AFTERMATH ||
-            path.provider === CETUS ||
-            path.provider === DEEPBOOKV3
+            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,
-              deepbookv3DeepFee: path.extended_details?.deepbookv3_deep_fee,
             }
           }
 
@@ -554,8 +490,5 @@ export function parseRouterResponse(data: any): RouterData {
         initialPrice: new Decimal(route.initial_price.toString()),
       }
     }),
-    totalDeepFee: totalDeepFee,
   }
-
-  return routerData
 }

package/src/transaction/afsui.ts

@@ -3,6 +3,7 @@ import {
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
 import { AggregatorClient, Dex, Env, Path } from ".."
+import { SUI_SYSTEM_ADDRESS } from "@mysten/sui/utils"
 
 export class Afsui implements Dex {
   private stakedSuiVault: string

package/src/transaction/aftermath.ts

@@ -1,6 +1,8 @@
 import {
   Transaction,
+  TransactionArgument,
   TransactionObjectArgument,
+  TransactionResult,
 } from "@mysten/sui/transactions"
 import { AggregatorClient, Dex, Env, Path } from ".."
 import BN from "bn.js"

package/src/transaction/deepbook_v2.ts

@@ -1,5 +1,6 @@
 import {
   Transaction,
+  TransactionArgument,
   TransactionObjectArgument,
 } from "@mysten/sui/transactions"
 import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, Path } from ".."

package/src/transaction/index.ts

@@ -12,7 +12,6 @@ export interface Dex {
     client: AggregatorClient,
     ptb: Transaction,
     path: Path,
-    inputCoin: TransactionObjectArgument,
-    deepbookv3DeepFee?: TransactionObjectArgument
+    inputCoin: TransactionObjectArgument
   ): Promise<TransactionObjectArgument>
 }

package/src/utils/index.ts

@@ -1,5 +1,2 @@
 export * from './contracts'
 export * from './msafe'
-export * from './api'
-export * from './coin'
-export * from './transaction'

package/tests/router.test.ts

@@ -8,9 +8,6 @@ import {
   M_SSWP,
   M_SUI,
   M_USDC,
-  T_DBUSDC,
-  T_DBUSDT,
-  T_DEEP,
 } from "./test_data.test"
 import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519"
 import { printTransaction } from "~/utils/transaction"
@@ -43,12 +40,12 @@ describe("router module", () => {
       keypair = buildTestAccount()
     }
 
-    const wallet = keypair.getPublicKey().toSuiAddress()
+    // const wallet = keypair.getPublicKey().toSuiAddress()
 
     // console.log("wallet", wallet, "\n", wallet.toString())
 
-    // const wallet =
-    //   "0xfba94aa36e93ccc7d84a6a57040fc51983223f1b522a8d0be3c3bf2c98977ebb"
+    const wallet =
+      "0xfba94aa36e93ccc7d84a6a57040fc51983223f1b522a8d0be3c3bf2c98977ebb"
     // const wallet =
     //   "0xa459702162b73204eed77420d93d9453b7a7b893a0edea1e268607cf7fa76e03"
     // const wallet =
@@ -72,15 +69,12 @@ describe("router module", () => {
       publishedAt:
         "0x8faab90228e4c4df91c41626bbaefa19fc25c514405ac64de54578dec9e6f5ee",
     }
-    // const endpoint =
-    //   "https://api-sui-cloudfront.cetus.zone/router_v2/find_routes"
     const endpoint =
-      "https://api-sui.devcetus.com/router_v2/find_routes"
-
+      "https://api-sui-cloudfront.cetus.zone/router_v2/find_routes"
     const suiClient = new SuiClient({
-      url: "https://fullnode.testnet.sui.io:443",
+      url: "https://fullnode.mainnet.sui.io:443",
     })
-    client = new AggregatorClient(endpoint, wallet, suiClient, Env.Testnet)
+    client = new AggregatorClient(endpoint, wallet, suiClient, Env.Mainnet)
   })
 
   test("Get all coins", () => {
@@ -141,9 +135,15 @@ describe("router module", () => {
 
   test("Build router tx", async () => {
     const byAmountIn = true
-    const amount = "20000000000"
-    const from = T_DBUSDC
-    const target = T_DBUSDT
+    const amount = "1000000000"
+
+    const from = M_SUI
+    // const target =
+    //   "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI"
+    // const target =
+    //   "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc::afsui::AFSUI"
+
+    const target = M_USDC
 
     const res = await client.findRouters({
       from,
@@ -152,14 +152,14 @@ describe("router module", () => {
       byAmountIn,
       depth: 3,
       providers: [
-        "CETUS",
-        "DEEPBOOKV3",
+        // "CETUS",
         // "DEEPBOOK",
         // "AFTERMATH",
         // "FLOWX",
         // "KRIYA",
         // "KRIYAV3",
         // "TURBOS",
+        "BLUEMOVE",
       ],
     })
 
@@ -188,13 +188,13 @@ describe("router module", () => {
       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)
-      }
+      // 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)
 
@@ -348,6 +348,9 @@ describe("router module", () => {
       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) {
@@ -375,9 +378,4 @@ describe("router module", () => {
       // }
     }
   }, 600000)
-
-  test("Get deepbook v3 config", async () => {
-    const config = await client.getDeepbookV3Config()
-    console.log("config", config)
-  }, 60000)
 })

package/tests/test_data.test.ts

@@ -1,8 +1,5 @@
 // Testnet
 export const T_USDC = ""
-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 =

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

@@ -1,13 +0,0 @@
-import { Transaction, TransactionArgument, TransactionObjectArgument } from "@mysten/sui/transactions";
-import { AggregatorClient, Dex, Env, Path } from "..";
-export type CetusFlashSwapResult = {
-    targetCoin: TransactionObjectArgument;
-    flashReceipt: TransactionObjectArgument;
-    payAmount: TransactionArgument;
-};
-export declare class DeepbookV3 implements Dex {
-    private deepbookV3Config;
-    private deepCoinType;
-    constructor(env: Env);
-    swap(client: AggregatorClient, txb: Transaction, path: Path, inputCoin: TransactionObjectArgument, deepbookv3DeepFee?: TransactionObjectArgument): Promise<TransactionObjectArgument>;
-}

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

@@ -1 +0,0 @@
-export declare function processEndpoint(endpoint: string): string;

package/src/transaction/deepbook_v3.ts

@@ -1,68 +0,0 @@
-import {
-  Transaction,
-  TransactionArgument,
-  TransactionObjectArgument,
-} from "@mysten/sui/transactions"
-import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, Path } from ".."
-import { mintZeroCoin } from "~/utils/coin"
-
-export type CetusFlashSwapResult = {
-  targetCoin: TransactionObjectArgument
-  flashReceipt: TransactionObjectArgument
-  payAmount: TransactionArgument
-}
-
-export class DeepbookV3 implements Dex {
-  private deepbookV3Config: string
-  private deepCoinType: string
-
-  constructor(env: Env) {
-    this.deepbookV3Config =
-      env === Env.Mainnet
-        ? "0x0"
-        : "0xe19b5d072346cae83a037d4e3c8492068a74410a74e5830b3a68012db38296aa"
-    this.deepCoinType =
-      env === Env.Mainnet
-        ? "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP"
-        : "0x36dbef866a1d62bf7328989a10fb2f07d769f4ee587c0de4a0a256e57e0a58a8::deep::DEEP"
-  }
-
-  async swap(
-    client: AggregatorClient,
-    txb: Transaction,
-    path: Path,
-    inputCoin: TransactionObjectArgument,
-    deepbookv3DeepFee?: TransactionObjectArgument
-  ): Promise<TransactionObjectArgument> {
-    const { direction, from, target } = path
-    const [func, coinAType, coinBType] = direction
-      ? ["swap_a2b", from, target]
-      : ["swap_b2a", target, from]
-
-    let deepFee
-    if (deepbookv3DeepFee) {
-      if (path.extendedDetails?.deepbookv3DeepFee && path.extendedDetails?.deepbookv3DeepFee > 0) {
-        const splitAmounts = [path.extendedDetails?.deepbookv3DeepFee]
-        deepFee = txb.splitCoins(deepbookv3DeepFee, splitAmounts)[0] as TransactionObjectArgument
-      } else {
-        deepFee = mintZeroCoin(txb, this.deepCoinType)
-      }
-    } else {
-      deepFee = mintZeroCoin(txb, this.deepCoinType)
-    }
-
-    const args = [
-      txb.object(this.deepbookV3Config),
-      txb.object(path.id),
-      inputCoin,
-      deepFee,
-      txb.object(CLOCK_ADDRESS),
-    ]
-    const res = txb.moveCall({
-      target: `${client.publishedAt()}::deepbookv3::${func}`,
-      typeArguments: [coinAType, coinBType],
-      arguments: args,
-    }) as TransactionArgument
-    return res
-  }
-}

package/src/utils/api.ts

@@ -1,6 +0,0 @@
-export function processEndpoint(endpoint: string) {
-  if (endpoint.endsWith("/find_routes")) {
-    return endpoint.replace("/find_routes", "")
-  }
-  return endpoint
-}

package/test.json

@@ -1,5 +0,0 @@
-[
-  [Path { id: "0x0d1b1746d220bd5ebac5231c7685480a16f1c707a46306095a4c67dc7ce4dcae", edge_id: "0x0d1b1746d220bd5ebac5231c7685480a16f1c707a46306095a4c67dc7ce4dcae", provider: "DEEPBOOKV3", from: "0x36dbef866a1d62bf7328989a10fb2f07d769f4ee587c0de4a0a256e57e0a58a8::deep::DEEP", target: "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI", direction: true, fee_rate: Decimal(0), lot_size: 1000000, amount_in: 0, amount_out: 0, max_depth: 3, extended_details: None, allow_bidirection: true
-    }
-  ]
-]