@cetusprotocol/aggregator-sdk 0.3.31 → 0.3.32

package/dist/index.js

@@ -5633,6 +5633,8 @@ function getAggregatorServerErrorMessage(code) {
       return "Insufficient Liquidity";
     case 10004 /* HoneyPot */:
       return "Target token is detected as a HoneyPot scam";
+    case 10005 /* RateLimitExceeded */:
+      return "Too many requests. Please try again later";
     default:
       return "Unknown error";
   }
@@ -6792,7 +6794,7 @@ var _AggregatorClient = class _AggregatorClient {
   // Include deepbookv3, scallop, bluefin
   publishedAtV2Extend() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x34ef25b60b51f9d07cd9b7dc5b08dfdf26c7b0ff00c57bb17454c161fa6b6b83";
+      return "0xf57be4b9f9036034b1c5484d299d8fb68d5f43862d6afe8886d67db293dfc4bc";
     } else {
       return "0xabb6a81c8a216828e317719e06125de5bb2cb0fe8f9916ff8c023ca5be224c78";
     }
@@ -7102,23 +7104,34 @@ function getAggregatorV2ExtendPublishedAt(aggregatorV2ExtendPublishedAt, package
 // src/utils/msafe.ts
 var import_bn6 = __toESM(require_bn());
 var dealWithFastRouterSwapParamsForMsafe = (data) => {
-  const result = data == null ? void 0 : data.map((item) => {
-    var _a, _b, _c;
-    return __spreadProps(__spreadValues({}, item), {
-      amountIn: (_a = item == null ? void 0 : item.amountIn) == null ? void 0 : _a.toString(),
-      amountOut: (_b = item == null ? void 0 : item.amountOut) == null ? void 0 : _b.toString(),
-      initialPrice: (_c = item == null ? void 0 : item.initialPrice) == null ? void 0 : _c.toString()
-    });
+  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 == null ? void 0 : data.map((item) => {
-    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(item == null ? void 0 : item.initialPrice)
-    });
+  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;
 };
@@ -7132,7 +7145,7 @@ function processEndpoint(endpoint) {
 }
 
 // src/api.ts
-var SDK_VERSION = 1000331;
+var SDK_VERSION = 1000332;
 function getRouterResult(endpoint, params) {
   return __async(this, null, function* () {
     let response;
@@ -7145,6 +7158,10 @@ function getRouterResult(endpoint, params) {
       return null;
     }
     if (!response.ok) {
+      let errorCode = 10001 /* NumberTooLarge */;
+      if (response.status === 429) {
+        errorCode = 10005 /* RateLimitExceeded */;
+      }
       return {
         amountIn: ZERO,
         amountOut: ZERO,
@@ -7152,10 +7169,8 @@ function getRouterResult(endpoint, params) {
         byAmountIn: params.byAmountIn,
         insufficientLiquidity: false,
         error: {
-          code: 10001 /* NumberTooLarge */,
-          msg: getAggregatorServerErrorMessage(
-            10001 /* NumberTooLarge */
-          )
+          code: errorCode,
+          msg: getAggregatorServerErrorMessage(errorCode)
         }
       };
     }

package/dist/index.mjs

@@ -5631,6 +5631,8 @@ function getAggregatorServerErrorMessage(code) {
       return "Insufficient Liquidity";
     case 10004 /* HoneyPot */:
       return "Target token is detected as a HoneyPot scam";
+    case 10005 /* RateLimitExceeded */:
+      return "Too many requests. Please try again later";
     default:
       return "Unknown error";
   }
@@ -6790,7 +6792,7 @@ var _AggregatorClient = class _AggregatorClient {
   // Include deepbookv3, scallop, bluefin
   publishedAtV2Extend() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x34ef25b60b51f9d07cd9b7dc5b08dfdf26c7b0ff00c57bb17454c161fa6b6b83";
+      return "0xf57be4b9f9036034b1c5484d299d8fb68d5f43862d6afe8886d67db293dfc4bc";
     } else {
       return "0xabb6a81c8a216828e317719e06125de5bb2cb0fe8f9916ff8c023ca5be224c78";
     }
@@ -7100,23 +7102,34 @@ function getAggregatorV2ExtendPublishedAt(aggregatorV2ExtendPublishedAt, package
 // src/utils/msafe.ts
 var import_bn6 = __toESM(require_bn());
 var dealWithFastRouterSwapParamsForMsafe = (data) => {
-  const result = data == null ? void 0 : data.map((item) => {
-    var _a, _b, _c;
-    return __spreadProps(__spreadValues({}, item), {
-      amountIn: (_a = item == null ? void 0 : item.amountIn) == null ? void 0 : _a.toString(),
-      amountOut: (_b = item == null ? void 0 : item.amountOut) == null ? void 0 : _b.toString(),
-      initialPrice: (_c = item == null ? void 0 : item.initialPrice) == null ? void 0 : _c.toString()
-    });
+  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 == null ? void 0 : data.map((item) => {
-    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(item == null ? void 0 : item.initialPrice)
-    });
+  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;
 };
@@ -7130,7 +7143,7 @@ function processEndpoint(endpoint) {
 }
 
 // src/api.ts
-var SDK_VERSION = 1000331;
+var SDK_VERSION = 1000332;
 function getRouterResult(endpoint, params) {
   return __async(this, null, function* () {
     let response;
@@ -7143,6 +7156,10 @@ function getRouterResult(endpoint, params) {
       return null;
     }
     if (!response.ok) {
+      let errorCode = 10001 /* NumberTooLarge */;
+      if (response.status === 429) {
+        errorCode = 10005 /* RateLimitExceeded */;
+      }
       return {
         amountIn: ZERO,
         amountOut: ZERO,
@@ -7150,10 +7167,8 @@ function getRouterResult(endpoint, params) {
         byAmountIn: params.byAmountIn,
         insufficientLiquidity: false,
         error: {
-          code: 10001 /* NumberTooLarge */,
-          msg: getAggregatorServerErrorMessage(
-            10001 /* NumberTooLarge */
-          )
+          code: errorCode,
+          msg: getAggregatorServerErrorMessage(errorCode)
         }
       };
     }

package/dist/src/errors.d.ts

@@ -34,6 +34,7 @@ export declare enum AggregatorServerErrorCode {
     NumberTooLarge = 10001,
     NoRouter = 10002,
     InsufficientLiquidity = 10003,
-    HoneyPot = 10004
+    HoneyPot = 10004,
+    RateLimitExceeded = 10005
 }
 export declare function getAggregatorServerErrorMessage(code: AggregatorServerErrorCode): string;

package/dist/tests/router/scallop.test.d.ts

@@ -0,0 +1,2 @@
+import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519";
+export declare function buildTestAccount(): Ed25519Keypair;

package/package.json

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

package/src/api.ts

@@ -8,7 +8,7 @@ import {
 } from "./errors"
 import { parseRouterResponse } from "./client"
 
-const SDK_VERSION = 1000331
+const SDK_VERSION = 1000332
 
 export interface FindRouterParams {
   from: string
@@ -120,6 +120,11 @@ export async function getRouterResult(
   }
 
   if (!response.ok) {
+    let errorCode = AggregatorServerErrorCode.NumberTooLarge
+    if (response.status === 429) {
+      errorCode = AggregatorServerErrorCode.RateLimitExceeded
+    }
+
     return {
       amountIn: ZERO,
       amountOut: ZERO,
@@ -127,10 +132,8 @@ export async function getRouterResult(
       byAmountIn: params.byAmountIn,
       insufficientLiquidity: false,
       error: {
-        code: AggregatorServerErrorCode.NumberTooLarge,
-        msg: getAggregatorServerErrorMessage(
-          AggregatorServerErrorCode.NumberTooLarge
-        ),
+        code: errorCode,
+        msg: getAggregatorServerErrorMessage(errorCode),
       },
     }
   }

package/src/client.ts

@@ -610,7 +610,8 @@ export class AggregatorClient {
       // return "0x347dd58bbd11cd82c8b386b344729717c04a998da73386e82a239cc196d5706b" // version 7
       // return "0xf2fcea41dc217385019828375764fa06d9bd25e8e4726ba1962680849fb8d613" // version 8
       // return "0xa2d8a4279d69d8fec04b2fea8852d0d467d3cc0d39c5890180d439ae7a9953ed" // version 9
-      return "0x34ef25b60b51f9d07cd9b7dc5b08dfdf26c7b0ff00c57bb17454c161fa6b6b83" // version 10
+      // return "0x34ef25b60b51f9d07cd9b7dc5b08dfdf26c7b0ff00c57bb17454c161fa6b6b83" // version 10
+      return "0xf57be4b9f9036034b1c5484d299d8fb68d5f43862d6afe8886d67db293dfc4bc" // version 11
     } else {
       return "0xabb6a81c8a216828e317719e06125de5bb2cb0fe8f9916ff8c023ca5be224c78"
     }

package/src/errors.ts

@@ -51,7 +51,8 @@ export enum AggregatorServerErrorCode {
   NumberTooLarge = 10001,
   NoRouter = 10002,
   InsufficientLiquidity = 10003,
-  HoneyPot = 10004
+  HoneyPot = 10004,
+  RateLimitExceeded = 10005,
 }
 
 export function getAggregatorServerErrorMessage(
@@ -68,6 +69,8 @@ export function getAggregatorServerErrorMessage(
       return "Insufficient Liquidity"
     case AggregatorServerErrorCode.HoneyPot:
       return "Target token is detected as a HoneyPot scam"
+    case AggregatorServerErrorCode.RateLimitExceeded:
+      return "Too many requests. Please try again later"
     default:
       return "Unknown error"
   }

package/src/utils/msafe.ts

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

package/tests/router/scallop.test.ts

@@ -0,0 +1,127 @@
+import { describe, test } from "@jest/globals"
+import dotenv from "dotenv"
+import { AggregatorClient } from "~/client"
+import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519"
+import { printTransaction } from "~/utils/transaction"
+import BN from "bn.js"
+import { fromB64 } from "@mysten/sui/utils"
+import { SuiClient } from "@mysten/sui/client"
+import { Env } from "~/index"
+import { Transaction } from "@mysten/sui/transactions"
+
+dotenv.config()
+
+export function buildTestAccount(): Ed25519Keypair {
+  const mnemonics = process.env.SUI_WALLET_MNEMONICS || ""
+  const testAccountObject = Ed25519Keypair.deriveKeypair(mnemonics)
+  return testAccountObject
+}
+
+describe("Test scallop provider", () => {
+  let client: AggregatorClient
+  let keypair: Ed25519Keypair
+
+  const T_HASUI = "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI"
+  const T_SHASUI = "0x9a2376943f7d22f88087c259c5889925f332ca4347e669dc37d54c2bf651af3c::scallop_ha_sui::SCALLOP_HA_SUI"
+  
+  const T_SUI = "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"
+  const T_SSUI  = "0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI"
+
+  beforeAll(() => {
+    const fullNodeURL = process.env.SUI_RPC!
+    const aggregatorURL = process.env.CETUS_AGGREGATOR!
+    const secret = process.env.SUI_WALLET_SECRET!
+
+    if (secret) {
+      keypair = Ed25519Keypair.fromSecretKey(fromB64(secret).slice(1, 33))
+    } else {
+      keypair = buildTestAccount()
+    }
+
+    // const wallet = keypair.getPublicKey().toSuiAddress()
+    const wallet =
+      "0xf077fa7f67b1f2d417bbe977b3cbc113b078907f74e04120f623b87b23e93963"
+
+    console.log("wallet: ", wallet)
+
+    const endpoint = aggregatorURL
+
+    const suiClient = new SuiClient({
+      url: fullNodeURL,
+    })
+
+    client = new AggregatorClient(endpoint, wallet, suiClient, Env.Mainnet)
+  })
+
+  test("Find Routers", async () => {
+    const amounts = ["1000", "1000000", "100000000", "5000000000", "1000000000000000000000000000"]
+    
+    while (true) {
+      const res = await client.findRouters({
+        from: T_SUI,
+        target: T_SSUI,
+        amount: new BN("1000000000000000000000000000"),
+        byAmountIn: true,
+        depth: 3,
+        splitCount: 1,
+        providers: ["SCALLOP"],
+      })
+
+      if (res != null) {
+        console.log(JSON.stringify(res, null, 2))
+      }
+      console.log("amount in", res?.amountIn.toString())
+      console.log("amount out", res?.amountOut.toString())
+    }
+  }, 6000000)
+
+  test("Build Router TX", async () => {
+    const amount = "10000000"
+
+    const res = await client.findRouters({
+      from: T_HASUI,
+      target: T_SHASUI,
+      amount: new BN(amount),
+      byAmountIn: true,
+      depth: 3,
+      providers: ["SCALLOP"],
+    })
+
+    console.log("amount in", res?.amountIn.toString())
+    console.log("amount out", res?.amountOut.toString())
+
+    const txb = new Transaction()
+
+    if (res != null) {
+      console.log(JSON.stringify(res, null, 2))
+      await client.fastRouterSwap({
+        routers: res,
+        txb,
+        slippage: 0.01,
+        refreshAllCoins: true,
+        payDeepFeeAmount: 0,
+      })
+
+      txb.setSender(client.signer)
+      const buildTxb = await txb.build({ client: client.client })
+      // const buildTxb = await txb.getData()
+      
+      console.log("buildTxb", buildTxb)
+
+      printTransaction(txb)
+
+      let result = await client.devInspectTransactionBlock(txb)
+      console.log("🚀 ~ file: router.test.ts:180 ~ test ~ result:", result)
+      for (const event of result.events) {
+        console.log("event", JSON.stringify(event, null, 2))
+      }
+
+      if (result.effects.status.status === "success") {
+        const result = await client.signAndExecuteTransaction(txb, keypair)
+        console.log("result", result)
+      } else {
+        console.log("result", result)
+      }
+    }
+  }, 600000)
+})