@cetusprotocol/aggregator-sdk 0.3.15 → 0.3.17

package/README.md

@@ -104,7 +104,7 @@ if (routerRes != null) {
   // you can use this target coin object argument to build your ptb.
   const client.transferOrDestoryCoin(
       txb,
-      targetCoinRes.targetCoin,
+      targetCoin,
       targetCoinType
   )
 

package/dist/index.js

@@ -5621,6 +5621,8 @@ function getAggregatorServerErrorMessage(code) {
       return "No router";
     case 10003 /* InsufficientLiquidity */:
       return "Insufficient Liquidity";
+    case 10004 /* HoneyPot */:
+      return "Target token is detected as a HoneyPot scam";
     default:
       return "Unknown error";
   }
@@ -5706,8 +5708,11 @@ function buildInputCoin(txb, allCoins, amount, coinType) {
       mergedCoin.map((coin) => txb.object(coin))
     );
   }
+  const targetCoin = txb.splitCoins(txb.object(masterCoin), [
+    txb.pure.u64(amount.toString())
+  ]);
   return {
-    targetCoin: txb.object(masterCoin),
+    targetCoin,
     isMintZeroCoin: false,
     targetCoinAmount: Number(amount.toString())
   };
@@ -6479,7 +6484,7 @@ var AggregatorClient10 = class {
   // Include cetus、deepbookv2、flowxv2 & v3、kriyav2 & v3、turbos、aftermath、haedal、afsui、volo、bluemove
   publishedAt() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x11451575c775a3e633437b827ecbc1eb51a5964b0302210b28f5b89880be21a2";
+      return "0x3fb42ddf908af45f9fc3c59eab227888ff24ba2e137b3b55bf80920fd47e11af";
     } else {
       return "0x52eae33adeb44de55cfb3f281d4cc9e02d976181c0952f5323648b5717b33934";
     }
@@ -6726,11 +6731,25 @@ function getRouterResult(endpoint, params) {
       };
     }
     const data = yield response.json();
+    const insufficientLiquidity = data.msg === "liquidity is not enough";
+    if (data.msg && data.msg.indexOf("HoneyPot scam") > -1) {
+      return {
+        amountIn: ZERO,
+        amountOut: ZERO,
+        routes: [],
+        insufficientLiquidity,
+        error: {
+          code: 10004 /* HoneyPot */,
+          msg: getAggregatorServerErrorMessage(
+            10004 /* HoneyPot */
+          )
+        }
+      };
+    }
     if (data.data != null) {
       const res = parseRouterResponse(data.data);
       return res;
     }
-    const insufficientLiquidity = data.msg === "liquidity is not enough";
     return {
       amountIn: ZERO,
       amountOut: ZERO,
@@ -6779,7 +6798,7 @@ function getRouter(endpoint, params) {
           url += `&providers=${providers.join(",")}`;
         }
       }
-      url += "&v=1000315";
+      url += "&v=1000317";
       const response = yield fetch(url);
       return response;
     } catch (error) {

package/dist/index.mjs

@@ -5619,6 +5619,8 @@ function getAggregatorServerErrorMessage(code) {
       return "No router";
     case 10003 /* InsufficientLiquidity */:
       return "Insufficient Liquidity";
+    case 10004 /* HoneyPot */:
+      return "Target token is detected as a HoneyPot scam";
     default:
       return "Unknown error";
   }
@@ -5704,8 +5706,11 @@ function buildInputCoin(txb, allCoins, amount, coinType) {
       mergedCoin.map((coin) => txb.object(coin))
     );
   }
+  const targetCoin = txb.splitCoins(txb.object(masterCoin), [
+    txb.pure.u64(amount.toString())
+  ]);
   return {
-    targetCoin: txb.object(masterCoin),
+    targetCoin,
     isMintZeroCoin: false,
     targetCoinAmount: Number(amount.toString())
   };
@@ -6477,7 +6482,7 @@ var AggregatorClient10 = class {
   // Include cetus、deepbookv2、flowxv2 & v3、kriyav2 & v3、turbos、aftermath、haedal、afsui、volo、bluemove
   publishedAt() {
     if (this.env === 0 /* Mainnet */) {
-      return "0x11451575c775a3e633437b827ecbc1eb51a5964b0302210b28f5b89880be21a2";
+      return "0x3fb42ddf908af45f9fc3c59eab227888ff24ba2e137b3b55bf80920fd47e11af";
     } else {
       return "0x52eae33adeb44de55cfb3f281d4cc9e02d976181c0952f5323648b5717b33934";
     }
@@ -6724,11 +6729,25 @@ function getRouterResult(endpoint, params) {
       };
     }
     const data = yield response.json();
+    const insufficientLiquidity = data.msg === "liquidity is not enough";
+    if (data.msg && data.msg.indexOf("HoneyPot scam") > -1) {
+      return {
+        amountIn: ZERO,
+        amountOut: ZERO,
+        routes: [],
+        insufficientLiquidity,
+        error: {
+          code: 10004 /* HoneyPot */,
+          msg: getAggregatorServerErrorMessage(
+            10004 /* HoneyPot */
+          )
+        }
+      };
+    }
     if (data.data != null) {
       const res = parseRouterResponse(data.data);
       return res;
     }
-    const insufficientLiquidity = data.msg === "liquidity is not enough";
     return {
       amountIn: ZERO,
       amountOut: ZERO,
@@ -6777,7 +6796,7 @@ function getRouter(endpoint, params) {
           url += `&providers=${providers.join(",")}`;
         }
       }
-      url += "&v=1000315";
+      url += "&v=1000317";
       const response = yield fetch(url);
       return response;
     } catch (error) {

package/dist/src/errors.d.ts

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

package/package.json

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

package/src/api.ts

@@ -109,11 +109,27 @@ export async function getRouterResult(
     }
   }
   const data = await response.json()
+  const insufficientLiquidity = data.msg === "liquidity is not enough"
+
+  if(data.msg && data.msg.indexOf('HoneyPot scam')>-1){
+    return {
+      amountIn: ZERO,
+      amountOut: ZERO,
+      routes: [],
+      insufficientLiquidity,
+      error: {
+        code: AggregatorServerErrorCode.HoneyPot,
+        msg: getAggregatorServerErrorMessage(
+          AggregatorServerErrorCode.HoneyPot
+        ),
+      },
+    }
+  }
   if (data.data != null) {
     const res = parseRouterResponse(data.data)
     return res
   }
-  const insufficientLiquidity = data.msg === "liquidity is not enough"
+  
 
   return {
     amountIn: ZERO,
@@ -170,7 +186,7 @@ async function getRouter(endpoint: string, params: FindRouterParams) {
     }
 
     // set newest sdk version
-    url += "&v=1000315"
+    url += "&v=1000317"
 
     const response = await fetch(url)
     return response

package/src/client.ts

@@ -406,7 +406,8 @@ export class AggregatorClient {
   // Include cetus、deepbookv2、flowxv2 & v3、kriyav2 & v3、turbos、aftermath、haedal、afsui、volo、bluemove
   publishedAt(): string {
     if (this.env === Env.Mainnet) {
-      return "0x11451575c775a3e633437b827ecbc1eb51a5964b0302210b28f5b89880be21a2" // version 5
+      return "0x3fb42ddf908af45f9fc3c59eab227888ff24ba2e137b3b55bf80920fd47e11af" // version 6
+      // return "0x807c6697636bafa674dcf67570a1a95c3cc35dd9a44614558ef8ef9ed4aa83ad" // pre
     } else {
       // return "0x0ed287d6c3fe4962d0994ffddc1d19a15fba6a81533f3f0dcc2bbcedebce0637" // version 2
       return "0x52eae33adeb44de55cfb3f281d4cc9e02d976181c0952f5323648b5717b33934"

package/src/errors.ts

@@ -51,6 +51,7 @@ export enum AggregatorServerErrorCode {
   NumberTooLarge = 10001,
   NoRouter = 10002,
   InsufficientLiquidity = 10003,
+  HoneyPot = 10004
 }
 
 export function getAggregatorServerErrorMessage(
@@ -65,6 +66,8 @@ export function getAggregatorServerErrorMessage(
       return "No router"
     case AggregatorServerErrorCode.InsufficientLiquidity:
       return "Insufficient Liquidity"
+    case AggregatorServerErrorCode.HoneyPot:
+      return "Target token is detected as a HoneyPot scam"
     default:
       return "Unknown error"
   }

package/src/utils/coin.ts

@@ -116,8 +116,12 @@ export function buildInputCoin(
     )
   }
 
+  const targetCoin = txb.splitCoins(txb.object(masterCoin), [
+    txb.pure.u64(amount.toString()),
+  ])
+
   return {
-    targetCoin: txb.object(masterCoin),
+    targetCoin,
     isMintZeroCoin: false,
     targetCoinAmount: Number(amount.toString()),
   }

package/tests/router.test.ts

@@ -33,9 +33,9 @@ describe("router module", () => {
       keypair = buildTestAccount()
     }
 
-    // const wallet = keypair.getPublicKey().toSuiAddress()
-    // console.log("wallet: ", wallet)
-    const wallet = "0x326ce9894f08dcaa337fa232641cc34db957aec9ff6614c1186bc9a7508df0bb"
+    const wallet = keypair.getPublicKey().toSuiAddress()
+    console.log("wallet: ", wallet)
+    // const wallet = "0x02e39bddb06f617112595378fef741f523fbf22ea188cca99ecb61a9904dda2a"
 
     const endpoint = aggregatorURL
 
@@ -110,9 +110,9 @@ describe("router module", () => {
 
   test("Build router tx", async () => {
     const byAmountIn = true
-    const amount = "3574839"
-    const target = "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC"
-    const from = "0x2::sui::SUI"
+    const amount = "30000000"
+    const target = "0x375f70cf2ae4c00bf37117d0c85a2c71545e6ee05c4a5c7d282cd66a4504b068::usdt::USDT"
+    const from = "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC"
 
     const res = await client.findRouters({
       from,
@@ -120,7 +120,7 @@ describe("router module", () => {
       amount: new BN(amount),
       byAmountIn,
       depth: 3,
-      providers: ["HAEDALPMM"],
+      // providers: ["HAEDAL"],
     })
 
     if (res != null) {
@@ -345,4 +345,24 @@ describe("router module", () => {
     const config = await client.getDeepbookV3Config()
     console.log("config", config)
   }, 60000)
+
+
+  test("Find router", async () => {
+    const amount = "4239267610000000000"
+    const res = await client.findRouters({
+      from: '0x2::sui::SUI',
+      target: '0x188c6239bda71ba5751990cc0271e91b6362c67bccf7aa381e018db7fe39c6d7::BUILD::BUILD',
+      amount: new BN(amount),
+      byAmountIn: true,
+      depth: 3,
+      splitCount: 1,
+      providers: ["CETUS"],
+    })
+
+    if (res != null) {
+      console.log(JSON.stringify(res, null, 2))
+    }
+    console.log("amount in", res?.amountIn.toString())
+    console.log("amount out", res?.amountOut.toString())
+  })
 })