@cetusprotocol/aggregator-sdk 0.3.12 → 0.3.14

package/dist/index.d.mts

@@ -76,6 +76,7 @@ declare const DEEPBOOKV3 = "DEEPBOOKV3";
 declare const SCALLOP = "SCALLOP";
 declare const SUILEND = "SUILEND";
 declare const BLUEFIN = "BLUEFIN";
+declare const HAEDALPMM = "HAEDALPMM";
 declare const DEFAULT_ENDPOINT = "https://api-sui.cetus.zone/router_v2";
 type BuildRouterSwapParams = {
     routers: Router[];
@@ -216,8 +217,8 @@ type Path = {
     from: string;
     target: string;
     feeRate: number;
-    amountIn: number;
-    amountOut: number;
+    amountIn: string;
+    amountOut: string;
     version?: string;
     extendedDetails?: ExtendedDetails;
 };
@@ -269,4 +270,4 @@ declare enum Env {
     Testnet = 1
 }
 
-export { AFSUI, AFTERMATH, AggregatorClient, type AggregatorResponse, BLUEFIN, BLUEMOVE, type BuildCoinResult, type BuildFastRouterSwapParams, type BuildRouterSwapParams, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, DEEPBOOKV3, DEFAULT_ENDPOINT, type DeepbookV3Config, type DeepbookV3ConfigResponse, type Dex, Env, type ExtendedDetails, FLOWXV2, FLOWXV3, type FindRouterParams, HAEDAL, KRIYA, KRIYAV3, ONE, type Path, type PreSwapLpChangeParams, type Router, type RouterData, type RouterError, SCALLOP, SUILEND, type SwapInPoolsParams, type SwapInPoolsResult, 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, AggregatorClient, type AggregatorResponse, BLUEFIN, BLUEMOVE, type BuildCoinResult, type BuildFastRouterSwapParams, type BuildRouterSwapParams, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, DEEPBOOKV3, DEFAULT_ENDPOINT, type DeepbookV3Config, type DeepbookV3ConfigResponse, type Dex, Env, type ExtendedDetails, FLOWXV2, FLOWXV3, type FindRouterParams, HAEDAL, HAEDALPMM, KRIYA, KRIYAV3, ONE, type Path, type PreSwapLpChangeParams, type Router, type RouterData, type RouterError, SCALLOP, SUILEND, type SwapInPoolsParams, type SwapInPoolsResult, 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 };

package/dist/index.d.ts

@@ -76,6 +76,7 @@ declare const DEEPBOOKV3 = "DEEPBOOKV3";
 declare const SCALLOP = "SCALLOP";
 declare const SUILEND = "SUILEND";
 declare const BLUEFIN = "BLUEFIN";
+declare const HAEDALPMM = "HAEDALPMM";
 declare const DEFAULT_ENDPOINT = "https://api-sui.cetus.zone/router_v2";
 type BuildRouterSwapParams = {
     routers: Router[];
@@ -216,8 +217,8 @@ type Path = {
     from: string;
     target: string;
     feeRate: number;
-    amountIn: number;
-    amountOut: number;
+    amountIn: string;
+    amountOut: string;
     version?: string;
     extendedDetails?: ExtendedDetails;
 };
@@ -269,4 +270,4 @@ declare enum Env {
     Testnet = 1
 }
 
-export { AFSUI, AFTERMATH, AggregatorClient, type AggregatorResponse, BLUEFIN, BLUEMOVE, type BuildCoinResult, type BuildFastRouterSwapParams, type BuildRouterSwapParams, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, DEEPBOOKV3, DEFAULT_ENDPOINT, type DeepbookV3Config, type DeepbookV3ConfigResponse, type Dex, Env, type ExtendedDetails, FLOWXV2, FLOWXV3, type FindRouterParams, HAEDAL, KRIYA, KRIYAV3, ONE, type Path, type PreSwapLpChangeParams, type Router, type RouterData, type RouterError, SCALLOP, SUILEND, type SwapInPoolsParams, type SwapInPoolsResult, 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, AggregatorClient, type AggregatorResponse, BLUEFIN, BLUEMOVE, type BuildCoinResult, type BuildFastRouterSwapParams, type BuildRouterSwapParams, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, DEEPBOOKV3, DEFAULT_ENDPOINT, type DeepbookV3Config, type DeepbookV3ConfigResponse, type Dex, Env, type ExtendedDetails, FLOWXV2, FLOWXV3, type FindRouterParams, HAEDAL, HAEDALPMM, KRIYA, KRIYAV3, ONE, type Path, type PreSwapLpChangeParams, type Router, type RouterData, type RouterError, SCALLOP, SUILEND, type SwapInPoolsParams, type SwapInPoolsResult, 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 };

package/dist/index.js

@@ -3,6 +3,7 @@
 var client = require('@mysten/sui/client');
 var utils = require('@mysten/sui/utils');
 var transactions = require('@mysten/sui/transactions');
+var pythSuiJs = require('@pythnetwork/pyth-sui-js');
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -4998,9 +4999,7 @@ var Aftermath = class {
     this.referrealVault = "0x35d35b0e5b177593d8c3a801462485572fc30861e6ce96a55af6dc4730709278";
   }
   amountLimit(exportAmountOut) {
-    return Number(
-      new import_bn.default(exportAmountOut).mul(new import_bn.default(this.slippage)).div(new import_bn.default("1000000000000000000")).toString()
-    );
+    return new import_bn.default(exportAmountOut).mul(new import_bn.default(this.slippage)).div(new import_bn.default("1000000000000000000")).toString();
   }
   swap(client, txb, path, inputCoin) {
     return __async(this, null, function* () {
@@ -5847,6 +5846,7 @@ 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),
@@ -5863,9 +5863,13 @@ function swapInPools(client, params, sender, env) {
       decimalA,
       decimalB
     );
+    const feeRate = Number(event.fee_rate) / 1e6;
+    const pureAmountIn = new import_bn4.BN((_b = event.amount_in) != null ? _b : 0);
+    const feeAmount = new import_bn4.BN((_c = event.fee_amount) != null ? _c : 0);
+    const amountIn = pureAmountIn.add(feeAmount);
     const routeData = {
-      amountIn: new import_bn4.BN((_b = event.amount_in) != null ? _b : 0),
-      amountOut: new import_bn4.BN((_c = event.amount_out) != null ? _c : 0),
+      amountIn,
+      amountOut: new import_bn4.BN((_d = event.amount_out) != null ? _d : 0),
       routes: [
         {
           path: [
@@ -5875,7 +5879,7 @@ function swapInPools(client, params, sender, env) {
               provider: "CETUS",
               from: fromCoin,
               target: targetCoin,
-              feeRate: event.fee_rate,
+              feeRate,
               amountIn: event.amount_in,
               amountOut: event.amount_out,
               extendedDetails: {
@@ -5883,7 +5887,7 @@ function swapInPools(client, params, sender, env) {
               }
             }
           ],
-          amountIn: new import_bn4.BN((_d = event.amount_in) != null ? _d : 0),
+          amountIn,
           amountOut: new import_bn4.BN((_e = event.amount_out) != null ? _e : 0),
           initialPrice
         }
@@ -6138,6 +6142,54 @@ var Bluefin = class {
     });
   }
 };
+var HaedalPmm = class {
+  constructor(env, suiClient) {
+    if (env === 1 /* Testnet */) {
+      this.connection = new pythSuiJs.SuiPriceServiceConnection("https://hermes-beta.pyth.network");
+      const wormholeStateId = "0x31358d198147da50db32eda2562951d53973a0c0ad5ed738e9b17d88b213d790";
+      const pythStateId = "0x243759059f4c3111179da5878c12f68d612c21a8d54d85edc86164bb18be1c7c";
+      this.pythClient = new pythSuiJs.SuiPythClient(suiClient, pythStateId, wormholeStateId);
+    } else {
+      this.connection = new pythSuiJs.SuiPriceServiceConnection("https://hermes.pyth.network");
+      const wormholeStateId = "0xaeab97f96cf9877fee2883315d459552b2b921edc16d7ceac6eab944dd88919c";
+      const pythStateId = "0x1f9310238ee9298fb703c3419030b35b22bb1cc37113e3bb5007c99aec79e5b8";
+      this.pythClient = new pythSuiJs.SuiPythClient(suiClient, pythStateId, wormholeStateId);
+    }
+  }
+  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];
+      let basePriceSeed;
+      let quotePriceSeed;
+      if (path.extendedDetails == null) {
+        throw new Error("Extended details not supported haedal pmm");
+      } else {
+        if (!path.extendedDetails.haedalPmmBasePriceSeed || !path.extendedDetails.haedalPmmQuotePriceSeed) {
+          throw new Error("Base price seed or quote price seed not supported");
+        }
+        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 args = [
+        txb.object(path.id),
+        txb.object(priceInfoObjectIds[0]),
+        txb.object(priceInfoObjectIds[1]),
+        inputCoin,
+        txb.object(CLOCK_ADDRESS)
+      ];
+      const res = txb.moveCall({
+        target: `${client.publishedAtV2()}::haedalpmm::${func}`,
+        typeArguments: [coinAType, coinBType],
+        arguments: args
+      });
+      return res;
+    });
+  }
+};
 
 // src/client.ts
 var CETUS = "CETUS";
@@ -6156,8 +6208,9 @@ var DEEPBOOKV3 = "DEEPBOOKV3";
 var SCALLOP = "SCALLOP";
 var SUILEND = "SUILEND";
 var BLUEFIN = "BLUEFIN";
+var HAEDALPMM = "HAEDALPMM";
 var DEFAULT_ENDPOINT = "https://api-sui.cetus.zone/router_v2";
-var AggregatorClient9 = class {
+var AggregatorClient10 = class {
   constructor(endpoint, signer, client$1, env) {
     this.endpoint = endpoint ? processEndpoint(endpoint) : DEFAULT_ENDPOINT;
     this.client = client$1 || new client.SuiClient({ url: client.getFullnodeUrl("mainnet") });
@@ -6434,7 +6487,7 @@ var AggregatorClient9 = class {
   // Include deepbookv3, scallop, bluefin
   publishedAtV2() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x81ade554cb24a7564ca43a4bfb7381b08d9e5c5f375162c95215b696ab903502";
+      return "0x347dd58bbd11cd82c8b386b344729717c04a998da73386e82a239cc196d5706b";
     } else {
       return "0xabb6a81c8a216828e317719e06125de5bb2cb0fe8f9916ff8c023ca5be224c78";
     }
@@ -6505,6 +6558,8 @@ var AggregatorClient9 = class {
         return new Suilend(this.env);
       case BLUEFIN:
         return new Bluefin(this.env);
+      case HAEDALPMM:
+        return new HaedalPmm(this.env, this.client);
       default:
         throw new Error(`Unsupported dex ${provider}`);
     }
@@ -6574,7 +6629,7 @@ function parseRouterResponse(data) {
             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 || path.provider === SCALLOP) {
+          if (path.provider === TURBOS || path.provider === AFTERMATH || path.provider === CETUS || path.provider === DEEPBOOKV3 || path.provider === SCALLOP || path.provider === HAEDALPMM) {
             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,
@@ -6816,7 +6871,7 @@ decimal.js/decimal.mjs:
 
 exports.AFSUI = AFSUI;
 exports.AFTERMATH = AFTERMATH;
-exports.AggregatorClient = AggregatorClient9;
+exports.AggregatorClient = AggregatorClient10;
 exports.BLUEFIN = BLUEFIN;
 exports.BLUEMOVE = BLUEMOVE;
 exports.CETUS = CETUS;
@@ -6828,6 +6883,7 @@ exports.Env = Env;
 exports.FLOWXV2 = FLOWXV2;
 exports.FLOWXV3 = FLOWXV3;
 exports.HAEDAL = HAEDAL;
+exports.HAEDALPMM = HAEDALPMM;
 exports.KRIYA = KRIYA;
 exports.KRIYAV3 = KRIYAV3;
 exports.ONE = ONE;

package/dist/index.mjs

@@ -1,6 +1,7 @@
 import { SuiClient, getFullnodeUrl } from '@mysten/sui/client';
 import { normalizeSuiObjectId, SUI_FRAMEWORK_ADDRESS } from '@mysten/sui/utils';
 import { Transaction } from '@mysten/sui/transactions';
+import { SuiPriceServiceConnection, SuiPythClient } from '@pythnetwork/pyth-sui-js';
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -4996,9 +4997,7 @@ var Aftermath = class {
     this.referrealVault = "0x35d35b0e5b177593d8c3a801462485572fc30861e6ce96a55af6dc4730709278";
   }
   amountLimit(exportAmountOut) {
-    return Number(
-      new import_bn.default(exportAmountOut).mul(new import_bn.default(this.slippage)).div(new import_bn.default("1000000000000000000")).toString()
-    );
+    return new import_bn.default(exportAmountOut).mul(new import_bn.default(this.slippage)).div(new import_bn.default("1000000000000000000")).toString();
   }
   swap(client, txb, path, inputCoin) {
     return __async(this, null, function* () {
@@ -5845,6 +5844,7 @@ 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),
@@ -5861,9 +5861,13 @@ function swapInPools(client, params, sender, env) {
       decimalA,
       decimalB
     );
+    const feeRate = Number(event.fee_rate) / 1e6;
+    const pureAmountIn = new import_bn4.BN((_b = event.amount_in) != null ? _b : 0);
+    const feeAmount = new import_bn4.BN((_c = event.fee_amount) != null ? _c : 0);
+    const amountIn = pureAmountIn.add(feeAmount);
     const routeData = {
-      amountIn: new import_bn4.BN((_b = event.amount_in) != null ? _b : 0),
-      amountOut: new import_bn4.BN((_c = event.amount_out) != null ? _c : 0),
+      amountIn,
+      amountOut: new import_bn4.BN((_d = event.amount_out) != null ? _d : 0),
       routes: [
         {
           path: [
@@ -5873,7 +5877,7 @@ function swapInPools(client, params, sender, env) {
               provider: "CETUS",
               from: fromCoin,
               target: targetCoin,
-              feeRate: event.fee_rate,
+              feeRate,
               amountIn: event.amount_in,
               amountOut: event.amount_out,
               extendedDetails: {
@@ -5881,7 +5885,7 @@ function swapInPools(client, params, sender, env) {
               }
             }
           ],
-          amountIn: new import_bn4.BN((_d = event.amount_in) != null ? _d : 0),
+          amountIn,
           amountOut: new import_bn4.BN((_e = event.amount_out) != null ? _e : 0),
           initialPrice
         }
@@ -6136,6 +6140,54 @@ var Bluefin = class {
     });
   }
 };
+var HaedalPmm = class {
+  constructor(env, suiClient) {
+    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);
+    }
+  }
+  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];
+      let basePriceSeed;
+      let quotePriceSeed;
+      if (path.extendedDetails == null) {
+        throw new Error("Extended details not supported haedal pmm");
+      } else {
+        if (!path.extendedDetails.haedalPmmBasePriceSeed || !path.extendedDetails.haedalPmmQuotePriceSeed) {
+          throw new Error("Base price seed or quote price seed not supported");
+        }
+        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 args = [
+        txb.object(path.id),
+        txb.object(priceInfoObjectIds[0]),
+        txb.object(priceInfoObjectIds[1]),
+        inputCoin,
+        txb.object(CLOCK_ADDRESS)
+      ];
+      const res = txb.moveCall({
+        target: `${client.publishedAtV2()}::haedalpmm::${func}`,
+        typeArguments: [coinAType, coinBType],
+        arguments: args
+      });
+      return res;
+    });
+  }
+};
 
 // src/client.ts
 var CETUS = "CETUS";
@@ -6154,8 +6206,9 @@ var DEEPBOOKV3 = "DEEPBOOKV3";
 var SCALLOP = "SCALLOP";
 var SUILEND = "SUILEND";
 var BLUEFIN = "BLUEFIN";
+var HAEDALPMM = "HAEDALPMM";
 var DEFAULT_ENDPOINT = "https://api-sui.cetus.zone/router_v2";
-var AggregatorClient9 = class {
+var AggregatorClient10 = class {
   constructor(endpoint, signer, client, env) {
     this.endpoint = endpoint ? processEndpoint(endpoint) : DEFAULT_ENDPOINT;
     this.client = client || new SuiClient({ url: getFullnodeUrl("mainnet") });
@@ -6432,7 +6485,7 @@ var AggregatorClient9 = class {
   // Include deepbookv3, scallop, bluefin
   publishedAtV2() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x81ade554cb24a7564ca43a4bfb7381b08d9e5c5f375162c95215b696ab903502";
+      return "0x347dd58bbd11cd82c8b386b344729717c04a998da73386e82a239cc196d5706b";
     } else {
       return "0xabb6a81c8a216828e317719e06125de5bb2cb0fe8f9916ff8c023ca5be224c78";
     }
@@ -6503,6 +6556,8 @@ var AggregatorClient9 = class {
         return new Suilend(this.env);
       case BLUEFIN:
         return new Bluefin(this.env);
+      case HAEDALPMM:
+        return new HaedalPmm(this.env, this.client);
       default:
         throw new Error(`Unsupported dex ${provider}`);
     }
@@ -6572,7 +6627,7 @@ function parseRouterResponse(data) {
             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 || path.provider === SCALLOP) {
+          if (path.provider === TURBOS || path.provider === AFTERMATH || path.provider === CETUS || path.provider === DEEPBOOKV3 || path.provider === SCALLOP || path.provider === HAEDALPMM) {
             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,
@@ -6812,4 +6867,4 @@ decimal.js/decimal.mjs:
    *)
 */
 
-export { AFSUI, AFTERMATH, AggregatorClient9 as AggregatorClient, BLUEFIN, BLUEMOVE, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, DEEPBOOKV3, DEFAULT_ENDPOINT, Env, FLOWXV2, FLOWXV3, HAEDAL, KRIYA, KRIYAV3, ONE, SCALLOP, SUILEND, 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, AggregatorClient10 as AggregatorClient, BLUEFIN, BLUEMOVE, CETUS, CLOCK_ADDRESS, DEEPBOOKV2, DEEPBOOKV3, DEFAULT_ENDPOINT, Env, FLOWXV2, FLOWXV3, HAEDAL, HAEDALPMM, KRIYA, KRIYAV3, ONE, SCALLOP, SUILEND, 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 };

package/dist/src/api.d.ts

@@ -35,8 +35,8 @@ export type Path = {
     from: string;
     target: string;
     feeRate: number;
-    amountIn: number;
-    amountOut: number;
+    amountIn: string;
+    amountOut: string;
     version?: string;
     extendedDetails?: ExtendedDetails;
 };

package/dist/src/client.d.ts

@@ -20,6 +20,7 @@ export declare const DEEPBOOKV3 = "DEEPBOOKV3";
 export declare const SCALLOP = "SCALLOP";
 export declare const SUILEND = "SUILEND";
 export declare const BLUEFIN = "BLUEFIN";
+export declare const HAEDALPMM = "HAEDALPMM";
 export declare const DEFAULT_ENDPOINT = "https://api-sui.cetus.zone/router_v2";
 export type BuildRouterSwapParams = {
     routers: Router[];

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

@@ -8,6 +8,6 @@ export declare class Aftermath implements Dex {
     private insuranceFund;
     private referrealVault;
     constructor(env: Env);
-    amountLimit(exportAmountOut: number): number;
+    amountLimit(exportAmountOut: string): string;
     swap(client: AggregatorClient, txb: Transaction, path: Path, inputCoin: TransactionObjectArgument): Promise<TransactionObjectArgument>;
 }

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

@@ -0,0 +1,9 @@
+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);
+    swap(client: AggregatorClient, txb: Transaction, path: Path, inputCoin: TransactionObjectArgument): Promise<TransactionObjectArgument>;
+}

package/package.json

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

package/src/api.ts

@@ -46,8 +46,8 @@ export type Path = {
   from: string
   target: string
   feeRate: number
-  amountIn: number
-  amountOut: number
+  amountIn: string
+  amountOut: string
   version?: string
   extendedDetails?: ExtendedDetails
 }

package/src/client.ts

@@ -39,6 +39,8 @@ import { DeepbookV3 } from "./transaction/deepbook_v3"
 import { Scallop } from "./transaction/scallop"
 import { Suilend } from "./transaction/suilend"
 import { Bluefin } from "./transaction/bluefin"
+import { HaedalPmm } from "./transaction/haedal_pmm"
+
 
 export const CETUS = "CETUS"
 export const DEEPBOOKV2 = "DEEPBOOK"
@@ -56,6 +58,7 @@ export const DEEPBOOKV3 = "DEEPBOOKV3"
 export const SCALLOP = "SCALLOP"
 export const SUILEND = "SUILEND"
 export const BLUEFIN = "BLUEFIN"
+export const HAEDALPMM = "HAEDALPMM"
 export const DEFAULT_ENDPOINT = "https://api-sui.cetus.zone/router_v2"
 
 export type BuildRouterSwapParams = {
@@ -417,7 +420,9 @@ export class AggregatorClient {
       // return "0x6d70ffa7aa3f924c3f0b573d27d29895a0ee666aaff821073f75cb14af7fd01a" // version 3, deepbookv3 & scallop
       // return "0x16d9418726c26d8cb4ce8c9dd75917fa9b1c7bf47d38d7a1a22603135f0f2a56" // version 4, add suilend
       // return "0x3b6d71bdeb8ce5b06febfd3cfc29ecd60d50da729477c8b8038ecdae34541b91" // version 5, add bluefin
-      return "0x81ade554cb24a7564ca43a4bfb7381b08d9e5c5f375162c95215b696ab903502"    // version 6, force upgrade scallop
+      // return "0x81ade554cb24a7564ca43a4bfb7381b08d9e5c5f375162c95215b696ab903502" // version 6, force upgrade scallop
+      return "0x347dd58bbd11cd82c8b386b344729717c04a998da73386e82a239cc196d5706b"
+      // return "0x20d4f23a1d119c6887cea9b036035e57ae90b4cb3d7a0acb94dfed72a9095fb7"    // pre
     } else {
       return "0xabb6a81c8a216828e317719e06125de5bb2cb0fe8f9916ff8c023ca5be224c78"
     }
@@ -502,6 +507,8 @@ export class AggregatorClient {
         return new Suilend(this.env)
       case BLUEFIN:
         return new Bluefin(this.env)
+      case HAEDALPMM:
+        return new HaedalPmm(this.env, this.client)
       default:
         throw new Error(`Unsupported dex ${provider}`)
     }
@@ -576,7 +583,8 @@ export function parseRouterResponse(data: any): RouterData {
             path.provider === AFTERMATH ||
             path.provider === CETUS ||
             path.provider === DEEPBOOKV3 ||
-            path.provider === SCALLOP
+            path.provider === SCALLOP || 
+            path.provider === HAEDALPMM
           ) {
             extendedDetails = {
               aftermathLpSupplyType:

package/src/transaction/aftermath.ts

@@ -31,13 +31,11 @@ export class Aftermath implements Dex {
       "0x35d35b0e5b177593d8c3a801462485572fc30861e6ce96a55af6dc4730709278"
   }
 
-  amountLimit(exportAmountOut: number): number {
-    return Number(
-      new BN(exportAmountOut)
-        .mul(new BN(this.slippage))
-        .div(new BN("1000000000000000000"))
-        .toString()
-    )
+  amountLimit(exportAmountOut: string): string {
+    return new BN(exportAmountOut)
+      .mul(new BN(this.slippage))
+      .div(new BN("1000000000000000000"))
+      .toString()
   }
 
   async swap(

package/src/transaction/haedal_pmm.ts

@@ -0,0 +1,69 @@
+import {
+  Transaction,
+  TransactionArgument,
+  TransactionObjectArgument,
+} from "@mysten/sui/transactions"
+import { AggregatorClient, CLOCK_ADDRESS, Dex, Env, Path } from ".."
+import { SuiPriceServiceConnection, SuiPythClient } from "@pythnetwork/pyth-sui-js"
+import { SuiClient } from "@mysten/sui/client"
+
+export class HaedalPmm implements Dex {
+  private connection: SuiPriceServiceConnection
+  private pythClient: SuiPythClient
+  
+  constructor(env: Env, suiClient: SuiClient) {
+    if (env === Env.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)
+    }
+  }
+
+  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]
+    
+    let basePriceSeed: string
+    let quotePriceSeed: string
+
+    if (path.extendedDetails == null) {
+      throw new Error("Extended details not supported haedal pmm")
+    } else {
+      if (!path.extendedDetails.haedalPmmBasePriceSeed || !path.extendedDetails.haedalPmmQuotePriceSeed) {
+        throw new Error("Base price seed or quote price seed not supported")
+      }
+      basePriceSeed = path.extendedDetails.haedalPmmBasePriceSeed
+      quotePriceSeed = path.extendedDetails.haedalPmmQuotePriceSeed
+    }
+
+    const priceIDs = [basePriceSeed, quotePriceSeed]
+    const priceUpdateData = await this.connection.getPriceFeedsUpdateData(priceIDs);
+    const priceInfoObjectIds = await this.pythClient.updatePriceFeeds(txb, priceUpdateData, priceIDs);
+    const args = [
+      txb.object(path.id),
+      txb.object(priceInfoObjectIds[0]),
+      txb.object(priceInfoObjectIds[1]),
+      inputCoin,
+      txb.object(CLOCK_ADDRESS),
+    ]
+    const res = txb.moveCall({
+      target: `${client.publishedAtV2()}::haedalpmm::${func}`,
+      typeArguments: [coinAType, coinBType],
+      arguments: args,
+    }) as TransactionArgument
+    return res
+  }
+}

package/src/transaction/swap.ts

@@ -99,6 +99,8 @@ export async function swapInPools(
 
   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] = await Promise.all([
@@ -122,8 +124,13 @@ export async function swapInPools(
     decimalB!
   )
 
+  const feeRate = Number(event.fee_rate) / 1000000
+  const pureAmountIn = new BN(event.amount_in ?? 0)
+  const feeAmount = new BN(event.fee_amount ?? 0)
+  const amountIn = pureAmountIn.add(feeAmount)
+
   const routeData = {
-    amountIn: new BN(event.amount_in ?? 0),
+    amountIn: amountIn,
     amountOut: new BN(event.amount_out ?? 0),
     routes: [
       {
@@ -134,7 +141,7 @@ export async function swapInPools(
             provider: "CETUS",
             from: fromCoin,
             target: targetCoin,
-            feeRate: event.fee_rate,
+            feeRate,
             amountIn: event.amount_in,
             amountOut: event.amount_out,
             extendedDetails: {
@@ -142,7 +149,7 @@ export async function swapInPools(
             },
           },
         ],
-        amountIn: new BN(event.amount_in ?? 0),
+        amountIn: amountIn,
         amountOut: new BN(event.amount_out ?? 0),
         initialPrice,
       },

package/tests/router.test.ts

@@ -33,8 +33,9 @@ describe("router module", () => {
       keypair = buildTestAccount()
     }
 
-    const wallet = keypair.getPublicKey().toSuiAddress()
-    console.log("wallet: ", wallet)
+    // const wallet = keypair.getPublicKey().toSuiAddress()
+    // console.log("wallet: ", wallet)
+    const wallet = "0x326ce9894f08dcaa337fa232641cc34db957aec9ff6614c1186bc9a7508df0bb"
 
     const endpoint = aggregatorURL
 
@@ -56,8 +57,8 @@ describe("router module", () => {
     const byAmountIn = true
 
     const res: any = await client.swapInPools({
-      from: testData.M_USDC,
-      target: testData.M_SUI,
+      from: testData.M_SUI,
+      target: testData.M_USDC,
       amount: new BN(amount),
       byAmountIn,
       pools: [
@@ -65,10 +66,12 @@ describe("router module", () => {
       ],
     })
 
-    console.log("res", res)
-
     if (res != null) {
       console.log(JSON.stringify(res, null, 2))
+
+      console.log("amount in", res.routeData.amountIn.toString())
+      console.log("amount out", res.routeData.amountOut.toString())
+
       const txb = new Transaction()
       await client.fastRouterSwap({
         routers: res.routeData.routes,
@@ -108,7 +111,7 @@ describe("router module", () => {
   test("Build router tx", async () => {
     const byAmountIn = true
     const amount = "3574839"
-    const target = "0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI"
+    const target = "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC"
     const from = "0x2::sui::SUI"
 
     const res = await client.findRouters({
@@ -117,7 +120,7 @@ describe("router module", () => {
       amount: new BN(amount),
       byAmountIn,
       depth: 3,
-      providers: ["SCALLOP"],
+      providers: ["HAEDALPMM"],
     })
 
     if (res != null) {