@cetusprotocol/aggregator-sdk 0.1.2 → 0.2.1

package/dist/src/client.d.ts

@@ -8,6 +8,7 @@ export declare const CETUS = "CETUS";
 export declare const DEEPBOOKV2 = "DEEPBOOK";
 export declare const KRIYA = "KRIYA";
 export declare const FLOWXV2 = "FLOWX";
+export declare const FLOWXV3 = "FLOWXV3";
 export declare const KRIYAV3 = "KRIYAV3";
 export declare const TURBOS = "TURBOS";
 export declare const AFTERMATH = "AFTERMATH";

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

@@ -0,0 +1,8 @@
+import { Transaction, TransactionObjectArgument } from "@mysten/sui/transactions";
+import { AggregatorClient, Dex, Env, Path } from "..";
+export declare class FlowxV3 implements Dex {
+    private versioned;
+    private poolRegistry;
+    constructor(env: Env);
+    swap(client: AggregatorClient, txb: Transaction, path: Path, inputCoin: TransactionObjectArgument): Promise<TransactionObjectArgument>;
+}

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.1.2",
+  "version": "0.2.1",
   "sideEffects": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/client.ts

@@ -30,11 +30,13 @@ import { KriyaV3 } from "./transaction/kriya_v3"
 import { Haedal } from "./transaction/haedal"
 import { Afsui } from "./transaction/afsui"
 import { Volo } from "./transaction/volo"
+import { FlowxV3 } from "./transaction/flowx_v3"
 
 export const CETUS = "CETUS"
 export const DEEPBOOKV2 = "DEEPBOOK"
 export const KRIYA = "KRIYA"
 export const FLOWXV2 = "FLOWX"
+export const FLOWXV3 = "FLOWXV3"
 export const KRIYAV3 = "KRIYAV3"
 export const TURBOS = "TURBOS"
 export const AFTERMATH = "AFTERMATH"
@@ -388,6 +390,8 @@ export class AggregatorClient {
         return new KriyaV3(this.env)
       case FLOWXV2:
         return new FlowxV2(this.env)
+      case FLOWXV3:
+        return new FlowxV3(this.env)
       case TURBOS:
         return new Turbos(this.env)
       case AFTERMATH:

package/src/transaction/flowx_v3.ts

@@ -0,0 +1,50 @@
+import {
+  Transaction,
+  TransactionObjectArgument,
+} from "@mysten/sui/transactions"
+import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, Path } from ".."
+
+export class FlowxV3 implements Dex {
+  private versioned: string
+  private poolRegistry: string
+
+  constructor(env: Env) {
+    if (env !== Env.Mainnet) {
+      throw new Error("Flowx clmm only supported on mainnet")
+    }
+
+    this.versioned =
+      "0x67624a1533b5aff5d0dfcf5e598684350efd38134d2d245f475524c03a64e656"
+    this.poolRegistry =
+      "0x27565d24a4cd51127ac90e4074a841bbe356cca7bf5759ddc14a975be1632abc"
+  }
+
+  async swap(
+    client: AggregatorClient,
+    txb: Transaction,
+    path: Path,
+    inputCoin: TransactionObjectArgument
+  ): Promise<TransactionObjectArgument> {
+    const { direction, from, target } = path
+
+    const [func, coinAType, coinBType] = direction
+      ? ["swap_a2b", from, target]
+      : ["swap_b2a", target, from]
+
+    const args = [
+      txb.object(this.poolRegistry),
+      txb.pure.u64(path.feeRate * 1000000),
+      inputCoin,
+      txb.object(this.versioned),
+      txb.object(CLOCK_ADDRESS),
+    ]
+
+    const res = txb.moveCall({
+      target: `${client.publishedAt()}::flowx_clmm::${func}`,
+      typeArguments: [coinAType, coinBType],
+      arguments: args,
+    }) as TransactionObjectArgument
+
+    return res
+  }
+}

package/src/transaction/haedal.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 Haedal implements Dex {
   constructor(env: Env) {
@@ -19,17 +18,11 @@ export class Haedal implements Dex {
     inputCoin: TransactionObjectArgument
   ): Promise<TransactionObjectArgument> {
     const { direction } = path
-
     if (!direction) {
       throw new Error("Haedal not support b2a swap")
     }
-
     const func = "swap_a2b"
-
-    console.log("haedal path id", path.id)
-
     const args = [txb.object(path.id), txb.object("0x5"), inputCoin]
-
     const res = txb.moveCall({
       target: `${client.publishedAt()}::haedal::${func}`,
       typeArguments: [],

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

@@ -33,14 +33,14 @@ 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"
+    //   "0xa459702162b73204eed77420d93d9453b7a7b893a0edea1e268607cf7fa76e03"
     // const wallet =
     // "0xaabf2fedcb36146db164bec930b74a47969c4df98216e049342a3c49b6d11580"
     // const wallet = "0x410456cfc689666936b6bf80fbec958b69499b9f7183ecba07de577c17248a44"
@@ -77,7 +77,7 @@ describe("router module", () => {
   })
 
   test("Downgrade swap in route", async () => {
-    const amount = 1000000
+    const amount = 100000
     const byAmountIn = false
 
     const res: any = await client.swapInPools({
@@ -139,8 +139,7 @@ describe("router module", () => {
     // const target =
     //   "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc::afsui::AFSUI"
 
-    const target =
-      "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55::cert::CERT"
+    const target = M_USDC
 
     const res = await client.findRouters({
       from,
@@ -156,7 +155,7 @@ describe("router module", () => {
         // "KRIYA",
         // "KRIYAV3",
         // "TURBOS",
-        "VOLO",
+        "FLOWXV3",
       ],
     })