@cetusprotocol/aggregator-sdk 0.0.5 → 0.0.7

package/dist/index.d.mts

@@ -110,11 +110,16 @@ type Router = {
     amountOut: BN;
     initialPrice: Decimal;
 };
+type RouterError = {
+    code: number;
+    msg: string;
+};
 type RouterData = {
     amountIn: BN;
     amountOut: BN;
     routes: Router[];
     insufficientLiquidity: boolean;
+    error?: RouterError;
 };
 type AggregatorResponse = {
     code: number;
@@ -166,7 +171,7 @@ declare class AggregatorClient {
     swapInPools(params: SwapInPoolsParams): Promise<SwapInPoolsResult | null>;
     routerSwap(params: BuildRouterSwapParams): Promise<Transaction>;
     signAndExecuteTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_client.SuiTransactionBlockResponse>;
-    sdevInspectTransactionBlock(txb: Transaction): Promise<_mysten_sui_client.DevInspectResults>;
+    devInspectTransactionBlock(txb: Transaction): Promise<_mysten_sui_client.DevInspectResults>;
     sendTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_client.SuiTransactionBlockResponse>;
 }
 declare function parseRouterResponse(data: any): RouterData;
@@ -251,6 +256,7 @@ declare const TWO: BN;
 declare const U128: BN;
 declare const U64_MAX_BN: BN;
 declare const U64_MAX = "18446744073709551615";
+declare const TEN_POW_NINE = 1000000000;
 declare const MAINNET_FLOWX_AMM_CONTAINER_ID = "0xb65dcbf63fd3ad5d0ebfbf334780dc9f785eff38a4459e37ab08fa79576ee511";
 declare const TESTNET_FLOWX_AMM_CONTAINER_ID = "";
 declare const TURBOS_VERSIONED = "0xf1cf0e81048df168ebeb1b8030fad24b3e0b53ae827c25053fff0779c1445b6f";
@@ -265,4 +271,4 @@ declare const TESTNET_AFTERMATH_INSURANCE_FUND_ID = "";
 declare const MAINNET_AFTERMATH_REFERRAL_VAULT_ID = "0x35d35b0e5b177593d8c3a801462485572fc30861e6ce96a55af6dc4730709278";
 declare const TESTNET_AFTERMATH_REFERRAL_VAULT_ID = "";
 
-export { AFTERMATH_AMM, AFTERMATH_MODULE, AGGREGATOR, AggregatorClient, AggregatorConfig, type AggregatorResponse, type BuildRouterSwapParams, CETUS_DEX, CETUS_MODULE, CETUS_PUBLISHED_AT, CHECK_COINS_THRESHOLD_FUNC, CLOCK_ADDRESS, CoinInfoAddress, CoinStoreAddress, DEEPBOOK_CLOB_V2_MODULE, DEEPBOOK_CUSTODIAN_V2_MODULE, DEEPBOOK_DEX, DEEPBOOK_MODULE, DEEPBOOK_PACKAGE_ID, DEEPBOOK_PUBLISHED_AT, ENV, type ExtendedDetails, FLOWX_AMM, FLOWX_AMM_MODULE, type FindRouterParams, FlashSwapA2BFunc, FlashSwapB2AFunc, FlashSwapFunc, FlashSwapWithPartnerA2BFunc, FlashSwapWithPartnerB2AFunc, FlashSwapWithPartnerFunc, INTEGRATE, JOIN_FUNC, KRIYA_DEX, KRIYA_MODULE, MAINNET_AFTERMATH_INSURANCE_FUND_ID, MAINNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID, MAINNET_AFTERMATH_REFERRAL_VAULT_ID, MAINNET_AFTERMATH_REGISTRY_ID, MAINNET_AFTERMATH_TREASURY_ID, MAINNET_CETUS_GLOBAL_CONFIG_ID, MAINNET_FLOWX_AMM_CONTAINER_ID, ONE, PAY_MODULE, POOL_MODULT, type Package, type Path, REPAY_FLASH_SWAP_A2B_FUNC, REPAY_FLASH_SWAP_B2A_FUNC, REPAY_FLASH_SWAP_WITH_PARTNER_A2B_FUNC, REPAY_FLASH_SWAP_WITH_PARTNER_B2A_FUNC, RepayFalshSwapFunc, RepayFlashSwapWithPartnerFunc, type Router, type RouterData, SWAP_A2B_FUNC, SWAP_B2A_FUNC, SuiZeroCoinFn, type SwapInPoolsParams, type SwapInPoolsResult, TESTNET_AFTERMATH_INSURANCE_FUND_ID, TESTNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID, TESTNET_AFTERMATH_REFERRAL_VAULT_ID, TESTNET_AFTERMATH_REGISTRY_ID, TESTNET_AFTERMATH_TREASURY_ID, TESTNET_CETUS_GLOBAL_CONFIG_ID, TESTNET_FLOWX_AMM_CONTAINER_ID, TRANSFER_ACCOUNT_CAP, TRANSFER_OR_DESTORY_COIN_FUNC, TURBOS_DEX, TURBOS_MODULE, TURBOS_VERSIONED, TWO, U128, U64_MAX, U64_MAX_BN, UTILS_MODULE, ZERO, composeType, createTarget, expectInputRouterSwap, expectOutputRouterSwap, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId };
+export { AFTERMATH_AMM, AFTERMATH_MODULE, AGGREGATOR, AggregatorClient, AggregatorConfig, type AggregatorResponse, type BuildRouterSwapParams, CETUS_DEX, CETUS_MODULE, CETUS_PUBLISHED_AT, CHECK_COINS_THRESHOLD_FUNC, CLOCK_ADDRESS, CoinInfoAddress, CoinStoreAddress, DEEPBOOK_CLOB_V2_MODULE, DEEPBOOK_CUSTODIAN_V2_MODULE, DEEPBOOK_DEX, DEEPBOOK_MODULE, DEEPBOOK_PACKAGE_ID, DEEPBOOK_PUBLISHED_AT, ENV, type ExtendedDetails, FLOWX_AMM, FLOWX_AMM_MODULE, type FindRouterParams, FlashSwapA2BFunc, FlashSwapB2AFunc, FlashSwapFunc, FlashSwapWithPartnerA2BFunc, FlashSwapWithPartnerB2AFunc, FlashSwapWithPartnerFunc, INTEGRATE, JOIN_FUNC, KRIYA_DEX, KRIYA_MODULE, MAINNET_AFTERMATH_INSURANCE_FUND_ID, MAINNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID, MAINNET_AFTERMATH_REFERRAL_VAULT_ID, MAINNET_AFTERMATH_REGISTRY_ID, MAINNET_AFTERMATH_TREASURY_ID, MAINNET_CETUS_GLOBAL_CONFIG_ID, MAINNET_FLOWX_AMM_CONTAINER_ID, ONE, PAY_MODULE, POOL_MODULT, type Package, type Path, REPAY_FLASH_SWAP_A2B_FUNC, REPAY_FLASH_SWAP_B2A_FUNC, REPAY_FLASH_SWAP_WITH_PARTNER_A2B_FUNC, REPAY_FLASH_SWAP_WITH_PARTNER_B2A_FUNC, RepayFalshSwapFunc, RepayFlashSwapWithPartnerFunc, type Router, type RouterData, type RouterError, SWAP_A2B_FUNC, SWAP_B2A_FUNC, SuiZeroCoinFn, type SwapInPoolsParams, type SwapInPoolsResult, TEN_POW_NINE, TESTNET_AFTERMATH_INSURANCE_FUND_ID, TESTNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID, TESTNET_AFTERMATH_REFERRAL_VAULT_ID, TESTNET_AFTERMATH_REGISTRY_ID, TESTNET_AFTERMATH_TREASURY_ID, TESTNET_CETUS_GLOBAL_CONFIG_ID, TESTNET_FLOWX_AMM_CONTAINER_ID, TRANSFER_ACCOUNT_CAP, TRANSFER_OR_DESTORY_COIN_FUNC, TURBOS_DEX, TURBOS_MODULE, TURBOS_VERSIONED, TWO, U128, U64_MAX, U64_MAX_BN, UTILS_MODULE, ZERO, composeType, createTarget, expectInputRouterSwap, expectOutputRouterSwap, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId };

package/dist/index.d.ts

@@ -110,11 +110,16 @@ type Router = {
     amountOut: BN;
     initialPrice: Decimal;
 };
+type RouterError = {
+    code: number;
+    msg: string;
+};
 type RouterData = {
     amountIn: BN;
     amountOut: BN;
     routes: Router[];
     insufficientLiquidity: boolean;
+    error?: RouterError;
 };
 type AggregatorResponse = {
     code: number;
@@ -166,7 +171,7 @@ declare class AggregatorClient {
     swapInPools(params: SwapInPoolsParams): Promise<SwapInPoolsResult | null>;
     routerSwap(params: BuildRouterSwapParams): Promise<Transaction>;
     signAndExecuteTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_client.SuiTransactionBlockResponse>;
-    sdevInspectTransactionBlock(txb: Transaction): Promise<_mysten_sui_client.DevInspectResults>;
+    devInspectTransactionBlock(txb: Transaction): Promise<_mysten_sui_client.DevInspectResults>;
     sendTransaction(txb: Transaction, signer: Signer): Promise<_mysten_sui_client.SuiTransactionBlockResponse>;
 }
 declare function parseRouterResponse(data: any): RouterData;
@@ -251,6 +256,7 @@ declare const TWO: BN;
 declare const U128: BN;
 declare const U64_MAX_BN: BN;
 declare const U64_MAX = "18446744073709551615";
+declare const TEN_POW_NINE = 1000000000;
 declare const MAINNET_FLOWX_AMM_CONTAINER_ID = "0xb65dcbf63fd3ad5d0ebfbf334780dc9f785eff38a4459e37ab08fa79576ee511";
 declare const TESTNET_FLOWX_AMM_CONTAINER_ID = "";
 declare const TURBOS_VERSIONED = "0xf1cf0e81048df168ebeb1b8030fad24b3e0b53ae827c25053fff0779c1445b6f";
@@ -265,4 +271,4 @@ declare const TESTNET_AFTERMATH_INSURANCE_FUND_ID = "";
 declare const MAINNET_AFTERMATH_REFERRAL_VAULT_ID = "0x35d35b0e5b177593d8c3a801462485572fc30861e6ce96a55af6dc4730709278";
 declare const TESTNET_AFTERMATH_REFERRAL_VAULT_ID = "";
 
-export { AFTERMATH_AMM, AFTERMATH_MODULE, AGGREGATOR, AggregatorClient, AggregatorConfig, type AggregatorResponse, type BuildRouterSwapParams, CETUS_DEX, CETUS_MODULE, CETUS_PUBLISHED_AT, CHECK_COINS_THRESHOLD_FUNC, CLOCK_ADDRESS, CoinInfoAddress, CoinStoreAddress, DEEPBOOK_CLOB_V2_MODULE, DEEPBOOK_CUSTODIAN_V2_MODULE, DEEPBOOK_DEX, DEEPBOOK_MODULE, DEEPBOOK_PACKAGE_ID, DEEPBOOK_PUBLISHED_AT, ENV, type ExtendedDetails, FLOWX_AMM, FLOWX_AMM_MODULE, type FindRouterParams, FlashSwapA2BFunc, FlashSwapB2AFunc, FlashSwapFunc, FlashSwapWithPartnerA2BFunc, FlashSwapWithPartnerB2AFunc, FlashSwapWithPartnerFunc, INTEGRATE, JOIN_FUNC, KRIYA_DEX, KRIYA_MODULE, MAINNET_AFTERMATH_INSURANCE_FUND_ID, MAINNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID, MAINNET_AFTERMATH_REFERRAL_VAULT_ID, MAINNET_AFTERMATH_REGISTRY_ID, MAINNET_AFTERMATH_TREASURY_ID, MAINNET_CETUS_GLOBAL_CONFIG_ID, MAINNET_FLOWX_AMM_CONTAINER_ID, ONE, PAY_MODULE, POOL_MODULT, type Package, type Path, REPAY_FLASH_SWAP_A2B_FUNC, REPAY_FLASH_SWAP_B2A_FUNC, REPAY_FLASH_SWAP_WITH_PARTNER_A2B_FUNC, REPAY_FLASH_SWAP_WITH_PARTNER_B2A_FUNC, RepayFalshSwapFunc, RepayFlashSwapWithPartnerFunc, type Router, type RouterData, SWAP_A2B_FUNC, SWAP_B2A_FUNC, SuiZeroCoinFn, type SwapInPoolsParams, type SwapInPoolsResult, TESTNET_AFTERMATH_INSURANCE_FUND_ID, TESTNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID, TESTNET_AFTERMATH_REFERRAL_VAULT_ID, TESTNET_AFTERMATH_REGISTRY_ID, TESTNET_AFTERMATH_TREASURY_ID, TESTNET_CETUS_GLOBAL_CONFIG_ID, TESTNET_FLOWX_AMM_CONTAINER_ID, TRANSFER_ACCOUNT_CAP, TRANSFER_OR_DESTORY_COIN_FUNC, TURBOS_DEX, TURBOS_MODULE, TURBOS_VERSIONED, TWO, U128, U64_MAX, U64_MAX_BN, UTILS_MODULE, ZERO, composeType, createTarget, expectInputRouterSwap, expectOutputRouterSwap, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId };
+export { AFTERMATH_AMM, AFTERMATH_MODULE, AGGREGATOR, AggregatorClient, AggregatorConfig, type AggregatorResponse, type BuildRouterSwapParams, CETUS_DEX, CETUS_MODULE, CETUS_PUBLISHED_AT, CHECK_COINS_THRESHOLD_FUNC, CLOCK_ADDRESS, CoinInfoAddress, CoinStoreAddress, DEEPBOOK_CLOB_V2_MODULE, DEEPBOOK_CUSTODIAN_V2_MODULE, DEEPBOOK_DEX, DEEPBOOK_MODULE, DEEPBOOK_PACKAGE_ID, DEEPBOOK_PUBLISHED_AT, ENV, type ExtendedDetails, FLOWX_AMM, FLOWX_AMM_MODULE, type FindRouterParams, FlashSwapA2BFunc, FlashSwapB2AFunc, FlashSwapFunc, FlashSwapWithPartnerA2BFunc, FlashSwapWithPartnerB2AFunc, FlashSwapWithPartnerFunc, INTEGRATE, JOIN_FUNC, KRIYA_DEX, KRIYA_MODULE, MAINNET_AFTERMATH_INSURANCE_FUND_ID, MAINNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID, MAINNET_AFTERMATH_REFERRAL_VAULT_ID, MAINNET_AFTERMATH_REGISTRY_ID, MAINNET_AFTERMATH_TREASURY_ID, MAINNET_CETUS_GLOBAL_CONFIG_ID, MAINNET_FLOWX_AMM_CONTAINER_ID, ONE, PAY_MODULE, POOL_MODULT, type Package, type Path, REPAY_FLASH_SWAP_A2B_FUNC, REPAY_FLASH_SWAP_B2A_FUNC, REPAY_FLASH_SWAP_WITH_PARTNER_A2B_FUNC, REPAY_FLASH_SWAP_WITH_PARTNER_B2A_FUNC, RepayFalshSwapFunc, RepayFlashSwapWithPartnerFunc, type Router, type RouterData, type RouterError, SWAP_A2B_FUNC, SWAP_B2A_FUNC, SuiZeroCoinFn, type SwapInPoolsParams, type SwapInPoolsResult, TEN_POW_NINE, TESTNET_AFTERMATH_INSURANCE_FUND_ID, TESTNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID, TESTNET_AFTERMATH_REFERRAL_VAULT_ID, TESTNET_AFTERMATH_REGISTRY_ID, TESTNET_AFTERMATH_TREASURY_ID, TESTNET_CETUS_GLOBAL_CONFIG_ID, TESTNET_FLOWX_AMM_CONTAINER_ID, TRANSFER_ACCOUNT_CAP, TRANSFER_OR_DESTORY_COIN_FUNC, TURBOS_DEX, TURBOS_MODULE, TURBOS_VERSIONED, TWO, U128, U64_MAX, U64_MAX_BN, UTILS_MODULE, ZERO, composeType, createTarget, expectInputRouterSwap, expectOutputRouterSwap, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId };

package/dist/index.js

@@ -5318,6 +5318,7 @@ var TWO = new import_bn.default(2);
 var U128 = TWO.pow(new import_bn.default(128));
 var U64_MAX_BN = new import_bn.default("18446744073709551615");
 var U64_MAX = "18446744073709551615";
+var TEN_POW_NINE = 1e9;
 var MAINNET_FLOWX_AMM_CONTAINER_ID = "0xb65dcbf63fd3ad5d0ebfbf334780dc9f785eff38a4459e37ab08fa79576ee511";
 var TESTNET_FLOWX_AMM_CONTAINER_ID = "";
 var TURBOS_VERSIONED = "0xf1cf0e81048df168ebeb1b8030fad24b3e0b53ae827c25053fff0779c1445b6f";
@@ -5331,6 +5332,22 @@ var MAINNET_AFTERMATH_INSURANCE_FUND_ID = "0xf0c40d67b078000e18032334c3325c47b9e
 var TESTNET_AFTERMATH_INSURANCE_FUND_ID = "";
 var MAINNET_AFTERMATH_REFERRAL_VAULT_ID = "0x35d35b0e5b177593d8c3a801462485572fc30861e6ce96a55af6dc4730709278";
 var TESTNET_AFTERMATH_REFERRAL_VAULT_ID = "";
+
+// src/errors.ts
+function getAggregatorServerErrorMessage(code) {
+  switch (code) {
+    case 1e4 /* CalculateError */:
+      return "Calculate error";
+    case 10001 /* NumberTooLarge */:
+      return "Input number too large can not fit in target type";
+    case 10002 /* NoRouter */:
+      return "No router";
+    case 10003 /* InsufficientLiquidity */:
+      return "Insufficient Liquidity";
+    default:
+      return "Unknown error";
+  }
+}
 function mintZeroCoin(txb, coinType) {
   return txb.moveCall({
     target: SuiZeroCoinFn,
@@ -5347,7 +5364,10 @@ function buildInputCoin(txb, allCoins, amount, coinType) {
       targetCoinAmount: 0
     };
   }
+  console.log("used coin asests", usedCoinAsests);
   let totalCoinBalance = CoinUtils.calculateTotalBalance(usedCoinAsests);
+  console.log("totalCoinBalance", totalCoinBalance);
+  console.log("amount", amount);
   if (totalCoinBalance < amount) {
     throw new AggregateError(
       "Insufficient balance when build merge coin",
@@ -5841,9 +5861,9 @@ var import_bn2 = __toESM(require_bn());
 function CalculateAmountLimit(expectAmount, byAmountIn, slippage) {
   let amountLimit = ZERO;
   if (byAmountIn) {
-    amountLimit = expectAmount.muln(1 - slippage);
+    amountLimit = expectAmount.mul(new import_bn2.default(TEN_POW_NINE - slippage * TEN_POW_NINE)).div(new import_bn2.default(TEN_POW_NINE));
   } else {
-    amountLimit = expectAmount.muln(1 + slippage);
+    amountLimit = expectAmount.mul(new import_bn2.default(TEN_POW_NINE + slippage * TEN_POW_NINE)).div(new import_bn2.default(TEN_POW_NINE));
   }
   return Number(amountLimit.toString());
 }
@@ -6536,20 +6556,38 @@ var AggregatorClient = class {
         }
       }
       const response = yield fetch(url);
-      const data = yield response.json();
-      if (data.data != null) {
-        const res = parseRouterResponse(data.data);
-        return res;
-      }
-      if (data.msg === "liquidity is not enough") {
+      if (!response.ok) {
         return {
           amountIn: ZERO,
           amountOut: ZERO,
           routes: [],
-          insufficientLiquidity: true
+          insufficientLiquidity: false,
+          error: {
+            code: 10001 /* NumberTooLarge */,
+            msg: getAggregatorServerErrorMessage(
+              10001 /* NumberTooLarge */
+            )
+          }
         };
       }
-      return null;
+      const data = yield response.json();
+      if (data.data != null) {
+        const res = parseRouterResponse(data.data);
+        return res;
+      }
+      const insufficientLiquidity = data.msg === "liquidity is not enough";
+      return {
+        amountIn: ZERO,
+        amountOut: ZERO,
+        routes: [],
+        insufficientLiquidity,
+        error: {
+          code: 10003 /* InsufficientLiquidity */,
+          msg: getAggregatorServerErrorMessage(
+            10003 /* InsufficientLiquidity */
+          )
+        }
+      };
     });
   }
   swapInPools(params) {
@@ -6674,9 +6712,8 @@ var AggregatorClient = class {
       return res;
     });
   }
-  sdevInspectTransactionBlock(txb) {
+  devInspectTransactionBlock(txb) {
     return __async(this, null, function* () {
-      console.log(this.wallet);
       const res = yield this.client.devInspectTransactionBlock({
         transactionBlock: txb,
         sender: this.wallet
@@ -6796,6 +6833,7 @@ exports.RepayFlashSwapWithPartnerFunc = RepayFlashSwapWithPartnerFunc;
 exports.SWAP_A2B_FUNC = SWAP_A2B_FUNC;
 exports.SWAP_B2A_FUNC = SWAP_B2A_FUNC;
 exports.SuiZeroCoinFn = SuiZeroCoinFn;
+exports.TEN_POW_NINE = TEN_POW_NINE;
 exports.TESTNET_AFTERMATH_INSURANCE_FUND_ID = TESTNET_AFTERMATH_INSURANCE_FUND_ID;
 exports.TESTNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID = TESTNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID;
 exports.TESTNET_AFTERMATH_REFERRAL_VAULT_ID = TESTNET_AFTERMATH_REFERRAL_VAULT_ID;

package/dist/index.mjs

@@ -5316,6 +5316,7 @@ var TWO = new import_bn.default(2);
 var U128 = TWO.pow(new import_bn.default(128));
 var U64_MAX_BN = new import_bn.default("18446744073709551615");
 var U64_MAX = "18446744073709551615";
+var TEN_POW_NINE = 1e9;
 var MAINNET_FLOWX_AMM_CONTAINER_ID = "0xb65dcbf63fd3ad5d0ebfbf334780dc9f785eff38a4459e37ab08fa79576ee511";
 var TESTNET_FLOWX_AMM_CONTAINER_ID = "";
 var TURBOS_VERSIONED = "0xf1cf0e81048df168ebeb1b8030fad24b3e0b53ae827c25053fff0779c1445b6f";
@@ -5329,6 +5330,22 @@ var MAINNET_AFTERMATH_INSURANCE_FUND_ID = "0xf0c40d67b078000e18032334c3325c47b9e
 var TESTNET_AFTERMATH_INSURANCE_FUND_ID = "";
 var MAINNET_AFTERMATH_REFERRAL_VAULT_ID = "0x35d35b0e5b177593d8c3a801462485572fc30861e6ce96a55af6dc4730709278";
 var TESTNET_AFTERMATH_REFERRAL_VAULT_ID = "";
+
+// src/errors.ts
+function getAggregatorServerErrorMessage(code) {
+  switch (code) {
+    case 1e4 /* CalculateError */:
+      return "Calculate error";
+    case 10001 /* NumberTooLarge */:
+      return "Input number too large can not fit in target type";
+    case 10002 /* NoRouter */:
+      return "No router";
+    case 10003 /* InsufficientLiquidity */:
+      return "Insufficient Liquidity";
+    default:
+      return "Unknown error";
+  }
+}
 function mintZeroCoin(txb, coinType) {
   return txb.moveCall({
     target: SuiZeroCoinFn,
@@ -5345,7 +5362,10 @@ function buildInputCoin(txb, allCoins, amount, coinType) {
       targetCoinAmount: 0
     };
   }
+  console.log("used coin asests", usedCoinAsests);
   let totalCoinBalance = CoinUtils.calculateTotalBalance(usedCoinAsests);
+  console.log("totalCoinBalance", totalCoinBalance);
+  console.log("amount", amount);
   if (totalCoinBalance < amount) {
     throw new AggregateError(
       "Insufficient balance when build merge coin",
@@ -5839,9 +5859,9 @@ var import_bn2 = __toESM(require_bn());
 function CalculateAmountLimit(expectAmount, byAmountIn, slippage) {
   let amountLimit = ZERO;
   if (byAmountIn) {
-    amountLimit = expectAmount.muln(1 - slippage);
+    amountLimit = expectAmount.mul(new import_bn2.default(TEN_POW_NINE - slippage * TEN_POW_NINE)).div(new import_bn2.default(TEN_POW_NINE));
   } else {
-    amountLimit = expectAmount.muln(1 + slippage);
+    amountLimit = expectAmount.mul(new import_bn2.default(TEN_POW_NINE + slippage * TEN_POW_NINE)).div(new import_bn2.default(TEN_POW_NINE));
   }
   return Number(amountLimit.toString());
 }
@@ -6534,20 +6554,38 @@ var AggregatorClient = class {
         }
       }
       const response = yield fetch(url);
-      const data = yield response.json();
-      if (data.data != null) {
-        const res = parseRouterResponse(data.data);
-        return res;
-      }
-      if (data.msg === "liquidity is not enough") {
+      if (!response.ok) {
         return {
           amountIn: ZERO,
           amountOut: ZERO,
           routes: [],
-          insufficientLiquidity: true
+          insufficientLiquidity: false,
+          error: {
+            code: 10001 /* NumberTooLarge */,
+            msg: getAggregatorServerErrorMessage(
+              10001 /* NumberTooLarge */
+            )
+          }
         };
       }
-      return null;
+      const data = yield response.json();
+      if (data.data != null) {
+        const res = parseRouterResponse(data.data);
+        return res;
+      }
+      const insufficientLiquidity = data.msg === "liquidity is not enough";
+      return {
+        amountIn: ZERO,
+        amountOut: ZERO,
+        routes: [],
+        insufficientLiquidity,
+        error: {
+          code: 10003 /* InsufficientLiquidity */,
+          msg: getAggregatorServerErrorMessage(
+            10003 /* InsufficientLiquidity */
+          )
+        }
+      };
     });
   }
   swapInPools(params) {
@@ -6672,9 +6710,8 @@ var AggregatorClient = class {
       return res;
     });
   }
-  sdevInspectTransactionBlock(txb) {
+  devInspectTransactionBlock(txb) {
     return __async(this, null, function* () {
-      console.log(this.wallet);
       const res = yield this.client.devInspectTransactionBlock({
         transactionBlock: txb,
         sender: this.wallet
@@ -6744,4 +6781,4 @@ decimal.js/decimal.mjs:
    *)
 */
 
-export { AFTERMATH_AMM, AFTERMATH_MODULE, AGGREGATOR, AggregatorClient, AggregatorConfig, CETUS_DEX, CETUS_MODULE, CETUS_PUBLISHED_AT, CHECK_COINS_THRESHOLD_FUNC, CLOCK_ADDRESS, CoinInfoAddress, CoinStoreAddress, DEEPBOOK_CLOB_V2_MODULE, DEEPBOOK_CUSTODIAN_V2_MODULE, DEEPBOOK_DEX, DEEPBOOK_MODULE, DEEPBOOK_PACKAGE_ID, DEEPBOOK_PUBLISHED_AT, ENV, FLOWX_AMM, FLOWX_AMM_MODULE, FlashSwapA2BFunc, FlashSwapB2AFunc, FlashSwapFunc, FlashSwapWithPartnerA2BFunc, FlashSwapWithPartnerB2AFunc, FlashSwapWithPartnerFunc, INTEGRATE, JOIN_FUNC, KRIYA_DEX, KRIYA_MODULE, MAINNET_AFTERMATH_INSURANCE_FUND_ID, MAINNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID, MAINNET_AFTERMATH_REFERRAL_VAULT_ID, MAINNET_AFTERMATH_REGISTRY_ID, MAINNET_AFTERMATH_TREASURY_ID, MAINNET_CETUS_GLOBAL_CONFIG_ID, MAINNET_FLOWX_AMM_CONTAINER_ID, ONE, PAY_MODULE, POOL_MODULT, REPAY_FLASH_SWAP_A2B_FUNC, REPAY_FLASH_SWAP_B2A_FUNC, REPAY_FLASH_SWAP_WITH_PARTNER_A2B_FUNC, REPAY_FLASH_SWAP_WITH_PARTNER_B2A_FUNC, RepayFalshSwapFunc, RepayFlashSwapWithPartnerFunc, SWAP_A2B_FUNC, SWAP_B2A_FUNC, SuiZeroCoinFn, TESTNET_AFTERMATH_INSURANCE_FUND_ID, TESTNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID, TESTNET_AFTERMATH_REFERRAL_VAULT_ID, TESTNET_AFTERMATH_REGISTRY_ID, TESTNET_AFTERMATH_TREASURY_ID, TESTNET_CETUS_GLOBAL_CONFIG_ID, TESTNET_FLOWX_AMM_CONTAINER_ID, TRANSFER_ACCOUNT_CAP, TRANSFER_OR_DESTORY_COIN_FUNC, TURBOS_DEX, TURBOS_MODULE, TURBOS_VERSIONED, TWO, U128, U64_MAX, U64_MAX_BN, UTILS_MODULE, ZERO, composeType, createTarget, expectInputRouterSwap, expectOutputRouterSwap, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId };
+export { AFTERMATH_AMM, AFTERMATH_MODULE, AGGREGATOR, AggregatorClient, AggregatorConfig, CETUS_DEX, CETUS_MODULE, CETUS_PUBLISHED_AT, CHECK_COINS_THRESHOLD_FUNC, CLOCK_ADDRESS, CoinInfoAddress, CoinStoreAddress, DEEPBOOK_CLOB_V2_MODULE, DEEPBOOK_CUSTODIAN_V2_MODULE, DEEPBOOK_DEX, DEEPBOOK_MODULE, DEEPBOOK_PACKAGE_ID, DEEPBOOK_PUBLISHED_AT, ENV, FLOWX_AMM, FLOWX_AMM_MODULE, FlashSwapA2BFunc, FlashSwapB2AFunc, FlashSwapFunc, FlashSwapWithPartnerA2BFunc, FlashSwapWithPartnerB2AFunc, FlashSwapWithPartnerFunc, INTEGRATE, JOIN_FUNC, KRIYA_DEX, KRIYA_MODULE, MAINNET_AFTERMATH_INSURANCE_FUND_ID, MAINNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID, MAINNET_AFTERMATH_REFERRAL_VAULT_ID, MAINNET_AFTERMATH_REGISTRY_ID, MAINNET_AFTERMATH_TREASURY_ID, MAINNET_CETUS_GLOBAL_CONFIG_ID, MAINNET_FLOWX_AMM_CONTAINER_ID, ONE, PAY_MODULE, POOL_MODULT, REPAY_FLASH_SWAP_A2B_FUNC, REPAY_FLASH_SWAP_B2A_FUNC, REPAY_FLASH_SWAP_WITH_PARTNER_A2B_FUNC, REPAY_FLASH_SWAP_WITH_PARTNER_B2A_FUNC, RepayFalshSwapFunc, RepayFlashSwapWithPartnerFunc, SWAP_A2B_FUNC, SWAP_B2A_FUNC, SuiZeroCoinFn, TEN_POW_NINE, TESTNET_AFTERMATH_INSURANCE_FUND_ID, TESTNET_AFTERMATH_PROTOCOL_FEE_VAULT_ID, TESTNET_AFTERMATH_REFERRAL_VAULT_ID, TESTNET_AFTERMATH_REGISTRY_ID, TESTNET_AFTERMATH_TREASURY_ID, TESTNET_CETUS_GLOBAL_CONFIG_ID, TESTNET_FLOWX_AMM_CONTAINER_ID, TRANSFER_ACCOUNT_CAP, TRANSFER_OR_DESTORY_COIN_FUNC, TURBOS_DEX, TURBOS_MODULE, TURBOS_VERSIONED, TWO, U128, U64_MAX, U64_MAX_BN, UTILS_MODULE, ZERO, composeType, createTarget, expectInputRouterSwap, expectOutputRouterSwap, extractAddressFromType, extractStructTagFromType, fixSuiObjectId, isSortedSymbols, normalizeCoinType, parseRouterResponse, patchFixSuiObjectId };

package/dist/src/client.d.ts

@@ -27,11 +27,16 @@ export type Router = {
     amountOut: BN;
     initialPrice: Decimal;
 };
+export type RouterError = {
+    code: number;
+    msg: string;
+};
 export type RouterData = {
     amountIn: BN;
     amountOut: BN;
     routes: Router[];
     insufficientLiquidity: boolean;
+    error?: RouterError;
 };
 export type AggregatorResponse = {
     code: number;
@@ -83,7 +88,7 @@ export declare class AggregatorClient {
     swapInPools(params: SwapInPoolsParams): Promise<SwapInPoolsResult | null>;
     routerSwap(params: BuildRouterSwapParams): Promise<Transaction>;
     signAndExecuteTransaction(txb: Transaction, signer: Signer): Promise<import("@mysten/sui/client").SuiTransactionBlockResponse>;
-    sdevInspectTransactionBlock(txb: Transaction): Promise<import("@mysten/sui/client").DevInspectResults>;
+    devInspectTransactionBlock(txb: Transaction): Promise<import("@mysten/sui/client").DevInspectResults>;
     sendTransaction(txb: Transaction, signer: Signer): Promise<import("@mysten/sui/client").SuiTransactionBlockResponse>;
 }
 export declare function parseRouterResponse(data: any): RouterData;

package/dist/src/const.d.ts

@@ -60,6 +60,7 @@ export declare const TWO: BN;
 export declare const U128: BN;
 export declare const U64_MAX_BN: BN;
 export declare const U64_MAX = "18446744073709551615";
+export declare const TEN_POW_NINE = 1000000000;
 export declare const MAINNET_FLOWX_AMM_CONTAINER_ID = "0xb65dcbf63fd3ad5d0ebfbf334780dc9f785eff38a4459e37ab08fa79576ee511";
 export declare const TESTNET_FLOWX_AMM_CONTAINER_ID = "";
 export declare const TURBOS_VERSIONED = "0xf1cf0e81048df168ebeb1b8030fad24b3e0b53ae827c25053fff0779c1445b6f";

package/dist/src/errors.d.ts

@@ -16,7 +16,7 @@ export declare enum TransactionErrorCode {
     MissTurbosFeeType = "MissTurbosFeeType",
     MissAftermathLpSupplyType = "MissAftermathLpSupplyType"
 }
-export type AggregatorErrorCode = TypesErrorCode;
+export type AggregatorErrorCode = TypesErrorCode | ConfigErrorCode | TransactionErrorCode;
 /**
  * AggregatorError is a custom error class that extends the built-in Error class. It is used to represent errors that occur during aggregation operations.
  * The key functionality of this code includes:
@@ -29,3 +29,10 @@ export declare class AggregatorError extends Error {
     constructor(message: string, errorCode?: AggregatorErrorCode);
     static isAggregatorErrorCode(e: any, code: AggregatorErrorCode): boolean;
 }
+export declare enum AggregatorServerErrorCode {
+    CalculateError = 10000,
+    NumberTooLarge = 10001,
+    NoRouter = 10002,
+    InsufficientLiquidity = 10003
+}
+export declare function getAggregatorServerErrorMessage(code: AggregatorServerErrorCode): string;

package/package.json

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

package/src/client.ts

@@ -17,6 +17,10 @@ import { swapInPools } from "./transaction/swap"
 import { completionCoin } from "./utils/coin"
 import { SUI_FRAMEWORK_ADDRESS } from "@mysten/sui/utils"
 import { AFTERMATH_AMM, JOIN_FUNC, PAY_MODULE, TURBOS_DEX, ZERO } from "./const"
+import {
+  AggregatorServerErrorCode,
+  getAggregatorServerErrorMessage,
+} from "./errors"
 
 export type ExtendedDetails = {
   aftermathPoolFlatness?: number
@@ -44,11 +48,17 @@ export type Router = {
   initialPrice: Decimal
 }
 
+export type RouterError = {
+  code: number
+  msg: string
+}
+
 export type RouterData = {
   amountIn: BN
   amountOut: BN
   routes: Router[]
   insufficientLiquidity: boolean
+  error?: RouterError
 }
 
 export type AggregatorResponse = {
@@ -184,6 +194,21 @@ export class AggregatorClient {
     }
 
     const response = await fetch(url)
+    if (!response.ok) {
+      return {
+        amountIn: ZERO,
+        amountOut: ZERO,
+        routes: [],
+        insufficientLiquidity: false,
+        error: {
+          code: AggregatorServerErrorCode.NumberTooLarge,
+          msg: getAggregatorServerErrorMessage(
+            AggregatorServerErrorCode.NumberTooLarge
+          ),
+        },
+      }
+    }
+
     const data = await response.json()
 
     if (data.data != null) {
@@ -191,15 +216,20 @@ export class AggregatorClient {
       return res
     }
 
-    if (data.msg === "liquidity is not enough") {
-      return {
-        amountIn: ZERO,
-        amountOut: ZERO,
-        routes: [],
-        insufficientLiquidity: true,
-      }
+    const insufficientLiquidity = data.msg === "liquidity is not enough"
+
+    return {
+      amountIn: ZERO,
+      amountOut: ZERO,
+      routes: [],
+      insufficientLiquidity,
+      error: {
+        code: AggregatorServerErrorCode.InsufficientLiquidity,
+        msg: getAggregatorServerErrorMessage(
+          AggregatorServerErrorCode.InsufficientLiquidity
+        ),
+      },
     }
-    return null
   }
 
   async swapInPools(
@@ -236,7 +266,6 @@ export class AggregatorClient {
     )
 
     const txb = new Transaction()
-    // txb.setGasBudget(42392686100000000)
 
     if (refreshAllCoins || this.allCoins.length === 0) {
       this.allCoins = await this.getAllCoins()
@@ -331,8 +360,7 @@ export class AggregatorClient {
     return res
   }
 
-  async sdevInspectTransactionBlock(txb: Transaction) {
-    console.log(this.wallet)
+  async devInspectTransactionBlock(txb: Transaction) {
     const res = await this.client.devInspectTransactionBlock({
       transactionBlock: txb,
       sender: this.wallet,

package/src/const.ts

@@ -102,6 +102,8 @@ export const U64_MAX_BN = new BN("18446744073709551615")
 
 export const U64_MAX = "18446744073709551615"
 
+export const TEN_POW_NINE = 1000000000
+
 export const MAINNET_FLOWX_AMM_CONTAINER_ID =
   "0xb65dcbf63fd3ad5d0ebfbf334780dc9f785eff38a4459e37ab08fa79576ee511"
 export const TESTNET_FLOWX_AMM_CONTAINER_ID = ""

package/src/errors.ts

@@ -19,7 +19,10 @@ export enum TransactionErrorCode {
   MissAftermathLpSupplyType = `MissAftermathLpSupplyType`,
 }
 
-export type AggregatorErrorCode = TypesErrorCode
+export type AggregatorErrorCode =
+  | TypesErrorCode
+  | ConfigErrorCode
+  | TransactionErrorCode
 
 /**
  * AggregatorError is a custom error class that extends the built-in Error class. It is used to represent errors that occur during aggregation operations.
@@ -42,3 +45,27 @@ export class AggregatorError extends Error {
     return e instanceof AggregatorError && e.errorCode === code
   }
 }
+
+export enum AggregatorServerErrorCode {
+  CalculateError = 10000,
+  NumberTooLarge = 10001,
+  NoRouter = 10002,
+  InsufficientLiquidity = 10003,
+}
+
+export function getAggregatorServerErrorMessage(
+  code: AggregatorServerErrorCode
+): string {
+  switch (code) {
+    case AggregatorServerErrorCode.CalculateError:
+      return "Calculate error"
+    case AggregatorServerErrorCode.NumberTooLarge:
+      return "Input number too large can not fit in target type"
+    case AggregatorServerErrorCode.NoRouter:
+      return "No router"
+    case AggregatorServerErrorCode.InsufficientLiquidity:
+      return "Insufficient Liquidity"
+    default:
+      return "Unknown error"
+  }
+}

package/src/math.ts

@@ -3,7 +3,7 @@
 // `byAmountIn` means fixed amount in or out.
 
 import BN from "bn.js"
-import { ZERO } from "./const"
+import { TEN_POW_NINE, ZERO } from "./const"
 import Decimal from "decimal.js"
 
 // `slippage` is a percentage, for example, 0.01 means 1%.
@@ -14,9 +14,13 @@ export function CalculateAmountLimit(
 ): number {
   let amountLimit = ZERO
   if (byAmountIn) {
-    amountLimit = expectAmount.muln(1 - slippage)
+    amountLimit = expectAmount
+      .mul(new BN(TEN_POW_NINE - slippage * TEN_POW_NINE))
+      .div(new BN(TEN_POW_NINE))
   } else {
-    amountLimit = expectAmount.muln(1 + slippage)
+    amountLimit = expectAmount
+      .mul(new BN(TEN_POW_NINE + slippage * TEN_POW_NINE))
+      .div(new BN(TEN_POW_NINE))
   }
 
   return Number(amountLimit.toString())

package/src/transaction/common.ts

@@ -51,7 +51,12 @@ export function buildInputCoin(
     }
   }
 
+  console.log("used coin asests", usedCoinAsests)
+
   let totalCoinBalance = CoinUtils.calculateTotalBalance(usedCoinAsests)
+
+  console.log("totalCoinBalance", totalCoinBalance)
+  console.log("amount", amount)
   if (totalCoinBalance < amount) {
     throw new AggregateError(
       "Insufficient balance when build merge coin",

package/tests/math.test.ts

@@ -1,5 +1,5 @@
-import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519"
-import { sqrtPriceX64ToPrice } from "~/math"
+import BN from "bn.js"
+import { CalculateAmountLimit, sqrtPriceX64ToPrice } from "~/math"
 
 describe("test math functions", () => {
   test("test sqrt price x64 to price", () => {
@@ -10,4 +10,12 @@ describe("test math functions", () => {
     const price = sqrtPriceX64ToPrice(sqrtPriceStr, decimalsA, decimalsB)
     console.log("price", price.toFixed(9))
   })
+
+  test("calculate amount limit", () => {
+    const amount = new BN(80017351)
+    const byAmountIn = true
+
+    const amountLimit = CalculateAmountLimit(amount, byAmountIn, 0.01)
+    console.log("amount limit", amountLimit.toString())
+  })
 })

package/tests/router.test.ts

@@ -16,6 +16,7 @@ import { printTransaction } from "~/utils/transaction"
 import BN from "bn.js"
 import { fromHEX } from "@mysten/bcs"
 import { fromB64 } from "@mysten/sui/utils"
+import { getFullnodeUrl } from "@mysten/sui/dist/cjs/client"
 
 dotenv.config()
 
@@ -42,13 +43,13 @@ describe("router module", () => {
     const byte = Buffer.from(secret, "base64")
     const u8Array = new Uint8Array(byte)
 
-    keypair = Ed25519Keypair.fromSecretKey(fromB64(secret).slice(1, 33))
+    // keypair = Ed25519Keypair.fromSecretKey(fromB64(secret).slice(1, 33))
 
-    const wallet = keypair.getPublicKey().toSuiAddress()
-    console.log("wallet", wallet)
+    // const wallet = keypair.getPublicKey().toSuiAddress()
+    // console.log("wallet", wallet)
 
-    // const wallet =
-    // "0x1d30e55c730f92a02a33dbdf6b052cd178e5d924aa58c5e2350a24852250ae58"
+    const wallet =
+      "0xfba94aa36e93ccc7d84a6a57040fc51983223f1b522a8d0be3c3bf2c98977ebb"
     // const wallet = "0xaabf2fedcb36146db164bec930b74a47969c4df98216e049342a3c49b6d11580"
     // const wallet = "0x410456cfc689666936b6bf80fbec958b69499b9f7183ecba07de577c17248a44"
     // const wallet = "0xca171941521153181ff729d53489eaae7e99c3f4692884afd7cca61154e4cec4"
@@ -110,7 +111,7 @@ describe("router module", () => {
   })
 
   test("Find router", async () => {
-    const amount = "42392676100000000"
+    const amount = "423926761000000000000000000000"
 
     const res = await client.findRouter({
       from: M_SUI,
@@ -134,10 +135,10 @@ describe("router module", () => {
 
   test("Build router tx", async () => {
     const byAmountIn = true
-    const amount = "42392676100000000"
+    const amount = "1000000"
 
-    const from = M_SUI
-    const target = M_USDC
+    const from = M_USDC
+    const target = M_SUI
 
     const res = await client.findRouter({
       from,
@@ -148,7 +149,7 @@ describe("router module", () => {
       splitAlgorithm: null,
       splitFactor: null,
       splitCount: null,
-      providers: ["CETUS"],
+      providers: ["CETUS", "DEEPBOOK", "AFTERMATH", "FLOWX", "KRIYA", "TURBOS"],
     })
 
     if (res != null) {
@@ -173,6 +174,8 @@ describe("router module", () => {
         refreshAllCoins: true,
       })
 
+      printTransaction(routerTx)
+
       let result = await client.devInspectTransactionBlock(routerTx)
 
       if (result.effects.status.status === "success") {