@cetusprotocol/aggregator-sdk 0.3.9 → 0.3.10

package/dist/index.js

@@ -5758,6 +5758,15 @@ function CalculateAmountLimit(expectAmount, byAmountIn, slippage) {
   }
   return Number(amountLimit.toString());
 }
+function CalculateAmountLimitBN(expectAmount, byAmountIn, slippage) {
+  let amountLimit = ZERO;
+  if (byAmountIn) {
+    amountLimit = expectAmount.mul(new import_bn3.default(TEN_POW_NINE - slippage * TEN_POW_NINE)).div(new import_bn3.default(TEN_POW_NINE));
+  } else {
+    amountLimit = expectAmount.mul(new import_bn3.default(TEN_POW_NINE + slippage * TEN_POW_NINE)).div(new import_bn3.default(TEN_POW_NINE));
+  }
+  return amountLimit;
+}
 function sqrtPriceX64ToPrice(sqrtPriceStr, decimalsA, decimalsB) {
   const sqrtPriceX64 = new decimal_default(sqrtPriceStr).mul(decimal_default.pow(2, -64));
   return sqrtPriceX64.pow(2).mul(decimal_default.pow(10, decimalsA - decimalsB));
@@ -6279,7 +6288,7 @@ var AggregatorClient8 = class {
         (acc, router) => acc.add(router.amountOut),
         new import_bn5.default(0)
       );
-      const amountLimit = CalculateAmountLimit(
+      const amountLimit = CalculateAmountLimitBN(
         byAmountIn ? amountOut : amountIn,
         byAmountIn,
         slippage
@@ -6289,7 +6298,7 @@ var AggregatorClient8 = class {
           txb,
           inputCoin,
           routers,
-          new import_bn5.default(amountLimit),
+          amountLimit,
           partner,
           deepbookv3DeepFee
         );

package/dist/index.mjs

@@ -5756,6 +5756,15 @@ function CalculateAmountLimit(expectAmount, byAmountIn, slippage) {
   }
   return Number(amountLimit.toString());
 }
+function CalculateAmountLimitBN(expectAmount, byAmountIn, slippage) {
+  let amountLimit = ZERO;
+  if (byAmountIn) {
+    amountLimit = expectAmount.mul(new import_bn3.default(TEN_POW_NINE - slippage * TEN_POW_NINE)).div(new import_bn3.default(TEN_POW_NINE));
+  } else {
+    amountLimit = expectAmount.mul(new import_bn3.default(TEN_POW_NINE + slippage * TEN_POW_NINE)).div(new import_bn3.default(TEN_POW_NINE));
+  }
+  return amountLimit;
+}
 function sqrtPriceX64ToPrice(sqrtPriceStr, decimalsA, decimalsB) {
   const sqrtPriceX64 = new decimal_default(sqrtPriceStr).mul(decimal_default.pow(2, -64));
   return sqrtPriceX64.pow(2).mul(decimal_default.pow(10, decimalsA - decimalsB));
@@ -6277,7 +6286,7 @@ var AggregatorClient8 = class {
         (acc, router) => acc.add(router.amountOut),
         new import_bn5.default(0)
       );
-      const amountLimit = CalculateAmountLimit(
+      const amountLimit = CalculateAmountLimitBN(
         byAmountIn ? amountOut : amountIn,
         byAmountIn,
         slippage
@@ -6287,7 +6296,7 @@ var AggregatorClient8 = class {
           txb,
           inputCoin,
           routers,
-          new import_bn5.default(amountLimit),
+          amountLimit,
           partner,
           deepbookv3DeepFee
         );

package/dist/src/math.d.ts

@@ -1,5 +1,6 @@
 import BN from "bn.js";
 import Decimal from "decimal.js";
 export declare function CalculateAmountLimit(expectAmount: BN, byAmountIn: boolean, slippage: number): number;
+export declare function CalculateAmountLimitBN(expectAmount: BN, byAmountIn: boolean, slippage: number): BN;
 export declare function GetDefaultSqrtPriceLimit(a2b: boolean): BN;
 export declare function sqrtPriceX64ToPrice(sqrtPriceStr: string, decimalsA: number, decimalsB: number): Decimal;

package/package.json

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

package/src/client.ts

@@ -28,7 +28,7 @@ import { FlowxV3 } from "./transaction/flowx_v3"
 import { Turbos } from "./transaction/turbos"
 import { Cetus } from "./transaction/cetus"
 import { swapInPools } from "./transaction/swap"
-import { CalculateAmountLimit } from "./math"
+import { CalculateAmountLimit, CalculateAmountLimitBN } from "./math"
 import { Haedal } from "./transaction/haedal"
 import { Afsui } from "./transaction/afsui"
 import { Volo } from "./transaction/volo"
@@ -284,7 +284,7 @@ export class AggregatorClient {
       (acc, router) => acc.add(router.amountOut),
       new BN(0)
     )
-    const amountLimit = CalculateAmountLimit(
+    const amountLimit = CalculateAmountLimitBN(
       byAmountIn ? amountOut : amountIn,
       byAmountIn,
       slippage
@@ -295,7 +295,7 @@ export class AggregatorClient {
         txb,
         inputCoin,
         routers,
-        new BN(amountLimit),
+        amountLimit,
         partner,
         deepbookv3DeepFee
       )

package/src/math.ts

@@ -26,6 +26,25 @@ export function CalculateAmountLimit(
   return Number(amountLimit.toString())
 }
 
+export function CalculateAmountLimitBN(
+  expectAmount: BN,
+  byAmountIn: boolean,
+  slippage: number
+): BN {
+  let amountLimit = ZERO
+  if (byAmountIn) {
+    amountLimit = expectAmount
+      .mul(new BN(TEN_POW_NINE - slippage * TEN_POW_NINE))
+      .div(new BN(TEN_POW_NINE))
+  } else {
+    amountLimit = expectAmount
+      .mul(new BN(TEN_POW_NINE + slippage * TEN_POW_NINE))
+      .div(new BN(TEN_POW_NINE))
+  }
+
+  return amountLimit
+}
+
 const MAX_SQER_PRICE_X64 = "79226673515401279992447579055"
 const MIN_SQER_PRICE_X64 = "4295048016"
 

package/tests/router.test.ts

@@ -112,9 +112,9 @@ describe("router module", () => {
 
   test("Build router tx", async () => {
     const byAmountIn = true
-    const amount = "320000"
+    const amount = "400000000000"
     const from = "0x2::sui::SUI"
-    const target = "0x83556891f4a0f233ce7b05cfe7f957d4020492a34f5405b2cb9377d060bef4bf::spring_sui::SPRING_SUI"
+    const target = "0xaf3aae4940a248739ce4964857381fc3f3149a6d05375bfbb2118592907e3bbb::dam::DAM"
 
     const res = await client.findRouters({
       from,
@@ -122,17 +122,6 @@ describe("router module", () => {
       amount: new BN(amount),
       byAmountIn,
       depth: 3,
-      providers: [
-        "SUILEND",
-        // "CETUS",
-        // "DEEPBOOKV3",
-        // "DEEPBOOK",
-        // "AFTERMATH",
-        // "FLOWX",
-        // "KRIYA",
-        // "KRIYAV3",
-        // "TURBOS",
-      ],
     })
 
     if (res != null) {
@@ -152,7 +141,7 @@ describe("router module", () => {
         txb,
         slippage: 0.01,
         isMergeTragetCoin: false,
-        partner: "0x1f5fa5c820f40d43fc47815ad06d95e40a1942ff72a732a92e8ef4aa8cde70a5",
+        // partner: "0x1f5fa5c820f40d43fc47815ad06d95e40a1942ff72a732a92e8ef4aa8cde70a5",
         refreshAllCoins: true,
         payDeepFeeAmount: 0,
       })
@@ -161,14 +150,18 @@ describe("router module", () => {
 
       let result = await client.devInspectTransactionBlock(txb)
       console.log("🚀 ~ file: router.test.ts:180 ~ test ~ result:", result)
-
-      if (result.effects.status.status === "success") {
-        // console.log("Sim exec transaction success")
-        const result = await client.signAndExecuteTransaction(txb, keypair)
-        console.log("result", result)
-      } else {
-        console.log("result", result)
+      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")
+      //   const result = await client.signAndExecuteTransaction(txb, keypair)
+      //   console.log("result", result)
+      // } else {
+      //   console.log("result", result)
+      // }
     }
   }, 600000)