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

package/dist/index.mjs

@@ -5712,16 +5712,6 @@ function buildInputCoin(txb, allCoins, amount, coinType) {
 }
 
 // src/utils/transaction.ts
-function printTransaction(tx, isPrint = true) {
-  return __async(this, null, function* () {
-    console.log(`inputs`, tx.getData().inputs);
-    tx.getData().commands.forEach((item, index) => {
-      if (isPrint) {
-        console.log(`transaction ${index}: `, JSON.stringify(item, null, 2));
-      }
-    });
-  });
-}
 function checkInvalidSuiAddress(address) {
   if (!address.startsWith("0x") || address.length !== 66) {
     return false;
@@ -6000,45 +5990,6 @@ var Bluemove = class {
   }
 };
 
-// src/transaction/deepbook_v3.ts
-var DeepbookV3 = class {
-  constructor(env) {
-    this.deepbookV3Config = env === 0 /* Mainnet */ ? "0x0" : "0xe19b5d072346cae83a037d4e3c8492068a74410a74e5830b3a68012db38296aa";
-    this.deepCoinType = env === 0 /* Mainnet */ ? "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP" : "0x36dbef866a1d62bf7328989a10fb2f07d769f4ee587c0de4a0a256e57e0a58a8::deep::DEEP";
-  }
-  swap(client, txb, path, inputCoin, deepbookv3DeepFee) {
-    return __async(this, null, function* () {
-      var _a, _b, _c;
-      const { direction, from, target } = path;
-      const [func, coinAType, coinBType] = direction ? ["swap_a2b", from, target] : ["swap_b2a", target, from];
-      let deepFee;
-      if (deepbookv3DeepFee) {
-        if (((_a = path.extendedDetails) == null ? void 0 : _a.deepbookv3DeepFee) && ((_b = path.extendedDetails) == null ? void 0 : _b.deepbookv3DeepFee) > 0) {
-          const splitAmounts = [(_c = path.extendedDetails) == null ? void 0 : _c.deepbookv3DeepFee];
-          deepFee = txb.splitCoins(deepbookv3DeepFee, splitAmounts)[0];
-        } 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
-      });
-      return res;
-    });
-  }
-};
-
 // src/client.ts
 var CETUS = "CETUS";
 var DEEPBOOKV2 = "DEEPBOOK";
@@ -6052,10 +6003,9 @@ var HAEDAL = "HAEDAL";
 var VOLO = "VOLO";
 var AFSUI = "AFSUI";
 var BLUEMOVE = "BLUEMOVE";
-var DEEPBOOKV3 = "DEEPBOOKV3";
-var AggregatorClient7 = class {
+var AggregatorClient6 = class {
   constructor(endpoint, signer, client, env) {
-    this.endpoint = processEndpoint(endpoint);
+    this.endpoint = endpoint;
     this.client = client;
     this.signer = signer;
     this.env = env;
@@ -6092,7 +6042,7 @@ var AggregatorClient7 = class {
       return getRouterResult(this.endpoint, params);
     });
   }
-  expectInputSwap(txb, inputCoin, routers, amountOutLimit, partner, deepbookv3DeepFee) {
+  expectInputSwap(txb, inputCoin, routers, amountOutLimit, partner) {
     return __async(this, null, function* () {
       if (routers.length === 0) {
         throw new Error("No router found");
@@ -6109,14 +6059,11 @@ var AggregatorClient7 = class {
         let nextCoin = inputCoins[i];
         for (const path of routers[i].path) {
           const dex = this.newDex(path.provider, partner);
-          nextCoin = yield dex.swap(this, txb, path, nextCoin, deepbookv3DeepFee);
+          nextCoin = yield 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,
@@ -6188,7 +6135,7 @@ var AggregatorClient7 = class {
   }
   routerSwap(params) {
     return __async(this, null, function* () {
-      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 import_bn5.default(0)
@@ -6208,8 +6155,7 @@ var AggregatorClient7 = class {
           inputCoin,
           routers,
           new import_bn5.default(amountLimit),
-          partner,
-          deepbookv3DeepFee
+          partner
         );
         return targetCoin2;
       }
@@ -6237,8 +6183,7 @@ var AggregatorClient7 = class {
         txb,
         partner,
         isMergeTragetCoin,
-        refreshAllCoins,
-        payDeepFeeAmount
+        refreshAllCoins
       } = params;
       if (refreshAllCoins || this.allCoins.length === 0) {
         this.allCoins = yield this.getAllCoins();
@@ -6265,30 +6210,13 @@ var AggregatorClient7 = class {
         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 = yield this.routerSwap({
         routers,
         inputCoin: buildFromCoinRes.targetCoin,
         slippage,
         byAmountIn,
         txb,
-        partner,
-        deepbookv3DeepFee: buildDeepFeeCoinRes.targetCoin
+        partner
       });
       if (isMergeTragetCoin) {
         const targetCoinRes = buildInputCoin(
@@ -6312,16 +6240,9 @@ var AggregatorClient7 = class {
   }
   publishedAt() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x764b8132a94d35abc9dfd91b23a0757b2a717d5ecb04c03098794aa2a508db91";
-    } else {
-      return "0xf92cdec6c2d73a12d8afa8dd41199b3e95b621272bbc655996539cd30de6a462";
-    }
-  }
-  deepbookv3DeepFeeType() {
-    if (this.env === 0 /* Mainnet */) {
-      return "0x36dbef866a1d62bf7328989a10fb2f07d769f4ee587c0de4a0a256e57e0a58a8::deep::DEEP";
+      return "0x7eb2f30d541c06fa7bcf26444845df56361647df0e778b82e5707fb26754c398";
     } else {
-      return "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP";
+      return "0x6cbaa3e9fbe902d90191b12f315932bc58079cba422bafbd4b4369f80e61f595";
     }
   }
   transferOrDestoryCoin(txb, coin, coinType) {
@@ -6355,8 +6276,6 @@ var AggregatorClient7 = class {
         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:
@@ -6414,44 +6333,26 @@ var AggregatorClient7 = class {
       return res;
     });
   }
-  getDeepbookV3Config() {
-    return __async(this, null, function* () {
-      const res = yield getDeepbookV3Config(this.endpoint);
-      if (res) {
-        return res.data;
-      }
-      return null;
-    });
-  }
 };
 function parseRouterResponse(data) {
-  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 = {
+  return {
     amountIn: new import_bn5.default(data.amount_in.toString()),
     amountOut: new import_bn5.default(data.amount_out.toString()),
     insufficientLiquidity: false,
     routes: data.routes.map((route) => {
       return {
         path: route.path.map((path) => {
-          var _a, _b, _c, _d;
+          var _a, _b, _c;
           let version;
           if (path.provider === AFTERMATH) {
             version = path.extended_details.aftermath_pool_flatness === 0 ? "v2" : "v3";
           }
           let extendedDetails;
-          if (path.provider === TURBOS || path.provider === AFTERMATH || path.provider === CETUS || path.provider === DEEPBOOKV3) {
+          if (path.provider === TURBOS || path.provider === AFTERMATH || path.provider === CETUS) {
             extendedDetails = {
               aftermathLpSupplyType: (_a = path.extended_details) == null ? void 0 : _a.aftermath_lp_supply_type,
               turbosFeeType: (_b = path.extended_details) == null ? void 0 : _b.turbos_fee_type,
-              afterSqrtPrice: (_c = path.extended_details) == null ? void 0 : _c.after_sqrt_price,
-              deepbookv3DeepFee: (_d = path.extended_details) == null ? void 0 : _d.deepbookv3_deep_fee
+              afterSqrtPrice: (_c = path.extended_details) == null ? void 0 : _c.after_sqrt_price
             };
           }
           return {
@@ -6471,10 +6372,8 @@ function parseRouterResponse(data) {
         amountOut: new import_bn5.default(route.amount_out.toString()),
         initialPrice: new decimal_default(route.initial_price.toString())
       };
-    }),
-    totalDeepFee
+    })
   };
-  return routerData;
 }
 
 // src/transaction/index.ts
@@ -6505,14 +6404,6 @@ var restituteMsafeFastRouterSwapParams = (data) => {
   return result;
 };
 
-// src/utils/api.ts
-function processEndpoint(endpoint) {
-  if (endpoint.endsWith("/find_routes")) {
-    return endpoint.replace("/find_routes", "");
-  }
-  return endpoint;
-}
-
 // src/api.ts
 function getRouterResult(endpoint, params) {
   return __async(this, null, function* () {
@@ -6575,7 +6466,7 @@ function getRouter(endpoint, params) {
       } = params;
       const fromCoin = completionCoin(from);
       const targetCoin = completionCoin(target);
-      let url = `${endpoint}/find_routes?from=${fromCoin}&target=${targetCoin}&amount=${amount.toString()}&by_amount_in=${byAmountIn}`;
+      let url = `${endpoint}?from=${fromCoin}&target=${targetCoin}&amount=${amount.toString()}&by_amount_in=${byAmountIn}`;
       if (depth) {
         url += `&depth=${depth}`;
       }
@@ -6617,7 +6508,7 @@ function postRouterWithLiquidityChanges(endpoint, params) {
     } = params;
     const fromCoin = completionCoin(from);
     const targetCoin = completionCoin(target);
-    const url = `${endpoint}/find_routes`;
+    const url = `${endpoint}`;
     const providersStr = providers == null ? void 0 : providers.join(",");
     const requestData = {
       from: fromCoin,
@@ -6636,6 +6527,7 @@ function postRouterWithLiquidityChanges(endpoint, params) {
         delta_liquidity: change.deltaLiquidity
       }))
     };
+    console.log("requestData", JSON.stringify(requestData, null, 2));
     try {
       const response = yield fetch(url, {
         method: "POST",
@@ -6651,18 +6543,6 @@ function postRouterWithLiquidityChanges(endpoint, params) {
     }
   });
 }
-function getDeepbookV3Config(endpoint) {
-  return __async(this, null, function* () {
-    const url = `${endpoint}/deepbookv3_config`;
-    try {
-      const response = yield fetch(url);
-      return response.json();
-    } catch (error) {
-      console.error("Error:", error);
-      return null;
-    }
-  });
-}
 
 // src/index.ts
 var Env = /* @__PURE__ */ ((Env2) => {
@@ -6682,4 +6562,4 @@ decimal.js/decimal.mjs:
    *)
 */
 
-export { AFSUI, AFTERMATH, AggregatorClient7 as AggregatorClient, BLUEMOVE, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, DEEPBOOKV3, Env, FLOWXV2, FLOWXV3, HAEDAL, KRIYA, KRIYAV3, ONE, TEN_POW_NINE, TURBOS, TWO, U128, U64_MAX, U64_MAX_BN, VOLO, ZERO, buildInputCoin, checkInvalidSuiAddress, compareCoins, completionCoin, composeType, createTarget, dealWithFastRouterSwapParamsForMsafe, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, getDeepbookV3Config, getRouterResult, isSortedSymbols, mintZeroCoin, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId, printTransaction, processEndpoint, restituteMsafeFastRouterSwapParams };
+export { AFSUI, AFTERMATH, AggregatorClient6 as AggregatorClient, BLUEMOVE, 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, dealWithFastRouterSwapParamsForMsafe, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, getRouterResult, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId, restituteMsafeFastRouterSwapParams };

package/dist/src/api.d.ts

@@ -23,7 +23,6 @@ export type ExtendedDetails = {
     aftermathLpSupplyType?: string;
     turbosFeeType?: string;
     afterSqrtPrice?: string;
-    deepbookv3DeepFee?: number;
 };
 export type Path = {
     id: string;
@@ -52,7 +51,6 @@ export type RouterData = {
     amountOut: BN;
     routes: Router[];
     insufficientLiquidity: boolean;
-    totalDeepFee?: number;
     error?: RouterError;
 };
 export type AggregatorResponse = {
@@ -61,17 +59,3 @@ export type AggregatorResponse = {
     data: RouterData;
 };
 export declare function getRouterResult(endpoint: string, params: FindRouterParams): Promise<RouterData | null>;
-export type DeepbookV3Config = {
-    id: string;
-    is_alternative_payment: boolean;
-    deep_fee_vault: number;
-    whitelist: number;
-    whitelist_pools: string[];
-    last_updated_time: number;
-};
-export type DeepbookV3ConfigResponse = {
-    code: number;
-    msg: string;
-    data: DeepbookV3Config;
-};
-export declare function getDeepbookV3Config(endpoint: string): Promise<DeepbookV3ConfigResponse | null>;

package/dist/src/client.d.ts

@@ -2,7 +2,7 @@ import { SuiClient } from "@mysten/sui/client";
 import { Transaction, TransactionObjectArgument } from "@mysten/sui/transactions";
 import { Signer } from "@mysten/sui/cryptography";
 import BN from "bn.js";
-import { Dex, Env, FindRouterParams, Router, RouterData, DeepbookV3Config } from ".";
+import { Dex, Env, FindRouterParams, Router, RouterData } from ".";
 import { CoinAsset } from "./types/sui";
 export declare const CETUS = "CETUS";
 export declare const DEEPBOOKV2 = "DEEPBOOK";
@@ -16,7 +16,6 @@ export declare const HAEDAL = "HAEDAL";
 export declare const VOLO = "VOLO";
 export declare const AFSUI = "AFSUI";
 export declare const BLUEMOVE = "BLUEMOVE";
-export declare const DEEPBOOKV3 = "DEEPBOOKV3";
 export type BuildRouterSwapParams = {
     routers: Router[];
     byAmountIn: boolean;
@@ -24,7 +23,6 @@ export type BuildRouterSwapParams = {
     slippage: number;
     txb: Transaction;
     partner?: string;
-    deepbookv3DeepFee?: TransactionObjectArgument;
 };
 export type BuildFastRouterSwapParams = {
     routers: Router[];
@@ -34,7 +32,6 @@ export type BuildFastRouterSwapParams = {
     partner?: string;
     isMergeTragetCoin?: boolean;
     refreshAllCoins?: boolean;
-    payDeepFeeAmount?: number;
 };
 export interface SwapInPoolsParams {
     from: string;
@@ -56,19 +53,17 @@ export declare class AggregatorClient {
     constructor(endpoint: string, signer: string, client: SuiClient, env: Env);
     getAllCoins(): Promise<CoinAsset[]>;
     findRouters(params: FindRouterParams): Promise<RouterData | null>;
-    expectInputSwap(txb: Transaction, inputCoin: TransactionObjectArgument, routers: Router[], amountOutLimit: BN, partner?: string, deepbookv3DeepFee?: TransactionObjectArgument): Promise<TransactionObjectArgument>;
+    expectInputSwap(txb: Transaction, inputCoin: TransactionObjectArgument, routers: Router[], amountOutLimit: BN, partner?: string): Promise<TransactionObjectArgument>;
     expectOutputSwap(txb: Transaction, inputCoin: TransactionObjectArgument, routers: Router[], partner?: string): Promise<TransactionObjectArgument>;
     swapInPools(params: SwapInPoolsParams): Promise<SwapInPoolsResult | null>;
     routerSwap(params: BuildRouterSwapParams): Promise<TransactionObjectArgument>;
     fastRouterSwap(params: BuildFastRouterSwapParams): Promise<void>;
     publishedAt(): string;
-    deepbookv3DeepFeeType(): string;
     transferOrDestoryCoin(txb: Transaction, coin: TransactionObjectArgument, coinType: string): void;
     checkCoinThresholdAndMergeCoin(txb: Transaction, coins: TransactionObjectArgument[], coinType: string, amountLimit: BN): TransactionObjectArgument;
     newDex(provider: string, partner?: string): Dex;
     signAndExecuteTransaction(txb: Transaction, signer: Signer): Promise<import("@mysten/sui/client").SuiTransactionBlockResponse>;
     devInspectTransactionBlock(txb: Transaction): Promise<import("@mysten/sui/client").DevInspectResults>;
     sendTransaction(txb: Transaction, signer: Signer): Promise<import("@mysten/sui/client").SuiTransactionBlockResponse>;
-    getDeepbookV3Config(): Promise<DeepbookV3Config | null>;
 }
 export declare function parseRouterResponse(data: any): RouterData;

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

@@ -2,5 +2,5 @@ import { Transaction, TransactionObjectArgument } from "@mysten/sui/transactions
 import { AggregatorClient, Path } from "..";
 export declare const CLOCK_ADDRESS = "0x0000000000000000000000000000000000000000000000000000000000000006";
 export interface Dex {
-    swap(client: AggregatorClient, ptb: Transaction, path: Path, inputCoin: TransactionObjectArgument, deepbookv3DeepFee?: TransactionObjectArgument): Promise<TransactionObjectArgument>;
+    swap(client: AggregatorClient, ptb: Transaction, path: Path, inputCoin: TransactionObjectArgument): Promise<TransactionObjectArgument>;
 }

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

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

package/dist/tests/test_data.test.d.ts

@@ -1,7 +1,4 @@
 export declare const T_USDC = "";
-export declare const T_DEEP = "0x36dbef866a1d62bf7328989a10fb2f07d769f4ee587c0de4a0a256e57e0a58a8::deep::DEEP";
-export declare const T_DBUSDC = "0xf7152c05930480cd740d7311b5b8b45c6f488e3a53a11c3f74a6fac36a52e0d7::DBUSDC::DBUSDC";
-export declare const T_DBUSDT = "0xf7152c05930480cd740d7311b5b8b45c6f488e3a53a11c3f74a6fac36a52e0d7::DBUSDT::DBUSDT";
 export declare const M_USDC = "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN";
 export declare const M_CETUS = "0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b::cetus::CETUS";
 export declare const M_NAVI = "0xa99b8952d4f7d947ea77fe0ecdcc9e5fc0bcab2841d6e2a5aa00c3044e5544b5::navx::NAVX";

package/package.json

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

package/src/api.ts

@@ -33,7 +33,6 @@ export type ExtendedDetails = {
   aftermathLpSupplyType?: string
   turbosFeeType?: string
   afterSqrtPrice?: string
-  deepbookv3DeepFee?: number
 }
 
 export type Path = {
@@ -66,7 +65,6 @@ export type RouterData = {
   amountOut: BN
   routes: Router[]
   insufficientLiquidity: boolean
-  totalDeepFee?: number
   error?: RouterError
 }
 
@@ -142,7 +140,7 @@ async function getRouter(endpoint: string, params: FindRouterParams) {
     const fromCoin = completionCoin(from)
     const targetCoin = completionCoin(target)
 
-    let url = `${endpoint}/find_routes?from=${fromCoin}&target=${targetCoin}&amount=${amount.toString()}&by_amount_in=${byAmountIn}`
+    let url = `${endpoint}?from=${fromCoin}&target=${targetCoin}&amount=${amount.toString()}&by_amount_in=${byAmountIn}`
 
     if (depth) {
       url += `&depth=${depth}`
@@ -193,8 +191,11 @@ async function postRouterWithLiquidityChanges(
 
   const fromCoin = completionCoin(from)
   const targetCoin = completionCoin(target)
-  const url = `${endpoint}/find_routes`
+
+  const url = `${endpoint}`
+
   const providersStr = providers?.join(",")
+
   const requestData = {
     from: fromCoin,
     target: targetCoin,
@@ -213,6 +214,8 @@ async function postRouterWithLiquidityChanges(
     })),
   }
 
+  console.log("requestData", JSON.stringify(requestData, null, 2))
+
   try {
     const response = await fetch(url, {
       method: "POST",
@@ -228,32 +231,3 @@ async function postRouterWithLiquidityChanges(
     return null
   }
 }
-
-export type DeepbookV3Config = {
-  id: string
-  is_alternative_payment: boolean
-  deep_fee_vault: number
-  whitelist: number
-  whitelist_pools: string[]
-  // unix timestamp in seconds
-  last_updated_time: number
-}
-
-export type DeepbookV3ConfigResponse = {
-  code: number
-  msg: string
-  data: DeepbookV3Config
-}
-
-export async function getDeepbookV3Config(
-  endpoint: string
-): Promise<DeepbookV3ConfigResponse | null> {
-  const url = `${endpoint}/deepbookv3_config`
-  try {
-    const response = await fetch(url)
-    return response.json() as Promise<DeepbookV3ConfigResponse>
-  } catch (error) {
-    console.error("Error:", error)
-    return null
-  }
-}