@cetusprotocol/aggregator-sdk 1.6.4 → 1.6.6

package/dist/index.cjs

@@ -3416,7 +3416,7 @@ var AGGREGATOR_V3_CONFIG = {
 };
 
 // src/api.ts
-var SDK_VERSION = 1010604;
+var SDK_VERSION = 1010606;
 function parseRouterResponse(data, byAmountIn) {
   let packages = /* @__PURE__ */ new Map();
   if (data.packages) {
@@ -8413,25 +8413,82 @@ function estimateSwapGasBudget(tx) {
 
 // src/utils/msafe.ts
 var import_bn5 = __toESM(require_bn());
+var dealWithMsafePackages = (packages) => {
+  if (!packages) {
+    return packages;
+  }
+  if (packages instanceof Map) {
+    return Object.fromEntries(packages);
+  }
+  if (Array.isArray(packages)) {
+    return Object.fromEntries(packages);
+  }
+  return packages;
+};
+var restituteMsafePackages = (packages) => {
+  if (!packages) {
+    return packages;
+  }
+  if (packages instanceof Map) {
+    return packages;
+  }
+  if (Array.isArray(packages)) {
+    return new Map(
+      packages.map(([key, value]) => [key, value?.toString?.() ?? value])
+    );
+  }
+  if (typeof packages === "object") {
+    return new Map(
+      Object.entries(packages).map(([key, value]) => [
+        key,
+        value?.toString?.() ?? value
+      ])
+    );
+  }
+  return packages;
+};
+var dealWithMsafeExtendedDetails = (extendedDetails) => {
+  if (!extendedDetails) {
+    return extendedDetails;
+  }
+  const result = {
+    ...extendedDetails
+  };
+  const afterSqrtPrice = extendedDetails.after_sqrt_price ?? extendedDetails.afterSqrtPrice;
+  if (afterSqrtPrice != null) {
+    result.after_sqrt_price = afterSqrtPrice.toString();
+  }
+  return result;
+};
+var restituteMsafeExtendedDetails = (extendedDetails) => {
+  if (!extendedDetails) {
+    return extendedDetails;
+  }
+  const result = {
+    ...extendedDetails
+  };
+  const afterSqrtPrice = extendedDetails.after_sqrt_price ?? extendedDetails.afterSqrtPrice;
+  if (afterSqrtPrice != null) {
+    result.after_sqrt_price = new decimal_default(afterSqrtPrice.toString());
+  }
+  return result;
+};
 var dealWithFastRouterSwapParamsForMsafe = (data) => {
   const result = {
     ...data,
     amountIn: data?.amountIn?.toString(),
     amountOut: data?.amountOut?.toString(),
+    packages: dealWithMsafePackages(data?.packages),
     paths: data?.paths?.map((item) => {
       const info = {
         ...item,
         amountIn: item?.amountIn?.toString(),
-        amountOut: item?.amountOut?.toString()
+        amountOut: item?.amountOut?.toString(),
+        extendedDetails: dealWithMsafeExtendedDetails(item?.extendedDetails)
       };
       if (item?.initialPrice) {
         info["initialPrice"] = item?.initialPrice?.toString();
       }
-      if (item?.extendedDetails?.after_sqrt_price) {
-        info["extendedDetails"] = {
-          after_sqrt_price: item?.extendedDetails?.afterSqrtPrice?.toString()
-        };
-      }
       return info;
     })
   };
@@ -8442,18 +8499,15 @@ var restituteMsafeFastRouterSwapParams = (data) => {
     ...data,
     amountIn: new import_bn5.default(data?.amountIn),
     amountOut: new import_bn5.default(data?.amountOut),
+    packages: restituteMsafePackages(data?.packages),
     paths: data?.paths?.map((item) => {
       const info = {
-        ...item
+        ...item,
+        extendedDetails: restituteMsafeExtendedDetails(item?.extendedDetails)
       };
       if (item?.initialPrice) {
         info["initialPrice"] = new decimal_default(item?.initialPrice?.toString());
       }
-      if (item?.extendedDetails?.after_sqrt_price) {
-        info["extendedDetails"] = {
-          after_sqrt_price: new decimal_default(item?.extendedDetails?.after_sqrt_price?.toString())
-        };
-      }
       return info;
     })
   };
@@ -8849,7 +8903,8 @@ var MagmaPropAmmRouter = class {
   }
 };
 var HaedalPropAmmRouter = class {
-  constructor(_env) {
+  constructor(_env, pythPriceIDs) {
+    this.pythPriceIDs = pythPriceIDs;
   }
   swap(txb, flattenedPath, swapContext, _extends) {
     const path = flattenedPath.path;
@@ -8882,6 +8937,16 @@ var HaedalPropAmmRouter = class {
         "HAEDALPROPAMM quote price info object not found in extended details"
       );
     }
+    if (!extendedDetails.haedalpropamm_base_price_seed) {
+      throw new Error(
+        "HAEDALPROPAMM base price seed not found in extended details"
+      );
+    }
+    if (!extendedDetails.haedalpropamm_quote_price_seed) {
+      throw new Error(
+        "HAEDALPROPAMM quote price seed not found in extended details"
+      );
+    }
   }
   prepareSwapData(flattenedPath) {
     const path = flattenedPath.path;
@@ -8891,6 +8956,15 @@ var HaedalPropAmmRouter = class {
     const extendedDetails = path.extendedDetails;
     const [baseType, quoteType] = path.direction ? [path.from, path.target] : [path.target, path.from];
     const amountIn = flattenedPath.isLastUseOfIntermediateToken ? AGGREGATOR_V3_CONFIG.MAX_AMOUNT_IN : path.amountIn;
+    const basePriceSeed = extendedDetails.haedalpropamm_base_price_seed;
+    const quotePriceSeed = extendedDetails.haedalpropamm_quote_price_seed;
+    const basePriceInfoObject = this.pythPriceIDs.get(basePriceSeed);
+    const quotePriceInfoObject = this.pythPriceIDs.get(quotePriceSeed);
+    if (!basePriceInfoObject || !quotePriceInfoObject) {
+      throw new Error(
+        "HAEDALPROPAMM requires updated Pyth price info objects for both coins"
+      );
+    }
     return {
       baseType,
       quoteType,
@@ -8899,8 +8973,8 @@ var HaedalPropAmmRouter = class {
       publishedAt: path.publishedAt,
       poolId: extendedDetails.haedalpropamm_pool_id,
       regimeId: extendedDetails.haedalpropamm_regime_id,
-      basePriceInfoObject: extendedDetails.haedalpropamm_base_price_info_object,
-      quotePriceInfoObject: extendedDetails.haedalpropamm_quote_price_info_object
+      basePriceInfoObject,
+      quotePriceInfoObject
     };
   }
   executeSwapContract(txb, swapData, swapContext) {
@@ -9064,7 +9138,8 @@ var PYTH_ORACLE_BASED_DEXES = [
   HAEDALPMM,
   METASTABLE,
   STEAMM_OMM_V2,
-  HAEDALHMMV2
+  HAEDALHMMV2,
+  HAEDALPROPAMM
 ];
 function getAllProviders() {
   return ALL_DEXES;
@@ -9124,6 +9199,12 @@ function findPythPriceIDs(paths) {
         priceIDs.add(path.extendedDetails.haedalhmmv2_base_price_seed);
       }
     }
+    if (path.provider === HAEDALPROPAMM) {
+      if (path.extendedDetails && path.extendedDetails.haedalpropamm_base_price_seed && path.extendedDetails.haedalpropamm_quote_price_seed) {
+        priceIDs.add(path.extendedDetails.haedalpropamm_base_price_seed);
+        priceIDs.add(path.extendedDetails.haedalpropamm_quote_price_seed);
+      }
+    }
   }
   return Array.from(priceIDs);
 }
@@ -9331,7 +9412,7 @@ var _AggregatorClient = class _AggregatorClient {
       case MAGMAPROPAMM:
         return new MagmaPropAmmRouter(this.env);
       case HAEDALPROPAMM:
-        return new HaedalPropAmmRouter(this.env);
+        return new HaedalPropAmmRouter(this.env, pythPriceIDs);
       case CETUS_TIDE:
         return new CetusTideRouter();
       default:

package/dist/index.d.cts

@@ -109,6 +109,8 @@ type ExtendedDetails = {
     haedalpropamm_pool_id?: string;
     haedalpropamm_regime_id?: string;
     haedalpropamm_oracle_mode?: string;
+    haedalpropamm_base_price_seed?: string;
+    haedalpropamm_quote_price_seed?: string;
     haedalpropamm_base_price_info_object?: string;
     haedalpropamm_quote_price_info_object?: string;
     cetus_tide_fill?: CetusTideFill;

package/dist/index.d.ts

@@ -109,6 +109,8 @@ type ExtendedDetails = {
     haedalpropamm_pool_id?: string;
     haedalpropamm_regime_id?: string;
     haedalpropamm_oracle_mode?: string;
+    haedalpropamm_base_price_seed?: string;
+    haedalpropamm_quote_price_seed?: string;
     haedalpropamm_base_price_info_object?: string;
     haedalpropamm_quote_price_info_object?: string;
     cetus_tide_fill?: CetusTideFill;

package/dist/index.js

@@ -3410,7 +3410,7 @@ var AGGREGATOR_V3_CONFIG = {
 };
 
 // src/api.ts
-var SDK_VERSION = 1010604;
+var SDK_VERSION = 1010606;
 function parseRouterResponse(data, byAmountIn) {
   let packages = /* @__PURE__ */ new Map();
   if (data.packages) {
@@ -8407,25 +8407,82 @@ function estimateSwapGasBudget(tx) {
 
 // src/utils/msafe.ts
 var import_bn5 = __toESM(require_bn());
+var dealWithMsafePackages = (packages) => {
+  if (!packages) {
+    return packages;
+  }
+  if (packages instanceof Map) {
+    return Object.fromEntries(packages);
+  }
+  if (Array.isArray(packages)) {
+    return Object.fromEntries(packages);
+  }
+  return packages;
+};
+var restituteMsafePackages = (packages) => {
+  if (!packages) {
+    return packages;
+  }
+  if (packages instanceof Map) {
+    return packages;
+  }
+  if (Array.isArray(packages)) {
+    return new Map(
+      packages.map(([key, value]) => [key, value?.toString?.() ?? value])
+    );
+  }
+  if (typeof packages === "object") {
+    return new Map(
+      Object.entries(packages).map(([key, value]) => [
+        key,
+        value?.toString?.() ?? value
+      ])
+    );
+  }
+  return packages;
+};
+var dealWithMsafeExtendedDetails = (extendedDetails) => {
+  if (!extendedDetails) {
+    return extendedDetails;
+  }
+  const result = {
+    ...extendedDetails
+  };
+  const afterSqrtPrice = extendedDetails.after_sqrt_price ?? extendedDetails.afterSqrtPrice;
+  if (afterSqrtPrice != null) {
+    result.after_sqrt_price = afterSqrtPrice.toString();
+  }
+  return result;
+};
+var restituteMsafeExtendedDetails = (extendedDetails) => {
+  if (!extendedDetails) {
+    return extendedDetails;
+  }
+  const result = {
+    ...extendedDetails
+  };
+  const afterSqrtPrice = extendedDetails.after_sqrt_price ?? extendedDetails.afterSqrtPrice;
+  if (afterSqrtPrice != null) {
+    result.after_sqrt_price = new decimal_default(afterSqrtPrice.toString());
+  }
+  return result;
+};
 var dealWithFastRouterSwapParamsForMsafe = (data) => {
   const result = {
     ...data,
     amountIn: data?.amountIn?.toString(),
     amountOut: data?.amountOut?.toString(),
+    packages: dealWithMsafePackages(data?.packages),
     paths: data?.paths?.map((item) => {
       const info = {
         ...item,
         amountIn: item?.amountIn?.toString(),
-        amountOut: item?.amountOut?.toString()
+        amountOut: item?.amountOut?.toString(),
+        extendedDetails: dealWithMsafeExtendedDetails(item?.extendedDetails)
       };
       if (item?.initialPrice) {
         info["initialPrice"] = item?.initialPrice?.toString();
       }
-      if (item?.extendedDetails?.after_sqrt_price) {
-        info["extendedDetails"] = {
-          after_sqrt_price: item?.extendedDetails?.afterSqrtPrice?.toString()
-        };
-      }
       return info;
     })
   };
@@ -8436,18 +8493,15 @@ var restituteMsafeFastRouterSwapParams = (data) => {
     ...data,
     amountIn: new import_bn5.default(data?.amountIn),
     amountOut: new import_bn5.default(data?.amountOut),
+    packages: restituteMsafePackages(data?.packages),
     paths: data?.paths?.map((item) => {
       const info = {
-        ...item
+        ...item,
+        extendedDetails: restituteMsafeExtendedDetails(item?.extendedDetails)
       };
       if (item?.initialPrice) {
         info["initialPrice"] = new decimal_default(item?.initialPrice?.toString());
       }
-      if (item?.extendedDetails?.after_sqrt_price) {
-        info["extendedDetails"] = {
-          after_sqrt_price: new decimal_default(item?.extendedDetails?.after_sqrt_price?.toString())
-        };
-      }
       return info;
     })
   };
@@ -8843,7 +8897,8 @@ var MagmaPropAmmRouter = class {
   }
 };
 var HaedalPropAmmRouter = class {
-  constructor(_env) {
+  constructor(_env, pythPriceIDs) {
+    this.pythPriceIDs = pythPriceIDs;
   }
   swap(txb, flattenedPath, swapContext, _extends) {
     const path = flattenedPath.path;
@@ -8876,6 +8931,16 @@ var HaedalPropAmmRouter = class {
         "HAEDALPROPAMM quote price info object not found in extended details"
       );
     }
+    if (!extendedDetails.haedalpropamm_base_price_seed) {
+      throw new Error(
+        "HAEDALPROPAMM base price seed not found in extended details"
+      );
+    }
+    if (!extendedDetails.haedalpropamm_quote_price_seed) {
+      throw new Error(
+        "HAEDALPROPAMM quote price seed not found in extended details"
+      );
+    }
   }
   prepareSwapData(flattenedPath) {
     const path = flattenedPath.path;
@@ -8885,6 +8950,15 @@ var HaedalPropAmmRouter = class {
     const extendedDetails = path.extendedDetails;
     const [baseType, quoteType] = path.direction ? [path.from, path.target] : [path.target, path.from];
     const amountIn = flattenedPath.isLastUseOfIntermediateToken ? AGGREGATOR_V3_CONFIG.MAX_AMOUNT_IN : path.amountIn;
+    const basePriceSeed = extendedDetails.haedalpropamm_base_price_seed;
+    const quotePriceSeed = extendedDetails.haedalpropamm_quote_price_seed;
+    const basePriceInfoObject = this.pythPriceIDs.get(basePriceSeed);
+    const quotePriceInfoObject = this.pythPriceIDs.get(quotePriceSeed);
+    if (!basePriceInfoObject || !quotePriceInfoObject) {
+      throw new Error(
+        "HAEDALPROPAMM requires updated Pyth price info objects for both coins"
+      );
+    }
     return {
       baseType,
       quoteType,
@@ -8893,8 +8967,8 @@ var HaedalPropAmmRouter = class {
       publishedAt: path.publishedAt,
       poolId: extendedDetails.haedalpropamm_pool_id,
       regimeId: extendedDetails.haedalpropamm_regime_id,
-      basePriceInfoObject: extendedDetails.haedalpropamm_base_price_info_object,
-      quotePriceInfoObject: extendedDetails.haedalpropamm_quote_price_info_object
+      basePriceInfoObject,
+      quotePriceInfoObject
     };
   }
   executeSwapContract(txb, swapData, swapContext) {
@@ -9058,7 +9132,8 @@ var PYTH_ORACLE_BASED_DEXES = [
   HAEDALPMM,
   METASTABLE,
   STEAMM_OMM_V2,
-  HAEDALHMMV2
+  HAEDALHMMV2,
+  HAEDALPROPAMM
 ];
 function getAllProviders() {
   return ALL_DEXES;
@@ -9118,6 +9193,12 @@ function findPythPriceIDs(paths) {
         priceIDs.add(path.extendedDetails.haedalhmmv2_base_price_seed);
       }
     }
+    if (path.provider === HAEDALPROPAMM) {
+      if (path.extendedDetails && path.extendedDetails.haedalpropamm_base_price_seed && path.extendedDetails.haedalpropamm_quote_price_seed) {
+        priceIDs.add(path.extendedDetails.haedalpropamm_base_price_seed);
+        priceIDs.add(path.extendedDetails.haedalpropamm_quote_price_seed);
+      }
+    }
   }
   return Array.from(priceIDs);
 }
@@ -9325,7 +9406,7 @@ var _AggregatorClient = class _AggregatorClient {
       case MAGMAPROPAMM:
         return new MagmaPropAmmRouter(this.env);
       case HAEDALPROPAMM:
-        return new HaedalPropAmmRouter(this.env);
+        return new HaedalPropAmmRouter(this.env, pythPriceIDs);
       case CETUS_TIDE:
         return new CetusTideRouter();
       default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cetusprotocol/aggregator-sdk",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "type": "module",
   "sideEffects": false,
   "main": "dist/index.js",