@cetusprotocol/aggregator-sdk 0.3.21 → 0.3.23

package/dist/index.mjs

@@ -5801,11 +5801,10 @@ function swapInPools(client, params, sender, env) {
     const targetCoin = completionCoin(target);
     const tx = new Transaction();
     const direction = compareCoins(fromCoin, targetCoin);
-    const integratePublishedAt = env === 0 /* Mainnet */ ? "0x3a5aa90ffa33d09100d7b6941ea1c0ffe6ab66e77062ddd26320c1b073aabb10" : "0x19dd42e05fa6c9988a60d30686ee3feb776672b5547e328d6dab16563da65293";
+    const integratePublishedAt = env === 0 /* Mainnet */ ? "0x2d8c2e0fc6dd25b0214b3fa747e0fd27fd54608142cd2e4f64c1cd350cc4add4" : "0x4f920e1ef6318cfba77e20a0538a419a5a504c14230169438b99aba485db40a6";
     const coinA = direction ? fromCoin : targetCoin;
     const coinB = direction ? targetCoin : fromCoin;
     const typeArguments = [coinA, coinB];
-    console.log("typeArguments", typeArguments, integratePublishedAt);
     for (let i = 0; i < pools.length; i++) {
       const args = [
         tx.object(pools[i]),
@@ -5825,7 +5824,6 @@ function swapInPools(client, params, sender, env) {
         "InvalidWallet" /* InvalidWallet */
       );
     }
-    printTransaction(tx);
     const simulateRes = yield client.devInspectTransactionBlock({
       transactionBlock: tx,
       sender
@@ -5867,7 +5865,6 @@ function swapInPools(client, params, sender, env) {
       }
     }
     const event = valueData[tempIndex].parsedJson.data;
-    console.log("event", JSON.stringify(event, null, 2));
     const currentSqrtPrice = event.step_results[0].current_sqrt_price;
     const [decimalA, decimalB] = yield Promise.all([
       client.getCoinMetadata({ coinType: coinA }).then((metadata) => metadata == null ? void 0 : metadata.decimals),
@@ -6168,19 +6165,14 @@ var Bluefin = class {
     });
   }
 };
+
+// src/transaction/haedal_pmm.ts
 var HaedalPmm = class {
-  constructor(env, suiClient) {
+  constructor(env, pythPriceIDs) {
     if (env === 1 /* Testnet */) {
-      this.connection = new SuiPriceServiceConnection("https://hermes-beta.pyth.network");
-      const wormholeStateId = "0x31358d198147da50db32eda2562951d53973a0c0ad5ed738e9b17d88b213d790";
-      const pythStateId = "0x243759059f4c3111179da5878c12f68d612c21a8d54d85edc86164bb18be1c7c";
-      this.pythClient = new SuiPythClient(suiClient, pythStateId, wormholeStateId);
-    } else {
-      this.connection = new SuiPriceServiceConnection("https://hermes.pyth.network");
-      const wormholeStateId = "0xaeab97f96cf9877fee2883315d459552b2b921edc16d7ceac6eab944dd88919c";
-      const pythStateId = "0x1f9310238ee9298fb703c3419030b35b22bb1cc37113e3bb5007c99aec79e5b8";
-      this.pythClient = new SuiPythClient(suiClient, pythStateId, wormholeStateId);
+      throw new Error("HaedalPmm is not supported on testnet");
     }
+    this.pythPriceIDs = pythPriceIDs;
   }
   swap(client, txb, path, inputCoin, packages) {
     return __async(this, null, function* () {
@@ -6197,17 +6189,24 @@ var HaedalPmm = class {
         basePriceSeed = path.extendedDetails.haedalPmmBasePriceSeed;
         quotePriceSeed = path.extendedDetails.haedalPmmQuotePriceSeed;
       }
-      const priceIDs = [basePriceSeed, quotePriceSeed];
-      const priceUpdateData = yield this.connection.getPriceFeedsUpdateData(priceIDs);
-      const priceInfoObjectIds = yield this.pythClient.updatePriceFeeds(txb, priceUpdateData, priceIDs);
+      const basePriceInfoObjectId = this.pythPriceIDs.get(basePriceSeed);
+      const quotePriceInfoObjectId = this.pythPriceIDs.get(quotePriceSeed);
+      if (!basePriceInfoObjectId || !quotePriceInfoObjectId) {
+        throw new Error(
+          "Base price info object id or quote price info object id not found"
+        );
+      }
       const args = [
         txb.object(path.id),
-        txb.object(priceInfoObjectIds[0]),
-        txb.object(priceInfoObjectIds[1]),
+        txb.object(basePriceInfoObjectId),
+        txb.object(quotePriceInfoObjectId),
         inputCoin,
         txb.object(CLOCK_ADDRESS)
       ];
-      const publishedAt = getAggregatorV2ExtendPublishedAt(client.publishedAtV2Extend(), packages);
+      const publishedAt = getAggregatorV2ExtendPublishedAt(
+        client.publishedAtV2Extend(),
+        packages
+      );
       const res = txb.moveCall({
         target: `${publishedAt}::haedalpmm::${func}`,
         typeArguments: [coinAType, coinBType],
@@ -6245,8 +6244,6 @@ var Alphafi = class {
     });
   }
 };
-
-// src/client.ts
 var CETUS = "CETUS";
 var DEEPBOOKV2 = "DEEPBOOK";
 var KRIYA = "KRIYA";
@@ -6273,13 +6270,20 @@ function isBuilderRouterSwapParams(params) {
 function isBuilderFastRouterSwapParams(params) {
   return Array.isArray(params.routers);
 }
-var AggregatorClient19 = class {
+var _AggregatorClient = class _AggregatorClient {
   constructor(endpoint, signer, client, env) {
     this.endpoint = endpoint ? processEndpoint(endpoint) : DEFAULT_ENDPOINT;
     this.client = client || new SuiClient({ url: getFullnodeUrl("mainnet") });
     this.signer = signer || "";
     this.env = env || 0 /* Mainnet */;
     this.allCoins = /* @__PURE__ */ new Map();
+    const config2 = _AggregatorClient.CONFIG[this.env];
+    this.pythConnections = config2.connections;
+    this.pythClient = new SuiPythClient(
+      this.client,
+      config2.pythStateId,
+      config2.wormholeStateId
+    );
   }
   getCoins(coinType, refresh = true) {
     return __async(this, null, function* () {
@@ -6323,7 +6327,7 @@ var AggregatorClient19 = class {
       return getRouterResult(this.endpoint, params);
     });
   }
-  expectInputSwap(txb, inputCoin, routers, amountOutLimit, partner, deepbookv3DeepFee, packages) {
+  expectInputSwap(txb, inputCoin, routers, amountOutLimit, pythPriceIDs, partner, deepbookv3DeepFee, packages) {
     return __async(this, null, function* () {
       if (routers.length === 0) {
         throw new Error("No router found");
@@ -6339,13 +6343,28 @@ var AggregatorClient19 = 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, packages, deepbookv3DeepFee);
+          const dex = this.newDex(path.provider, pythPriceIDs, partner);
+          nextCoin = yield dex.swap(
+            this,
+            txb,
+            path,
+            nextCoin,
+            packages,
+            deepbookv3DeepFee
+          );
         }
         outputCoins.push(nextCoin);
       }
-      const aggregatorV2PublishedAt = getAggregatorV2PublishedAt(this.publishedAtV2(), packages);
-      this.transferOrDestoryCoin(txb, inputCoin, inputCoinType, this.publishedAtV2());
+      const aggregatorV2PublishedAt = getAggregatorV2PublishedAt(
+        this.publishedAtV2(),
+        packages
+      );
+      this.transferOrDestoryCoin(
+        txb,
+        inputCoin,
+        inputCoinType,
+        this.publishedAtV2()
+      );
       const mergedTargetCointhis = this.checkCoinThresholdAndMergeCoin(
         txb,
         outputCoins,
@@ -6362,7 +6381,10 @@ var AggregatorClient19 = class {
       const receipts = [];
       const targetCoins = [];
       const dex = new Cetus(this.env, partner);
-      const aggregatorV2PublishedAt = getAggregatorV2PublishedAt(this.publishedAtV2(), packages);
+      const aggregatorV2PublishedAt = getAggregatorV2PublishedAt(
+        this.publishedAtV2(),
+        packages
+      );
       for (let i = 0; i < routers.length; i++) {
         const router = routers[i];
         for (let j = router.path.length - 1; j >= 0; j--) {
@@ -6385,7 +6407,12 @@ var AggregatorClient19 = class {
           if (j === 0) {
             inputCoin = repayResult;
           } else {
-            this.transferOrDestoryCoin(txb, repayResult, path.from, aggregatorV2PublishedAt);
+            this.transferOrDestoryCoin(
+              txb,
+              repayResult,
+              path.from,
+              aggregatorV2PublishedAt
+            );
           }
           if (j === router.path.length - 1) {
             targetCoins.push(nextRepayCoin);
@@ -6393,7 +6420,12 @@ var AggregatorClient19 = class {
         }
       }
       const inputCoinType = routers[0].path[0].from;
-      this.transferOrDestoryCoin(txb, inputCoin, inputCoinType, aggregatorV2PublishedAt);
+      this.transferOrDestoryCoin(
+        txb,
+        inputCoin,
+        inputCoinType,
+        aggregatorV2PublishedAt
+      );
       if (targetCoins.length > 1) {
         const vec = txb.makeMoveVec({ elements: targetCoins.slice(1) });
         txb.moveCall({
@@ -6419,14 +6451,7 @@ var AggregatorClient19 = class {
   }
   routerSwap(params) {
     return __async(this, null, function* () {
-      const {
-        routers,
-        inputCoin,
-        slippage,
-        txb,
-        partner,
-        deepbookv3DeepFee
-      } = params;
+      const { routers, inputCoin, slippage, txb, partner, deepbookv3DeepFee } = params;
       const routerData = Array.isArray(routers) ? routers : routers.routes;
       const byAmountIn = isBuilderRouterSwapParams(params) ? params.byAmountIn : params.routers.byAmountIn;
       const amountIn = routerData.reduce(
@@ -6443,14 +6468,19 @@ var AggregatorClient19 = class {
         slippage
       );
       const packages = isBuilderRouterSwapParams(params) ? void 0 : params.routers.packages;
-      console.log("packages11", packages);
-      const aggregatorV2PublishedAt = getAggregatorV2PublishedAt(this.publishedAtV2(), packages);
+      const aggregatorV2PublishedAt = getAggregatorV2PublishedAt(
+        this.publishedAtV2(),
+        packages
+      );
+      const priceIDs = findPythPriceIDs(routerData);
+      const priceInfoObjectIds = priceIDs.length > 0 ? yield this.updatePythPriceIDs(priceIDs, txb) : /* @__PURE__ */ new Map();
       if (byAmountIn) {
         const targetCoin2 = yield this.expectInputSwap(
           txb,
           inputCoin,
           routerData,
           amountLimit,
+          priceInfoObjectIds,
           partner,
           deepbookv3DeepFee,
           packages
@@ -6460,7 +6490,12 @@ var AggregatorClient19 = class {
       const splitedInputCoins = txb.splitCoins(inputCoin, [
         amountLimit.toString()
       ]);
-      this.transferOrDestoryCoin(txb, inputCoin, routerData[0].path[0].from, aggregatorV2PublishedAt);
+      this.transferOrDestoryCoin(
+        txb,
+        inputCoin,
+        routerData[0].path[0].from,
+        aggregatorV2PublishedAt
+      );
       const targetCoin = yield this.expectOutputSwap(
         txb,
         splitedInputCoins[0],
@@ -6546,7 +6581,10 @@ var AggregatorClient19 = class {
           targetCoinType
         );
         const packages = isBuilderFastRouterSwapParams(params) ? void 0 : params.routers.packages;
-        const aggregatorV2PublishedAt = getAggregatorV2PublishedAt(this.publishedAtV2(), packages);
+        const aggregatorV2PublishedAt = getAggregatorV2PublishedAt(
+          this.publishedAtV2(),
+          packages
+        );
         txb.mergeCoins(targetCoinRes.targetCoin, [targetCoin]);
         if (targetCoinRes.isMintZeroCoin) {
           this.transferOrDestoryCoin(
@@ -6562,7 +6600,7 @@ var AggregatorClient19 = class {
   // Include cetus、deepbookv2、flowxv2 & v3、kriyav2 & v3、turbos、aftermath、haedal、afsui、volo、bluemove
   publishedAtV2() {
     if (this.env === 0 /* Mainnet */) {
-      return "0xf9c6f78322ed667909e05f6b42b2f5a67af6297503c905335e02a15148e9440d";
+      return "0x2485feb9d42c7c3bcb8ecde555ad40f1b073d9fb4faf354fa2d30a0b183a23ce";
     } else {
       return "0x52eae33adeb44de55cfb3f281d4cc9e02d976181c0952f5323648b5717b33934";
     }
@@ -6607,7 +6645,7 @@ var AggregatorClient19 = class {
     });
     return targetCoin;
   }
-  newDex(provider, partner) {
+  newDex(provider, pythPriceIDs, partner) {
     switch (provider) {
       case CETUS:
         return new Cetus(this.env, partner);
@@ -6644,7 +6682,7 @@ var AggregatorClient19 = class {
       case BLUEFIN:
         return new Bluefin(this.env);
       case HAEDALPMM:
-        return new HaedalPmm(this.env, this.client);
+        return new HaedalPmm(this.env, pythPriceIDs);
       case ALPHAFI:
         return new Alphafi(this.env);
       default:
@@ -6693,7 +6731,82 @@ var AggregatorClient19 = class {
       return null;
     });
   }
+  updatePythPriceIDs(priceIDs, txb) {
+    return __async(this, null, function* () {
+      let priceUpdateData = null;
+      let lastError = null;
+      for (const connection of this.pythConnections) {
+        try {
+          priceUpdateData = yield connection.getPriceFeedsUpdateData(priceIDs);
+          break;
+        } catch (e) {
+          lastError = e;
+          console.log("Error: ", e);
+          continue;
+        }
+      }
+      if (priceUpdateData == null) {
+        throw new Error(
+          `No pyth price seeds update data found: ${lastError == null ? void 0 : lastError.message}`
+        );
+      }
+      let priceInfoObjectIds = [];
+      try {
+        priceInfoObjectIds = yield this.pythClient.updatePriceFeeds(
+          txb,
+          priceUpdateData,
+          priceIDs
+        );
+      } catch (e) {
+        throw new Error(`Failed to update price feeds: ${e}`);
+      }
+      let priceInfoObjectIdsMap = /* @__PURE__ */ new Map();
+      for (let i = 0; i < priceIDs.length; i++) {
+        priceInfoObjectIdsMap.set(priceIDs[i], priceInfoObjectIds[i]);
+      }
+      return priceInfoObjectIdsMap;
+    });
+  }
 };
+_AggregatorClient.CONFIG = {
+  [1 /* Testnet */]: {
+    connections: [
+      new SuiPriceServiceConnection("https://hermes-beta.pyth.network")
+    ],
+    wormholeStateId: "0x31358d198147da50db32eda2562951d53973a0c0ad5ed738e9b17d88b213d790",
+    pythStateId: "0x243759059f4c3111179da5878c12f68d612c21a8d54d85edc86164bb18be1c7c"
+  },
+  [0 /* Mainnet */]: {
+    connections: [
+      new SuiPriceServiceConnection(
+        "https://cetus.liquify.com/api=X9LTVPQD7Y3R5N2A/hermes",
+        {
+          timeout: 3e3
+        }
+      ),
+      new SuiPriceServiceConnection("https://hermes.pyth.network", {
+        timeout: 3e3
+      })
+    ],
+    wormholeStateId: "0xaeab97f96cf9877fee2883315d459552b2b921edc16d7ceac6eab944dd88919c",
+    pythStateId: "0x1f9310238ee9298fb703c3419030b35b22bb1cc37113e3bb5007c99aec79e5b8"
+  }
+};
+var AggregatorClient19 = _AggregatorClient;
+function findPythPriceIDs(routes) {
+  const priceIDs = /* @__PURE__ */ new Set();
+  for (const route of routes) {
+    for (const path of route.path) {
+      if (path.provider === HAEDALPMM) {
+        if (path.extendedDetails && path.extendedDetails.haedalPmmBasePriceSeed && path.extendedDetails.haedalPmmQuotePriceSeed) {
+          priceIDs.add(path.extendedDetails.haedalPmmBasePriceSeed);
+          priceIDs.add(path.extendedDetails.haedalPmmQuotePriceSeed);
+        }
+      }
+    }
+  }
+  return Array.from(priceIDs);
+}
 function parseRouterResponse(data, byAmountIn) {
   let totalDeepFee = 0;
   for (const route of data.routes) {
@@ -6918,7 +7031,7 @@ function getRouter(endpoint, params) {
           url += `&providers=${providers.join(",")}`;
         }
       }
-      url += "&v=1000321";
+      url += "&v=1000323";
       const response = yield fetch(url);
       return response;
     } catch (error) {
@@ -7008,4 +7121,4 @@ decimal.js/decimal.mjs:
    *)
 */
 
-export { AFSUI, AFTERMATH, AGGREGATOR_V2, AGGREGATOR_V2_EXTEND, ALPHAFI, AggregatorClient19 as AggregatorClient, BLUEFIN, BLUEMOVE, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, DEEPBOOKV3, DEFAULT_ENDPOINT, Env, FLOWXV2, FLOWXV3, HAEDAL, HAEDALPMM, KRIYA, KRIYAV3, ONE, SCALLOP, SPRINGSUI, SUILEND, TEN_POW_NINE, TURBOS, TWO, U128, U64_MAX, U64_MAX_BN, VOLO, ZERO, buildInputCoin, checkInvalidSuiAddress, compareCoins, completionCoin, composeType, createTarget, dealWithFastRouterSwapParamsForMsafe, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, getAggregatorV2ExtendPublishedAt, getAggregatorV2PublishedAt, getDeepbookV3Config, getRouterResult, isSortedSymbols, mintZeroCoin, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId, printTransaction, processEndpoint, restituteMsafeFastRouterSwapParams };
+export { AFSUI, AFTERMATH, AGGREGATOR_V2, AGGREGATOR_V2_EXTEND, ALPHAFI, AggregatorClient19 as AggregatorClient, BLUEFIN, BLUEMOVE, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, DEEPBOOKV3, DEFAULT_ENDPOINT, Env, FLOWXV2, FLOWXV3, HAEDAL, HAEDALPMM, KRIYA, KRIYAV3, ONE, SCALLOP, SPRINGSUI, SUILEND, TEN_POW_NINE, TURBOS, TWO, U128, U64_MAX, U64_MAX_BN, VOLO, ZERO, buildInputCoin, checkInvalidSuiAddress, compareCoins, completionCoin, composeType, createTarget, dealWithFastRouterSwapParamsForMsafe, extractAddressFromType, extractStructTagFromType, findPythPriceIDs, fixSuiObjectId, getAggregatorV2ExtendPublishedAt, getAggregatorV2PublishedAt, getDeepbookV3Config, getRouterResult, isSortedSymbols, mintZeroCoin, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId, printTransaction, processEndpoint, restituteMsafeFastRouterSwapParams };

package/dist/src/client.d.ts

@@ -75,10 +75,13 @@ export declare class AggregatorClient {
     client: SuiClient;
     env: Env;
     private allCoins;
+    private pythConnections;
+    private pythClient;
+    private static readonly CONFIG;
     constructor(endpoint?: string, signer?: string, client?: SuiClient, env?: Env);
     getCoins(coinType: string, refresh?: boolean): Promise<CoinAsset[]>;
     findRouters(params: FindRouterParams): Promise<RouterData | null>;
-    expectInputSwap(txb: Transaction, inputCoin: TransactionObjectArgument, routers: Router[], amountOutLimit: BN, partner?: string, deepbookv3DeepFee?: TransactionObjectArgument, packages?: Map<string, string>): Promise<TransactionObjectArgument>;
+    expectInputSwap(txb: Transaction, inputCoin: TransactionObjectArgument, routers: Router[], amountOutLimit: BN, pythPriceIDs: Map<string, string>, partner?: string, deepbookv3DeepFee?: TransactionObjectArgument, packages?: Map<string, string>): Promise<TransactionObjectArgument>;
     expectOutputSwap(txb: Transaction, inputCoin: TransactionObjectArgument, routers: Router[], partner?: string, packages?: Map<string, string>): Promise<TransactionObjectArgument>;
     swapInPools(params: SwapInPoolsParams): Promise<SwapInPoolsResult | null>;
     routerSwap(params: BuildRouterSwapParams | BuildRouterSwapParamsV2): Promise<TransactionObjectArgument>;
@@ -88,10 +91,12 @@ export declare class AggregatorClient {
     deepbookv3DeepFeeType(): string;
     transferOrDestoryCoin(txb: Transaction, coin: TransactionObjectArgument, coinType: string, aggregatorV2PublishedAt: string): void;
     checkCoinThresholdAndMergeCoin(txb: Transaction, coins: TransactionObjectArgument[], coinType: string, amountLimit: BN, aggregatorV2PublishedAt: string): TransactionObjectArgument;
-    newDex(provider: string, partner?: string): Dex;
+    newDex(provider: string, pythPriceIDs: Map<string, 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>;
+    updatePythPriceIDs(priceIDs: string[], txb: Transaction): Promise<Map<string, string>>;
 }
+export declare function findPythPriceIDs(routes: Router[]): string[];
 export declare function parseRouterResponse(data: any, byAmountIn: boolean): RouterData;

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

@@ -1,9 +1,7 @@
 import { Transaction, TransactionObjectArgument } from "@mysten/sui/transactions";
 import { AggregatorClient, Dex, Env, Path } from "..";
-import { SuiClient } from "@mysten/sui/client";
 export declare class HaedalPmm implements Dex {
-    private connection;
-    private pythClient;
-    constructor(env: Env, suiClient: SuiClient);
+    private pythPriceIDs;
+    constructor(env: Env, pythPriceIDs: Map<string, string>);
     swap(client: AggregatorClient, txb: Transaction, path: Path, inputCoin: TransactionObjectArgument, packages?: Map<string, string>): Promise<TransactionObjectArgument>;
 }

package/package.json

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

package/src/api.ts

@@ -114,7 +114,7 @@ export async function getRouterResult(
   const data = await response.json()
   const insufficientLiquidity = data.msg === "liquidity is not enough"
 
-  if(data.msg && data.msg.indexOf('HoneyPot scam')>-1){
+  if (data.msg && data.msg.indexOf("HoneyPot scam") > -1) {
     return {
       amountIn: ZERO,
       amountOut: ZERO,
@@ -190,7 +190,7 @@ async function getRouter(endpoint: string, params: FindRouterParams) {
     }
 
     // set newest sdk version
-    url += "&v=1000321"
+    url += "&v=1000323"
 
     const response = await fetch(url)
     return response