@cetusprotocol/aggregator-sdk 0.3.11 → 0.3.13

package/dist/index.d.mts

@@ -206,6 +206,8 @@ type ExtendedDetails = {
     afterSqrtPrice?: string;
     deepbookv3DeepFee?: number;
     scallopScoinTreasury?: string;
+    haedalPmmBasePriceSeed?: string;
+    haedalPmmQuotePriceSeed?: string;
 };
 type Path = {
     id: string;
@@ -214,10 +216,10 @@ type Path = {
     from: string;
     target: string;
     feeRate: number;
-    amountIn: number;
-    amountOut: number;
-    extendedDetails?: ExtendedDetails;
+    amountIn: string;
+    amountOut: string;
     version?: string;
+    extendedDetails?: ExtendedDetails;
 };
 type Router = {
     path: Path[];

package/dist/index.d.ts

@@ -206,6 +206,8 @@ type ExtendedDetails = {
     afterSqrtPrice?: string;
     deepbookv3DeepFee?: number;
     scallopScoinTreasury?: string;
+    haedalPmmBasePriceSeed?: string;
+    haedalPmmQuotePriceSeed?: string;
 };
 type Path = {
     id: string;
@@ -214,10 +216,10 @@ type Path = {
     from: string;
     target: string;
     feeRate: number;
-    amountIn: number;
-    amountOut: number;
-    extendedDetails?: ExtendedDetails;
+    amountIn: string;
+    amountOut: string;
     version?: string;
+    extendedDetails?: ExtendedDetails;
 };
 type Router = {
     path: Path[];

package/dist/index.js

@@ -4998,9 +4998,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 +5845,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 +5862,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 +5878,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 +5886,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
         }
@@ -6434,9 +6437,9 @@ var AggregatorClient9 = class {
   // Include deepbookv3, scallop, bluefin
   publishedAtV2() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x3b6d71bdeb8ce5b06febfd3cfc29ecd60d50da729477c8b8038ecdae34541b91";
+      return "0x81ade554cb24a7564ca43a4bfb7381b08d9e5c5f375162c95215b696ab903502";
     } else {
-      return "0xfd8a73ef0a4b928da9c27fc287dc37c1ca64df71da8e8eac7ca9ece55eb5f448";
+      return "0xabb6a81c8a216828e317719e06125de5bb2cb0fe8f9916ff8c023ca5be224c78";
     }
   }
   deepbookv3DeepFeeType() {
@@ -6568,7 +6571,7 @@ function parseRouterResponse(data) {
     routes: data.routes.map((route) => {
       return {
         path: route.path.map((path) => {
-          var _a, _b, _c, _d, _e;
+          var _a, _b, _c, _d, _e, _f, _g;
           let version;
           if (path.provider === AFTERMATH) {
             version = path.extended_details.aftermath_pool_flatness === 0 ? "v2" : "v3";
@@ -6580,7 +6583,9 @@ function parseRouterResponse(data) {
               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,
-              scallopScoinTreasury: (_e = path.extended_details) == null ? void 0 : _e.scallop_scoin_treasury
+              scallopScoinTreasury: (_e = path.extended_details) == null ? void 0 : _e.scallop_scoin_treasury,
+              haedalPmmBasePriceSeed: (_f = path.extended_details) == null ? void 0 : _f.haedal_pmm_base_price_seed,
+              haedalPmmQuotePriceSeed: (_g = path.extended_details) == null ? void 0 : _g.haedal_pmm_quote_price_seed
             };
           }
           return {
@@ -6722,7 +6727,7 @@ function getRouter(endpoint, params) {
           url += `&providers=${providers.join(",")}`;
         }
       }
-      url += "&v=1000309";
+      url += "&v=1000312";
       const response = yield fetch(url);
       return response;
     } catch (error) {

package/dist/index.mjs

@@ -4996,9 +4996,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 +5843,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 +5860,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 +5876,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 +5884,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
         }
@@ -6432,9 +6435,9 @@ var AggregatorClient9 = class {
   // Include deepbookv3, scallop, bluefin
   publishedAtV2() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x3b6d71bdeb8ce5b06febfd3cfc29ecd60d50da729477c8b8038ecdae34541b91";
+      return "0x81ade554cb24a7564ca43a4bfb7381b08d9e5c5f375162c95215b696ab903502";
     } else {
-      return "0xfd8a73ef0a4b928da9c27fc287dc37c1ca64df71da8e8eac7ca9ece55eb5f448";
+      return "0xabb6a81c8a216828e317719e06125de5bb2cb0fe8f9916ff8c023ca5be224c78";
     }
   }
   deepbookv3DeepFeeType() {
@@ -6566,7 +6569,7 @@ function parseRouterResponse(data) {
     routes: data.routes.map((route) => {
       return {
         path: route.path.map((path) => {
-          var _a, _b, _c, _d, _e;
+          var _a, _b, _c, _d, _e, _f, _g;
           let version;
           if (path.provider === AFTERMATH) {
             version = path.extended_details.aftermath_pool_flatness === 0 ? "v2" : "v3";
@@ -6578,7 +6581,9 @@ function parseRouterResponse(data) {
               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,
-              scallopScoinTreasury: (_e = path.extended_details) == null ? void 0 : _e.scallop_scoin_treasury
+              scallopScoinTreasury: (_e = path.extended_details) == null ? void 0 : _e.scallop_scoin_treasury,
+              haedalPmmBasePriceSeed: (_f = path.extended_details) == null ? void 0 : _f.haedal_pmm_base_price_seed,
+              haedalPmmQuotePriceSeed: (_g = path.extended_details) == null ? void 0 : _g.haedal_pmm_quote_price_seed
             };
           }
           return {
@@ -6720,7 +6725,7 @@ function getRouter(endpoint, params) {
           url += `&providers=${providers.join(",")}`;
         }
       }
-      url += "&v=1000309";
+      url += "&v=1000312";
       const response = yield fetch(url);
       return response;
     } catch (error) {

package/dist/src/api.d.ts

@@ -25,6 +25,8 @@ export type ExtendedDetails = {
     afterSqrtPrice?: string;
     deepbookv3DeepFee?: number;
     scallopScoinTreasury?: string;
+    haedalPmmBasePriceSeed?: string;
+    haedalPmmQuotePriceSeed?: string;
 };
 export type Path = {
     id: string;
@@ -33,10 +35,10 @@ export type Path = {
     from: string;
     target: string;
     feeRate: number;
-    amountIn: number;
-    amountOut: number;
-    extendedDetails?: ExtendedDetails;
+    amountIn: string;
+    amountOut: string;
     version?: string;
+    extendedDetails?: ExtendedDetails;
 };
 export type Router = {
     path: Path[];

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

@@ -1,6 +1,6 @@
 {
   "name": "@cetusprotocol/aggregator-sdk",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "sideEffects": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,6 +28,7 @@
     "@babel/preset-typescript": "^7.24.1",
     "@jest/globals": "^29.7.0",
     "@mysten/sui": "^1.6.0",
+    "@pythnetwork/pyth-sui-js": "^2.1.0",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
     "babel-jest": "^29.7.0",

package/src/api.ts

@@ -35,6 +35,8 @@ export type ExtendedDetails = {
   afterSqrtPrice?: string
   deepbookv3DeepFee?: number
   scallopScoinTreasury?: string
+  haedalPmmBasePriceSeed?: string
+  haedalPmmQuotePriceSeed?: string
 }
 
 export type Path = {
@@ -44,10 +46,10 @@ export type Path = {
   from: string
   target: string
   feeRate: number
-  amountIn: number
-  amountOut: number
-  extendedDetails?: ExtendedDetails
+  amountIn: string
+  amountOut: string
   version?: string
+  extendedDetails?: ExtendedDetails
 }
 
 export type Router = {
@@ -168,7 +170,7 @@ async function getRouter(endpoint: string, params: FindRouterParams) {
     }
 
     // set newest sdk version
-    url += "&v=1000309"
+    url += "&v=1000312"
 
     const response = await fetch(url)
     return response

package/src/client.ts

@@ -416,9 +416,10 @@ export class AggregatorClient {
       // return "0x43811be4677f5a5de7bf2dac740c10abddfaa524aee6b18e910eeadda8a2f6ae" // version 1, deepbookv3
       // return "0x6d70ffa7aa3f924c3f0b573d27d29895a0ee666aaff821073f75cb14af7fd01a" // version 3, deepbookv3 & scallop
       // return "0x16d9418726c26d8cb4ce8c9dd75917fa9b1c7bf47d38d7a1a22603135f0f2a56" // version 4, add suilend
-      return "0x3b6d71bdeb8ce5b06febfd3cfc29ecd60d50da729477c8b8038ecdae34541b91"    // version 5, add bluefin
+      // return "0x3b6d71bdeb8ce5b06febfd3cfc29ecd60d50da729477c8b8038ecdae34541b91" // version 5, add bluefin
+      return "0x81ade554cb24a7564ca43a4bfb7381b08d9e5c5f375162c95215b696ab903502"    // version 6, force upgrade scallop
     } else {
-      return "0xfd8a73ef0a4b928da9c27fc287dc37c1ca64df71da8e8eac7ca9ece55eb5f448"
+      return "0xabb6a81c8a216828e317719e06125de5bb2cb0fe8f9916ff8c023ca5be224c78"
     }
   }
 
@@ -585,6 +586,8 @@ export function parseRouterResponse(data: any): RouterData {
               deepbookv3DeepFee: path.extended_details?.deepbookv3_deep_fee,
               scallopScoinTreasury:
                 path.extended_details?.scallop_scoin_treasury,
+              haedalPmmBasePriceSeed: path.extended_details?.haedal_pmm_base_price_seed,
+              haedalPmmQuotePriceSeed: path.extended_details?.haedal_pmm_quote_price_seed,
             }
           }
 

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/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,19 +33,15 @@ 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 =
-    // //   "https://api-sui-cloudfront.cetus.zone/router_v2/find_routes"
     const endpoint = aggregatorURL
 
     const suiClient = new SuiClient({
       url: fullNodeURL,
     })
-    // const suiClient = new SuiClient({
-    //   url: "https://fullnode.testnet.sui.io:443",
-    // })
 
     client = new AggregatorClient(endpoint, wallet, suiClient, Env.Mainnet)
   })
@@ -61,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: [
@@ -70,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,
@@ -112,9 +110,9 @@ describe("router module", () => {
 
   test("Build router tx", async () => {
     const byAmountIn = true
-    const amount = "1000000000"
+    const amount = "3574839"
+    const target = "0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI"
     const from = "0x2::sui::SUI"
-    const target = "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN"
 
     const res = await client.findRouters({
       from,
@@ -122,7 +120,7 @@ describe("router module", () => {
       amount: new BN(amount),
       byAmountIn,
       depth: 3,
-      providers: ["BLUEFIN"],
+      providers: ["SCALLOP"],
     })
 
     if (res != null) {
@@ -154,7 +152,6 @@ describe("router module", () => {
       for (const event of result.events) {
         console.log("event", JSON.stringify(event, null, 2))
       }
-      console.log("txb", )
 
       // if (result.effects.status.status === "success") {
       //   // console.log("Sim exec transaction success")