@cetusprotocol/aggregator-sdk 0.3.19 → 0.3.21

package/dist/index.js

@@ -5936,10 +5936,7 @@ var Haedal = class {
   swap(client, txb, path, inputCoin, packages) {
     return __async(this, null, function* () {
       const { direction } = path;
-      if (!direction) {
-        throw new Error("Haedal not support b2a swap");
-      }
-      const func = "swap_a2b";
+      const func = direction ? "swap_a2b" : "swap_b2a";
       const args = [txb.object(path.id), txb.object("0x5"), inputCoin];
       const publishedAt = getAggregatorV2PublishedAt(client.publishedAtV2(), packages);
       const res = txb.moveCall({
@@ -6567,7 +6564,7 @@ var AggregatorClient19 = class {
   // Include cetus、deepbookv2、flowxv2 & v3、kriyav2 & v3、turbos、aftermath、haedal、afsui、volo、bluemove
   publishedAtV2() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x3fb42ddf908af45f9fc3c59eab227888ff24ba2e137b3b55bf80920fd47e11af";
+      return "0xf9c6f78322ed667909e05f6b42b2f5a67af6297503c905335e02a15148e9440d";
     } else {
       return "0x52eae33adeb44de55cfb3f281d4cc9e02d976181c0952f5323648b5717b33934";
     }
@@ -6786,24 +6783,34 @@ function getAggregatorV2ExtendPublishedAt(aggregatorV2ExtendPublishedAt, package
 // src/utils/msafe.ts
 var import_bn6 = __toESM(require_bn());
 var dealWithFastRouterSwapParamsForMsafe = (data) => {
-  const result = data.map((route) => {
-    return __spreadProps(__spreadValues({}, route), {
-      amountIn: route.amountIn.toString(),
-      amountOut: route.amountOut.toString(),
-      initialPrice: route.initialPrice.toString(),
-      path: route.path
-    });
+  var _a, _b, _c;
+  const result = __spreadProps(__spreadValues({}, data), {
+    amountIn: (_a = data == null ? void 0 : data.amountIn) == null ? void 0 : _a.toString(),
+    amountOut: (_b = data == null ? void 0 : data.amountIn) == null ? void 0 : _b.toString(),
+    routes: (_c = data == null ? void 0 : data.routes) == null ? void 0 : _c.map((item) => {
+      var _a2, _b2, _c2;
+      return __spreadProps(__spreadValues({}, item), {
+        amountIn: (_a2 = item == null ? void 0 : item.amountIn) == null ? void 0 : _a2.toString(),
+        amountOut: (_b2 = item == null ? void 0 : item.amountOut) == null ? void 0 : _b2.toString(),
+        initialPrice: (_c2 = item == null ? void 0 : item.initialPrice) == null ? void 0 : _c2.toString()
+      });
+    })
   });
   return result;
 };
 var restituteMsafeFastRouterSwapParams = (data) => {
-  const result = data.map((route) => {
-    return __spreadProps(__spreadValues({}, route), {
-      amountIn: new import_bn6.default(route.amountIn),
-      amountOut: new import_bn6.default(route.amountOut),
-      initialPrice: new decimal_default(route.initialPrice.toString()),
-      path: route.path
-    });
+  var _a;
+  const result = __spreadProps(__spreadValues({}, data), {
+    amountIn: new import_bn6.default(data == null ? void 0 : data.amountIn),
+    amountOut: new import_bn6.default(data == null ? void 0 : data.amountIn),
+    routes: (_a = data == null ? void 0 : data.routes) == null ? void 0 : _a.map((item) => {
+      var _a2;
+      return __spreadProps(__spreadValues({}, item), {
+        amountIn: new import_bn6.default(item == null ? void 0 : item.amountIn),
+        amountOut: new import_bn6.default(item == null ? void 0 : item.amountOut),
+        initialPrice: new decimal_default((_a2 = item == null ? void 0 : item.initialPrice) == null ? void 0 : _a2.toString())
+      });
+    })
   });
   return result;
 };
@@ -6913,7 +6920,7 @@ function getRouter(endpoint, params) {
           url += `&providers=${providers.join(",")}`;
         }
       }
-      url += "&v=1000319";
+      url += "&v=1000321";
       const response = yield fetch(url);
       return response;
     } catch (error) {

package/dist/index.mjs

@@ -5934,10 +5934,7 @@ var Haedal = class {
   swap(client, txb, path, inputCoin, packages) {
     return __async(this, null, function* () {
       const { direction } = path;
-      if (!direction) {
-        throw new Error("Haedal not support b2a swap");
-      }
-      const func = "swap_a2b";
+      const func = direction ? "swap_a2b" : "swap_b2a";
       const args = [txb.object(path.id), txb.object("0x5"), inputCoin];
       const publishedAt = getAggregatorV2PublishedAt(client.publishedAtV2(), packages);
       const res = txb.moveCall({
@@ -6565,7 +6562,7 @@ var AggregatorClient19 = class {
   // Include cetus、deepbookv2、flowxv2 & v3、kriyav2 & v3、turbos、aftermath、haedal、afsui、volo、bluemove
   publishedAtV2() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x3fb42ddf908af45f9fc3c59eab227888ff24ba2e137b3b55bf80920fd47e11af";
+      return "0xf9c6f78322ed667909e05f6b42b2f5a67af6297503c905335e02a15148e9440d";
     } else {
       return "0x52eae33adeb44de55cfb3f281d4cc9e02d976181c0952f5323648b5717b33934";
     }
@@ -6784,24 +6781,34 @@ function getAggregatorV2ExtendPublishedAt(aggregatorV2ExtendPublishedAt, package
 // src/utils/msafe.ts
 var import_bn6 = __toESM(require_bn());
 var dealWithFastRouterSwapParamsForMsafe = (data) => {
-  const result = data.map((route) => {
-    return __spreadProps(__spreadValues({}, route), {
-      amountIn: route.amountIn.toString(),
-      amountOut: route.amountOut.toString(),
-      initialPrice: route.initialPrice.toString(),
-      path: route.path
-    });
+  var _a, _b, _c;
+  const result = __spreadProps(__spreadValues({}, data), {
+    amountIn: (_a = data == null ? void 0 : data.amountIn) == null ? void 0 : _a.toString(),
+    amountOut: (_b = data == null ? void 0 : data.amountIn) == null ? void 0 : _b.toString(),
+    routes: (_c = data == null ? void 0 : data.routes) == null ? void 0 : _c.map((item) => {
+      var _a2, _b2, _c2;
+      return __spreadProps(__spreadValues({}, item), {
+        amountIn: (_a2 = item == null ? void 0 : item.amountIn) == null ? void 0 : _a2.toString(),
+        amountOut: (_b2 = item == null ? void 0 : item.amountOut) == null ? void 0 : _b2.toString(),
+        initialPrice: (_c2 = item == null ? void 0 : item.initialPrice) == null ? void 0 : _c2.toString()
+      });
+    })
   });
   return result;
 };
 var restituteMsafeFastRouterSwapParams = (data) => {
-  const result = data.map((route) => {
-    return __spreadProps(__spreadValues({}, route), {
-      amountIn: new import_bn6.default(route.amountIn),
-      amountOut: new import_bn6.default(route.amountOut),
-      initialPrice: new decimal_default(route.initialPrice.toString()),
-      path: route.path
-    });
+  var _a;
+  const result = __spreadProps(__spreadValues({}, data), {
+    amountIn: new import_bn6.default(data == null ? void 0 : data.amountIn),
+    amountOut: new import_bn6.default(data == null ? void 0 : data.amountIn),
+    routes: (_a = data == null ? void 0 : data.routes) == null ? void 0 : _a.map((item) => {
+      var _a2;
+      return __spreadProps(__spreadValues({}, item), {
+        amountIn: new import_bn6.default(item == null ? void 0 : item.amountIn),
+        amountOut: new import_bn6.default(item == null ? void 0 : item.amountOut),
+        initialPrice: new decimal_default((_a2 = item == null ? void 0 : item.initialPrice) == null ? void 0 : _a2.toString())
+      });
+    })
   });
   return result;
 };
@@ -6911,7 +6918,7 @@ function getRouter(endpoint, params) {
           url += `&providers=${providers.join(",")}`;
         }
       }
-      url += "&v=1000319";
+      url += "&v=1000321";
       const response = yield fetch(url);
       return response;
     } catch (error) {

package/package.json

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

package/src/api.ts

@@ -190,7 +190,7 @@ async function getRouter(endpoint: string, params: FindRouterParams) {
     }
 
     // set newest sdk version
-    url += "&v=1000319"
+    url += "&v=1000321"
 
     const response = await fetch(url)
     return response

package/src/client.ts

@@ -479,9 +479,10 @@ export class AggregatorClient {
   // Include cetus、deepbookv2、flowxv2 & v3、kriyav2 & v3、turbos、aftermath、haedal、afsui、volo、bluemove
   publishedAtV2(): string {
     if (this.env === Env.Mainnet) {
-      return "0x3fb42ddf908af45f9fc3c59eab227888ff24ba2e137b3b55bf80920fd47e11af" // version 6
+      // return "0x3fb42ddf908af45f9fc3c59eab227888ff24ba2e137b3b55bf80920fd47e11af" // version 6
       // return "0x4069913c4953297b7f08f67f6722e3b04aa5ab2976b4e1b8a456b81590b34ab4"
-      // return "0xf182baf7eeefcdaa247cf01dbfcde920133c75a9efa75dfe3703da6a8fc6a70f" // pre
+      return "0xf9c6f78322ed667909e05f6b42b2f5a67af6297503c905335e02a15148e9440d"
+      // return "0x803db8dfcc86fc1afbc7d2212bd14ec9690978ddebea0d590e01147d6b17aa06" // pre
     } else {
       // return "0x0ed287d6c3fe4962d0994ffddc1d19a15fba6a81533f3f0dcc2bbcedebce0637" // version 2
       return "0x52eae33adeb44de55cfb3f281d4cc9e02d976181c0952f5323648b5717b33934"

package/src/transaction/haedal.ts

@@ -19,10 +19,7 @@ export class Haedal implements Dex {
     packages?: Map<string, string>
   ): Promise<TransactionObjectArgument> {
     const { direction } = path
-    if (!direction) {
-      throw new Error("Haedal not support b2a swap")
-    }
-    const func = "swap_a2b"
+    const func = direction ? "swap_a2b" : "swap_b2a"
     const args = [txb.object(path.id), txb.object("0x5"), inputCoin]
     const publishedAt = getAggregatorV2PublishedAt(client.publishedAtV2(), packages)
     const res = txb.moveCall({

package/src/utils/msafe.ts

@@ -3,29 +3,38 @@ import BN from 'bn.js'
 import Decimal from "decimal.js"
 
 export const dealWithFastRouterSwapParamsForMsafe = (data: any) => {
-    const result =data.map((route: any) => {
+  const result = {
+    ...data,
+    amountIn: data?.amountIn?.toString(),
+    amountOut: data?.amountIn?.toString(),
+    routes: data?.routes?.map((item:any) => {
       return {
-        ...route,
-        amountIn: route.amountIn.toString(),
-        amountOut: route.amountOut.toString(),
-        initialPrice: route.initialPrice.toString(),
-        path: route.path
+        ...item,
+        amountIn: item?.amountIn?.toString(),
+        amountOut: item?.amountOut?.toString(),
+        initialPrice: item?.initialPrice?.toString()
       }
     })
-    
-    return result
   }
 
-  export const restituteMsafeFastRouterSwapParams = (data: any) => {
-    const result =data.map((route: any) => {
+  return result
+}
+
+
+export const restituteMsafeFastRouterSwapParams = (data: any) => {
+  const result = {
+    ...data,
+    amountIn: new BN(data?.amountIn),
+    amountOut: new BN(data?.amountIn),
+    routes: data?.routes?.map((item:any) => {
       return {
-        ...route,
-        amountIn: new BN(route.amountIn),
-        amountOut: new BN(route.amountOut),
-        initialPrice: new Decimal(route.initialPrice.toString()),
-        path: route.path
+        ...item,
+        amountIn: new BN(item?.amountIn),
+        amountOut: new BN(item?.amountOut),
+        initialPrice: new Decimal(item?.initialPrice?.toString())
       }
     })
-    
-    return result
-  }
+  }
+
+  return result
+}

package/tests/router.test.ts

@@ -35,7 +35,6 @@ describe("router module", () => {
 
     const wallet = keypair.getPublicKey().toSuiAddress()
     console.log("wallet: ", wallet)
-    // const wallet = "0x02e39bddb06f617112595378fef741f523fbf22ea188cca99ecb61a9904dda2a"
 
     const endpoint = aggregatorURL
 
@@ -109,8 +108,8 @@ describe("router module", () => {
 
   test("Build router tx", async () => {
     const byAmountIn = true
-    const amount = "10000"
-    const from = "0x83556891f4a0f233ce7b05cfe7f957d4020492a34f5405b2cb9377d060bef4bf::spring_sui::SPRING_SUI"
+    const amount = "1000000000"
+    const from = "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI"
     const target = "0x2::sui::SUI"
 
     const res = await client.findRouters({
@@ -119,7 +118,8 @@ describe("router module", () => {
       amount: new BN(amount),
       byAmountIn,
       depth: 3,
-      providers: ["SUILEND"],
+      providers: ["HAEDAL"],
+      splitCount:  1,
     })
 
     if (res != null) {