@cetusprotocol/aggregator-sdk 0.1.1 → 0.2.0

package/dist/index.d.mts

@@ -64,6 +64,7 @@ declare const CETUS = "CETUS";
 declare const DEEPBOOKV2 = "DEEPBOOK";
 declare const KRIYA = "KRIYA";
 declare const FLOWXV2 = "FLOWX";
+declare const FLOWXV3 = "FLOWXV3";
 declare const KRIYAV3 = "KRIYAV3";
 declare const TURBOS = "TURBOS";
 declare const AFTERMATH = "AFTERMATH";
@@ -208,4 +209,4 @@ declare enum Env {
     Testnet = 1
 }
 
-export { AFSUI, AFTERMATH, AggregatorClient, type AggregatorResponse, type BuildFastRouterSwapParams, type BuildRouterSwapParams, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, type Dex, Env, type ExtendedDetails, FLOWXV2, type FindRouterParams, HAEDAL, KRIYA, KRIYAV3, ONE, type Path, type Router, type RouterData, type RouterError, type SwapInPoolsParams, type SwapInPoolsResult, TEN_POW_NINE, TURBOS, TWO, U128, U64_MAX, U64_MAX_BN, VOLO, ZERO, composeType, createTarget, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, getRouterResult, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId };
+export { AFSUI, AFTERMATH, AggregatorClient, type AggregatorResponse, type BuildFastRouterSwapParams, type BuildRouterSwapParams, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, type Dex, Env, type ExtendedDetails, FLOWXV2, FLOWXV3, type FindRouterParams, HAEDAL, KRIYA, KRIYAV3, ONE, type Path, type Router, type RouterData, type RouterError, type SwapInPoolsParams, type SwapInPoolsResult, TEN_POW_NINE, TURBOS, TWO, U128, U64_MAX, U64_MAX_BN, VOLO, ZERO, composeType, createTarget, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, getRouterResult, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId };

package/dist/index.d.ts

@@ -64,6 +64,7 @@ declare const CETUS = "CETUS";
 declare const DEEPBOOKV2 = "DEEPBOOK";
 declare const KRIYA = "KRIYA";
 declare const FLOWXV2 = "FLOWX";
+declare const FLOWXV3 = "FLOWXV3";
 declare const KRIYAV3 = "KRIYAV3";
 declare const TURBOS = "TURBOS";
 declare const AFTERMATH = "AFTERMATH";
@@ -208,4 +209,4 @@ declare enum Env {
     Testnet = 1
 }
 
-export { AFSUI, AFTERMATH, AggregatorClient, type AggregatorResponse, type BuildFastRouterSwapParams, type BuildRouterSwapParams, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, type Dex, Env, type ExtendedDetails, FLOWXV2, type FindRouterParams, HAEDAL, KRIYA, KRIYAV3, ONE, type Path, type Router, type RouterData, type RouterError, type SwapInPoolsParams, type SwapInPoolsResult, TEN_POW_NINE, TURBOS, TWO, U128, U64_MAX, U64_MAX_BN, VOLO, ZERO, composeType, createTarget, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, getRouterResult, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId };
+export { AFSUI, AFTERMATH, AggregatorClient, type AggregatorResponse, type BuildFastRouterSwapParams, type BuildRouterSwapParams, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, type Dex, Env, type ExtendedDetails, FLOWXV2, FLOWXV3, type FindRouterParams, HAEDAL, KRIYA, KRIYAV3, ONE, type Path, type Router, type RouterData, type RouterError, type SwapInPoolsParams, type SwapInPoolsResult, TEN_POW_NINE, TURBOS, TWO, U128, U64_MAX, U64_MAX_BN, VOLO, ZERO, composeType, createTarget, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, getRouterResult, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId };

package/dist/index.js

@@ -5857,7 +5857,6 @@ var Haedal = class {
         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}`,
@@ -5937,18 +5936,49 @@ var Volo = class {
   }
 };
 
+// src/transaction/flowx_v3.ts
+var FlowxV3 = class {
+  constructor(env) {
+    if (env !== 0 /* Mainnet */) {
+      throw new Error("Flowx clmm only supported on mainnet");
+    }
+    this.versioned = "0x67624a1533b5aff5d0dfcf5e598684350efd38134d2d245f475524c03a64e656";
+    this.poolRegistry = "0x27565d24a4cd51127ac90e4074a841bbe356cca7bf5759ddc14a975be1632abc";
+  }
+  swap(client, txb, path, inputCoin) {
+    return __async(this, null, function* () {
+      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 * 1e6),
+        inputCoin,
+        txb.object(this.versioned),
+        txb.object(CLOCK_ADDRESS)
+      ];
+      const res = txb.moveCall({
+        target: `${client.publishedAt()}::flowx_clmm::${func}`,
+        typeArguments: [coinAType, coinBType],
+        arguments: args
+      });
+      return res;
+    });
+  }
+};
+
 // src/client.ts
 var CETUS = "CETUS";
 var DEEPBOOKV2 = "DEEPBOOK";
 var KRIYA = "KRIYA";
 var FLOWXV2 = "FLOWX";
+var FLOWXV3 = "FLOWXV3";
 var KRIYAV3 = "KRIYAV3";
 var TURBOS = "TURBOS";
 var AFTERMATH = "AFTERMATH";
 var HAEDAL = "HAEDAL";
 var VOLO = "VOLO";
 var AFSUI = "AFSUI";
-var AggregatorClient5 = class {
+var AggregatorClient6 = class {
   constructor(endpoint, signer, client, env) {
     this.endpoint = endpoint;
     this.client = client;
@@ -6185,7 +6215,7 @@ var AggregatorClient5 = class {
   }
   publishedAt() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x9fd702cf1a8db5a2e99be20be6750d22ec75c30d57e3d9ccbc37c9b4ad7bef21";
+      return "0xeffc8ae61f439bb34c9b905ff8f29ec56873dcedf81c7123ff2f1f67c45ec302";
     } else {
       return "0x0";
     }
@@ -6227,6 +6257,8 @@ var AggregatorClient5 = class {
         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:
@@ -6409,12 +6441,13 @@ decimal.js/decimal.mjs:
 
 exports.AFSUI = AFSUI;
 exports.AFTERMATH = AFTERMATH;
-exports.AggregatorClient = AggregatorClient5;
+exports.AggregatorClient = AggregatorClient6;
 exports.CETUS = CETUS;
 exports.CLOCK_ADDRESS = CLOCK_ADDRESS;
 exports.DEEPBOOKV2 = DEEPBOOKV2;
 exports.Env = Env;
 exports.FLOWXV2 = FLOWXV2;
+exports.FLOWXV3 = FLOWXV3;
 exports.HAEDAL = HAEDAL;
 exports.KRIYA = KRIYA;
 exports.KRIYAV3 = KRIYAV3;

package/dist/index.mjs

@@ -5855,7 +5855,6 @@ var Haedal = class {
         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}`,
@@ -5935,18 +5934,49 @@ var Volo = class {
   }
 };
 
+// src/transaction/flowx_v3.ts
+var FlowxV3 = class {
+  constructor(env) {
+    if (env !== 0 /* Mainnet */) {
+      throw new Error("Flowx clmm only supported on mainnet");
+    }
+    this.versioned = "0x67624a1533b5aff5d0dfcf5e598684350efd38134d2d245f475524c03a64e656";
+    this.poolRegistry = "0x27565d24a4cd51127ac90e4074a841bbe356cca7bf5759ddc14a975be1632abc";
+  }
+  swap(client, txb, path, inputCoin) {
+    return __async(this, null, function* () {
+      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 * 1e6),
+        inputCoin,
+        txb.object(this.versioned),
+        txb.object(CLOCK_ADDRESS)
+      ];
+      const res = txb.moveCall({
+        target: `${client.publishedAt()}::flowx_clmm::${func}`,
+        typeArguments: [coinAType, coinBType],
+        arguments: args
+      });
+      return res;
+    });
+  }
+};
+
 // src/client.ts
 var CETUS = "CETUS";
 var DEEPBOOKV2 = "DEEPBOOK";
 var KRIYA = "KRIYA";
 var FLOWXV2 = "FLOWX";
+var FLOWXV3 = "FLOWXV3";
 var KRIYAV3 = "KRIYAV3";
 var TURBOS = "TURBOS";
 var AFTERMATH = "AFTERMATH";
 var HAEDAL = "HAEDAL";
 var VOLO = "VOLO";
 var AFSUI = "AFSUI";
-var AggregatorClient5 = class {
+var AggregatorClient6 = class {
   constructor(endpoint, signer, client, env) {
     this.endpoint = endpoint;
     this.client = client;
@@ -6183,7 +6213,7 @@ var AggregatorClient5 = class {
   }
   publishedAt() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x9fd702cf1a8db5a2e99be20be6750d22ec75c30d57e3d9ccbc37c9b4ad7bef21";
+      return "0xeffc8ae61f439bb34c9b905ff8f29ec56873dcedf81c7123ff2f1f67c45ec302";
     } else {
       return "0x0";
     }
@@ -6225,6 +6255,8 @@ var AggregatorClient5 = class {
         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:
@@ -6405,4 +6437,4 @@ decimal.js/decimal.mjs:
    *)
 */
 
-export { AFSUI, AFTERMATH, AggregatorClient5 as AggregatorClient, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, Env, FLOWXV2, HAEDAL, KRIYA, KRIYAV3, ONE, TEN_POW_NINE, TURBOS, TWO, U128, U64_MAX, U64_MAX_BN, VOLO, ZERO, composeType, createTarget, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, getRouterResult, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId };
+export { AFSUI, AFTERMATH, AggregatorClient6 as AggregatorClient, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, Env, FLOWXV2, FLOWXV3, HAEDAL, KRIYA, KRIYAV3, ONE, TEN_POW_NINE, TURBOS, TWO, U128, U64_MAX, U64_MAX_BN, VOLO, ZERO, composeType, createTarget, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, getRouterResult, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId };

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cetusprotocol/aggregator-sdk",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "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"
@@ -333,7 +335,7 @@ export class AggregatorClient {
 
   publishedAt(): string {
     if (this.env === Env.Mainnet) {
-      return "0x9fd702cf1a8db5a2e99be20be6750d22ec75c30d57e3d9ccbc37c9b4ad7bef21"
+      return "0xeffc8ae61f439bb34c9b905ff8f29ec56873dcedf81c7123ff2f1f67c45ec302"
     } else {
       return "0x0"
     }
@@ -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/coin.ts

@@ -1,4 +1,3 @@
-import { SuiZeroCoinFn } from "../const"
 import { CoinAsset } from "../types/sui"
 import { CoinUtils } from "../types/CoinAssist"
 import { TransactionErrorCode } from "../errors"

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",
       ],
     })