@bolt-liquidity-hq/sui-client 0.1.0-beta.13 → 0.1.0-beta.14

package/dist/index.cjs

@@ -49,7 +49,6 @@ __export(index_exports, {
   PoolInfoStruct: () => PoolInfoStruct,
   PriceDataStruct: () => PriceDataStruct,
   PriceResponseStruct: () => PriceResponseStruct,
-  PricesResponsePaginatedStruct: () => PricesResponsePaginatedStruct,
   ProtocolFeesInfoStruct: () => ProtocolFeesInfoStruct,
   RawPairStruct: () => RawPairStruct,
   RawPriceStruct: () => RawPriceStruct,
@@ -59,13 +58,17 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/lib/client.ts
-var import_core12 = require("@bolt-liquidity-hq/core");
+var import_core13 = require("@bolt-liquidity-hq/core");
 var import_client = require("@mysten/sui/client");
 var import_utils9 = require("@mysten/sui/utils");
 var import_axios = __toESM(require("axios"), 1);
 
-// src/config/mainnet.ts
+// src/config/common.ts
 var import_utils = require("@mysten/sui/utils");
+var SUI_TOKEN_DENOM = (0, import_utils.normalizeStructTag)(import_utils.SUI_TYPE_ARG);
+
+// src/config/mainnet.ts
+var import_utils2 = require("@mysten/sui/utils");
 var MainnetChainConfig = {
   name: "Sui",
   id: "101",
@@ -77,14 +80,14 @@ var MainnetContracts = {
 };
 var MainnetPackageId = "0x...";
 var MainnetPoolGlobalConfigId = "0x...";
-var MainnetNativeTokenDenom = import_utils.SUI_TYPE_ARG;
+var MainnetNativeTokenDenom = SUI_TOKEN_DENOM;
 var MainnetAssets = {
-  [import_utils.SUI_TYPE_ARG]: {
+  [SUI_TOKEN_DENOM]: {
     symbol: "SUI",
     name: "Sui",
     chainId: "101",
-    denom: import_utils.SUI_TYPE_ARG,
-    decimals: import_utils.SUI_DECIMALS,
+    denom: SUI_TOKEN_DENOM,
+    decimals: import_utils2.SUI_DECIMALS,
     logo: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/sui/info/logo.png",
     coingeckoId: "sui"
   },
@@ -101,7 +104,7 @@ var MainnetAssets = {
 var MainnetPools = [];
 
 // src/config/testnet.ts
-var import_utils2 = require("@mysten/sui/utils");
+var import_utils3 = require("@mysten/sui/utils");
 var TestnetConfigUrl = "https://phi-labs-ltd.github.io/sui-outpost/testnet.json";
 var TestnetChainConfig = {
   name: "Sui Testnet",
@@ -114,15 +117,15 @@ var TestnetContracts = {
 };
 var TestnetPackageId = "";
 var TestnetPoolGlobalConfigId = "";
-var TestnetNativeTokenDenom = import_utils2.SUI_TYPE_ARG;
+var TestnetNativeTokenDenom = SUI_TOKEN_DENOM;
 var TestnetHelperAssets = ["::test_btc::TEST_BTC", "::test_usdt::TEST_USDT"];
 var TestnetAssets = {
-  [import_utils2.SUI_TYPE_ARG]: {
+  [SUI_TOKEN_DENOM]: {
     symbol: "SUI",
     name: "Sui",
     chainId: "103",
-    denom: import_utils2.SUI_TYPE_ARG,
-    decimals: import_utils2.SUI_DECIMALS,
+    denom: SUI_TOKEN_DENOM,
+    decimals: import_utils3.SUI_DECIMALS,
     logo: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/sui/info/logo.png",
     coingeckoId: "sui"
   },
@@ -141,7 +144,7 @@ var TestnetAssets = {
     chainId: "103",
     denom: "::test_btc::TEST_BTC",
     decimals: 8,
-    logo: "https://github.com/cosmos/chain-registry/blob/master/_non-cosmos/bitcoin/images/btc.png",
+    logo: "https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/_non-cosmos/bitcoin/images/btc.svg",
     coingeckoId: "bitcoin"
   },
   "::test_usdt::TEST_USDT": {
@@ -150,7 +153,7 @@ var TestnetAssets = {
     chainId: "103",
     denom: "::test_usdt::TEST_USDT",
     decimals: 6,
-    logo: "https://github.com/cosmos/chain-registry/blob/master/_non-cosmos/ethereum/images/usdt.png",
+    logo: "https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/_non-cosmos/ethereum/images/usdt.svg",
     coingeckoId: "tether"
   }
 };
@@ -196,7 +199,7 @@ var parseDevInspectResult = (result, bcsType, resultIndex = 0, returnValueIndex
 
 // src/lib/helpers/coin-manager.ts
 var import_core2 = require("@bolt-liquidity-hq/core");
-var import_utils3 = require("@mysten/sui/utils");
+var import_utils4 = require("@mysten/sui/utils");
 var CoinManager = class {
   /**
    * Creates a new CoinManager instance.
@@ -563,7 +566,7 @@ var CoinManager = class {
    */
   async prepareCoinInput(tx, coinType, amount, options = {}, owner) {
     const ownerAddress = this.getOwnerAddress(owner);
-    if (coinType === import_utils3.SUI_TYPE_ARG) {
+    if ((0, import_utils4.normalizeStructTag)(coinType) === SUI_TOKEN_DENOM) {
       const [coin] = tx.splitCoins(tx.gas, [amount]);
       return coin;
     }
@@ -630,7 +633,7 @@ var queryDevInspect = async (suiClient, target, args, typeArguments, senderAddre
 var import_core4 = require("@bolt-liquidity-hq/core");
 var import_bcs2 = require("@mysten/bcs");
 var import_transactions2 = require("@mysten/sui/transactions");
-var import_utils4 = require("@mysten/sui/utils");
+var import_utils5 = require("@mysten/sui/utils");
 var import_bignumber = require("bignumber.js");
 var buildSwapTxArgs = async (client, swapParams, signer) => {
   const { assetIn, amountIn, assetOut, minimumAmountOut, receiver } = swapParams;
@@ -638,22 +641,24 @@ var buildSwapTxArgs = async (client, swapParams, signer) => {
   if (!pool) {
     throw new import_core4.NotFoundError(`Pool for the pair ${assetIn}/${assetOut}`);
   }
-  const isSell = (0, import_utils4.normalizeStructTag)(assetIn) === pool.baseDenom;
+  const isSell = (0, import_utils5.normalizeStructTag)(assetIn) === pool.baseDenom;
   const FUNCTION_NAME = isSell ? "swap_sell" : "swap_buy";
   const finalSigner = client.getSigner(signer);
   const tx = new import_transactions2.Transaction();
-  const coinManager = new CoinManager(client.suiClient, finalSigner.toSuiAddress());
+  const signerAddress = getSignerAddress(finalSigner);
+  const coinManager = new CoinManager(client.suiClient, signerAddress);
   const coinInput = await coinManager.prepareCoinInput(tx, assetIn, amountIn);
   return {
     signer: finalSigner,
+    signerAddress,
     target: [client.packageId, ROUTER_MODULE, FUNCTION_NAME],
     args: [
       pool.poolAddress,
       client.contracts.oracle,
-      import_utils4.SUI_CLOCK_OBJECT_ID,
+      import_utils5.SUI_CLOCK_OBJECT_ID,
       coinInput,
       import_bcs2.bcs.u64().serialize(amountIn),
-      import_bcs2.bcs.option(import_bcs2.bcs.string()).serialize(minimumAmountOut),
+      import_bcs2.bcs.option(import_bcs2.bcs.u64()).serialize(minimumAmountOut),
       import_bcs2.bcs.option(import_bcs2.bcs.string()).serialize(receiver)
     ],
     typeArguments: [isSell ? assetIn : assetOut, isSell ? assetOut : assetIn],
@@ -672,15 +677,29 @@ var signAndExecuteTx = async (suiClient, signer, target, args, typeArguments, tr
     typeArguments
   });
   try {
-    const result = await suiClient.signAndExecuteTransaction({
-      signer,
-      transaction: tx,
-      options
-    });
-    if (result.effects?.status.status === "success") {
-      return result;
+    if ("toSuiAddress" in signer) {
+      const result = await suiClient.signAndExecuteTransaction({
+        signer,
+        transaction: tx,
+        options
+      });
+      if (result.effects?.status.status === "success") {
+        return result;
+      } else {
+        throw new import_core4.TransactionFailedError(result.digest, result.effects?.status.error, { result });
+      }
     } else {
-      throw new import_core4.TransactionFailedError(result.digest, result.effects?.status.error, { result });
+      const result = await signer.signAndExecuteTransaction({
+        transaction: tx
+      });
+      if (!result.digest) {
+        throw new import_core4.TransactionFailedError("not found");
+      }
+      const fullTx = await suiClient.waitForTransaction({
+        digest: result.digest,
+        options
+      });
+      return fullTx;
     }
   } catch (error) {
     throw import_core4.UnexpectedError.from(error, "Failed to execute transaction", {
@@ -723,13 +742,20 @@ var estimateTxGasPrice = async (suiClient, senderAddress, target, args, typeArgu
     const totalGasCost = (0, import_bignumber.BigNumber)(gasUsed.computationCost).plus(gasUsed.storageCost).minus(gasUsed.storageRebate);
     const adjustedGasCost = totalGasCost.times(gasAdjustment);
     return {
-      denom: import_utils4.SUI_TYPE_ARG,
+      denom: SUI_TOKEN_DENOM,
       amount: adjustedGasCost.toFixed(0, import_bignumber.BigNumber.ROUND_CEIL)
     };
   } catch {
     return;
   }
 };
+var getSignerAddress = (signer) => {
+  const address = "address" in signer ? signer.address : signer.toSuiAddress?.();
+  if (!address) {
+    throw new import_core4.NotFoundError("Signer account's address");
+  }
+  return address;
+};
 
 // src/lib/oracle/parsers.ts
 var import_core5 = require("@bolt-liquidity-hq/core");
@@ -764,20 +790,20 @@ var parseAssetPairStructOutput = (output) => {
 var parseAssetPairsResponseStructOutput = (output) => {
   return output.map((item) => parseAssetPairStructOutput(item.info));
 };
-var parsePriceDataStructOutput = (output, baseDenom, quoteDenom) => {
+var parsePriceDataStructOutput = (output, baseDenom, quoteDenom, isInverted) => {
   return {
     baseDenom,
     quoteDenom,
     price: output.price.price,
     expiryTime: (0, import_bignumber2.BigNumber)(output.price.expiry).times(1e6).toFixed(),
-    isInverse: false
+    isInverse: isInverted ?? false
   };
 };
 var parsePriceResponseStructOutput = (output, baseDenom, quoteDenom) => {
   if (!output.pair_data) {
     throw new import_core5.InvalidObjectError("Can't find pair data price");
   }
-  return parsePriceDataStructOutput(output.pair_data, baseDenom, quoteDenom);
+  return parsePriceDataStructOutput(output.pair_data, baseDenom, quoteDenom, output.is_inverted);
 };
 
 // src/types/bcs.ts
@@ -840,11 +866,8 @@ var PriceDataStruct = import_bcs4.bcs.struct("PriceData", {
   updater: BcsAddressType
 });
 var PriceResponseStruct = import_bcs4.bcs.struct("PriceResponse", {
-  pair_data: import_bcs4.bcs.option(PriceDataStruct)
-});
-var PricesResponsePaginatedStruct = import_bcs4.bcs.struct("PricesResponsePaginated", {
-  prices: import_bcs4.bcs.vector(PriceDataStruct),
-  ...PaginationStruct
+  pair_data: import_bcs4.bcs.option(PriceDataStruct),
+  is_inverted: import_bcs4.bcs.bool()
 });
 
 // src/types/router.ts
@@ -914,13 +937,19 @@ var getAssetPairs = async (client) => {
 };
 
 // src/lib/oracle/get-assets.ts
-var import_utils5 = require("@mysten/sui/utils");
+var import_utils6 = require("@mysten/sui/utils");
 var getAssets = async (client) => {
   const assetPairs = await client.getAllOracleAssetPairs();
   const uniqueOracleAssets = {};
   for (const item of assetPairs) {
-    uniqueOracleAssets[item.base.symbol] = item.base;
-    uniqueOracleAssets[item.quote.symbol] = item.quote;
+    uniqueOracleAssets[(0, import_utils6.normalizeStructTag)(item.base.symbol)] = {
+      ...item.base,
+      symbol: (0, import_utils6.normalizeStructTag)(item.base.symbol)
+    };
+    uniqueOracleAssets[(0, import_utils6.normalizeStructTag)(item.quote.symbol)] = {
+      ...item.quote,
+      symbol: (0, import_utils6.normalizeStructTag)(item.quote.symbol)
+    };
   }
   return Object.values(uniqueOracleAssets).map(
     (item) => client.assetsConfig[item.symbol] ?? // Fallback to minimal asset data from oracle
@@ -928,7 +957,7 @@ var getAssets = async (client) => {
       symbol: item.name,
       name: item.name,
       chainId: client.chainConfig.id,
-      denom: (0, import_utils5.normalizeStructTag)(item.symbol),
+      denom: (0, import_utils6.normalizeStructTag)(item.symbol),
       decimals: item.precision,
       logo: void 0,
       coingeckoId: void 0
@@ -963,7 +992,7 @@ var getPrice = async (client, baseDenom, quoteDenom) => {
 
 // src/lib/oracle/get-prices.ts
 var import_core6 = require("@bolt-liquidity-hq/core");
-var import_utils6 = require("@mysten/sui/utils");
+var import_utils7 = require("@mysten/sui/utils");
 var getPrices = async (client) => {
   const oracleObject = await client.suiClient.getObject({
     id: client.contracts.oracle,
@@ -998,8 +1027,8 @@ var getPrices = async (client) => {
         const pairKey = dynamicFields.data[index]?.name?.value;
         if (fields && pairKey) {
           prices.push({
-            baseDenom: (0, import_utils6.normalizeStructTag)(pairKey.base.name),
-            quoteDenom: (0, import_utils6.normalizeStructTag)(pairKey.quote.name),
+            baseDenom: (0, import_utils7.normalizeStructTag)(pairKey.base.name),
+            quoteDenom: (0, import_utils7.normalizeStructTag)(pairKey.quote.name),
             price: fields.price,
             expiryTime: fields.expiry
           });
@@ -1018,7 +1047,7 @@ var estimateSwapExactInGasFees = async (client, swapParams, signer, gasAdjustmen
   const swapArgs = await buildSwapTxArgs(client, swapParams, signer);
   return await estimateTxGasPrice(
     client.suiClient,
-    swapArgs.signer.toSuiAddress(),
+    swapArgs.signerAddress,
     swapArgs.target,
     swapArgs.args,
     swapArgs.typeArguments,
@@ -1042,9 +1071,9 @@ var getAllQuotesForUser = async (_client, _lpAddress) => {
 // src/lib/router/get-pool-by-denom.ts
 var import_core10 = require("@bolt-liquidity-hq/core");
 var getPoolByDenom = async (client, baseDenom, quoteDenom) => {
-  const result = await client.routerClient.getPool(baseDenom, quoteDenom);
+  const result = await client.routerClient.getPool(quoteDenom, baseDenom);
   if (!result) {
-    throw new import_core10.NotFoundError("Pool", `Didn't find a pool to swap ${baseDenom} for ${quoteDenom}`);
+    throw new import_core10.NotFoundError("Pool", `Didn't find a pool to swap ${quoteDenom} for ${baseDenom}`);
   }
   return result;
 };
@@ -1061,22 +1090,22 @@ var getRouterConfig = async (_client) => {
 };
 
 // src/lib/router/router-client/RouterClient.ts
-var import_utils7 = require("@mysten/sui/utils");
+var import_utils8 = require("@mysten/sui/utils");
 var RouterClient = class {
   constructor(pools) {
     this.pools = pools;
   }
   getPool(denomIn, denomOut) {
-    const normalizedDenomIn = (0, import_utils7.normalizeStructTag)(denomIn);
-    const normalizedDenomOut = (0, import_utils7.normalizeStructTag)(denomOut);
+    const normalizedDenomIn = (0, import_utils8.normalizeStructTag)(denomIn);
+    const normalizedDenomOut = (0, import_utils8.normalizeStructTag)(denomOut);
     const directPairPool = this.pools.find(
-      (item) => item.baseDenom === normalizedDenomIn && item.quoteDenoms.includes(normalizedDenomOut)
+      (item) => item.baseDenom === normalizedDenomOut && item.quoteDenoms.includes(normalizedDenomIn)
     );
     if (directPairPool) {
       return directPairPool;
     }
     const inversePairPool = this.pools.find(
-      (item) => item.baseDenom === normalizedDenomOut && item.quoteDenoms.includes(normalizedDenomIn)
+      (item) => item.baseDenom === normalizedDenomIn && item.quoteDenoms.includes(normalizedDenomOut)
     );
     if (inversePairPool) {
       return inversePairPool;
@@ -1109,15 +1138,16 @@ var swapExactIn = async (client, swapParams, signer) => {
 };
 
 // src/lib/settlement/get-pool-info.ts
-var import_utils8 = require("@mysten/sui/utils");
+var import_core12 = require("@bolt-liquidity-hq/core");
 
 // src/lib/settlement/parsers.ts
+var import_bignumber3 = require("bignumber.js");
 var parseSettlementConfigStructOutput = (routerClient, poolFeesInfo, protocolFeesInfo, priceOracleContract) => {
   return {
     priceOracleContract,
     protocolFeeRecipient: protocolFeesInfo.bolt_fee_addr,
-    protocolFee: poolFeesInfo.swap_fee_pct,
-    lpFee: poolFeesInfo.lp_fee_pct,
+    protocolFee: (0, import_bignumber3.BigNumber)(poolFeesInfo.swap_fee_pct).div(100).toFixed(),
+    lpFee: (0, import_bignumber3.BigNumber)(poolFeesInfo.lp_fee_pct).div(100).toFixed(),
     allowanceMode: "allow",
     // Should come from pool config
     lps: routerClient.getPools().map((item) => item.poolAddress),
@@ -1130,22 +1160,24 @@ var parseSettlementConfigStructOutput = (routerClient, poolFeesInfo, protocolFee
 var getPoolInfo = async (client, contractAddress) => {
   const GET_POOL_FEES_INFO_FUNCTION = "get_pool_fees_info";
   const GET_PROTOCOL_FEES_INFO_FUNCTION = "get_protocol_fees_info";
+  const pool = client.routerClient.pools.find((item) => item.poolAddress === contractAddress);
+  if (!pool) {
+    throw new import_core12.NotFoundError(`Pool with the address ${contractAddress}`);
+  }
   const [poolFeesInfo, protocolFeesInfo] = await Promise.all([
     // Query pool fee information
     queryDevInspect(
       client.suiClient,
       [client.packageId, POOL_MODULE, GET_POOL_FEES_INFO_FUNCTION],
       [contractAddress],
-      // TODO: get the base token of the pool to pass it here instead of hardcoded SUI token
-      [import_utils8.SUI_TYPE_ARG]
+      [pool.baseDenom]
     ),
     // Query protocol fee information
     queryDevInspect(
       client.suiClient,
       [client.packageId, POOL_MODULE, GET_PROTOCOL_FEES_INFO_FUNCTION],
       [contractAddress],
-      // TODO: get the base token of the pool to pass it here instead of hardcoded SUI token
-      [import_utils8.SUI_TYPE_ARG]
+      [pool.baseDenom]
     )
   ]);
   const poolFeesInfoOutput = parseDevInspectResult(poolFeesInfo, PoolFeesInfoStruct);
@@ -1165,7 +1197,7 @@ var getPoolInfoByDenom = async (client, baseDenom, quoteDenom) => {
 };
 
 // src/lib/client.ts
-var BoltSuiClient = class extends import_core12.BaseClient {
+var BoltSuiClient = class extends import_core13.BaseClient {
   /**
    * Creates a new instance of the BoltSuiClient.
    *
@@ -1337,7 +1369,7 @@ var BoltSuiClient = class extends import_core12.BaseClient {
   getSigner(newSigner) {
     this.signer = newSigner ?? this.signer;
     if (!this.signer) {
-      throw new import_core12.MissingParameterError("signer");
+      throw new import_core13.MissingParameterError("signer");
     }
     return this.signer;
   }