@cetusprotocol/aggregator-sdk 0.3.12 → 0.3.13

package/dist/index.d.mts

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

package/dist/index.d.ts

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

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
         }

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
         }

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/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.12",
+  "version": "0.3.13",
   "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/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,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,