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

package/src/transaction/afsui.ts

@@ -3,7 +3,6 @@ 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,8 +1,6 @@
 import {
   Transaction,
-  TransactionArgument,
   TransactionObjectArgument,
-  TransactionResult,
 } from "@mysten/sui/transactions"
 import { AggregatorClient, Dex, Env, Path } from ".."
 import BN from "bn.js"

package/src/transaction/deepbook_v3.ts

@@ -20,7 +20,7 @@ export class DeepbookV3 implements Dex {
     this.deepbookV3Config =
       env === Env.Mainnet
         ? "0x0"
-        : "0x77018927a5d7ed7b4c49312b71581f5f12ba52ba7e1219a15181ffc3d459f527"
+        : "0xe19b5d072346cae83a037d4e3c8492068a74410a74e5830b3a68012db38296aa"
     this.deepCoinType =
       env === Env.Mainnet
         ? "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP"
@@ -31,19 +31,31 @@ export class DeepbookV3 implements Dex {
     client: AggregatorClient,
     txb: Transaction,
     path: Path,
-    inputCoin: TransactionObjectArgument
+    inputCoin: TransactionObjectArgument,
+    deepbookv3DeepFee?: TransactionObjectArgument
   ): Promise<TransactionObjectArgument> {
     const { direction, from, target } = path
     const [func, coinAType, coinBType] = direction
       ? ["swap_a2b", from, target]
       : ["swap_b2a", target, from]
 
-    const zeroDeep = mintZeroCoin(txb, this.deepCoinType)
+    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,
-      zeroDeep,
+      deepFee,
       txb.object(CLOCK_ADDRESS),
     ]
     const res = txb.moveCall({

package/src/transaction/index.ts

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

package/src/utils/api.ts

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

package/src/utils/index.ts

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

package/tests/router.test.ts

@@ -8,6 +8,9 @@ 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"
@@ -40,12 +43,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 =
@@ -69,12 +72,15 @@ describe("router module", () => {
       publishedAt:
         "0x8faab90228e4c4df91c41626bbaefa19fc25c514405ac64de54578dec9e6f5ee",
     }
+    // const endpoint =
+    //   "https://api-sui-cloudfront.cetus.zone/router_v2/find_routes"
     const endpoint =
-      "https://api-sui-cloudfront.cetus.zone/router_v2/find_routes"
+      "https://api-sui.devcetus.com/router_v2/find_routes"
+
     const suiClient = new SuiClient({
-      url: "https://fullnode.mainnet.sui.io:443",
+      url: "https://fullnode.testnet.sui.io:443",
     })
-    client = new AggregatorClient(endpoint, wallet, suiClient, Env.Mainnet)
+    client = new AggregatorClient(endpoint, wallet, suiClient, Env.Testnet)
   })
 
   test("Get all coins", () => {
@@ -135,15 +141,9 @@ describe("router module", () => {
 
   test("Build router tx", async () => {
     const byAmountIn = true
-    const amount = "1000000000"
-
-    const from = M_SUI
-    // const target =
-    //   "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI"
-    // const target =
-    //   "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc::afsui::AFSUI"
-
-    const target = M_USDC
+    const amount = "20000000000"
+    const from = T_DBUSDC
+    const target = T_DBUSDT
 
     const res = await client.findRouters({
       from,
@@ -152,14 +152,14 @@ describe("router module", () => {
       byAmountIn,
       depth: 3,
       providers: [
-        // "CETUS",
+        "CETUS",
+        "DEEPBOOKV3",
         // "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,9 +348,6 @@ 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) {
@@ -378,4 +375,9 @@ 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,5 +1,8 @@
 // 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 =