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

package/dist/index.d.cts

@@ -1,6 +1,7 @@
 import { ChainConfig, ClientConfig, Pool, BaseClient, OracleConfig, OracleAssetPair, InvertiblePrice, Price, RouterConfig, Address, BaseLiquidityDetails, Coin, PoolConfig, Asset, SwapParams, SwapResult } from '@bolt-liquidity-hq/core';
 import { SuiClient, SuiTransactionBlockResponse } from '@mysten/sui/client';
 import { Signer } from '@mysten/sui/cryptography';
+import { WalletContextState } from '@suiet/wallet-kit';
 import * as _mysten_bcs from '@mysten/bcs';
 import { BcsType } from '@mysten/bcs';
 
@@ -17,8 +18,10 @@ type BcsParsedMultiple<T extends readonly BcsType<any>[]> = {
 
 type SuiChainConfig = ChainConfig;
 
+type WalletSigner = WalletContextState;
+
 type SuiClientConfig = ClientConfig<SuiChainConfig> & {
-    signer?: Signer;
+    signer?: Signer | WalletSigner;
     suiClient?: SuiClient;
     customOverride?: ClientConfig<SuiChainConfig>['customOverride'] & {
         packageId?: string;
@@ -132,31 +135,9 @@ declare const PriceResponseStruct: _mysten_bcs.BcsStruct<{
         last_updated_ms: string | number | bigint;
         updater: string;
     } | null | undefined, `Option<${string}>`>;
+    is_inverted: _mysten_bcs.BcsType<boolean, boolean, "bool">;
 }, string>;
 type PriceResponseStructOutput = BcsParsed<typeof PriceResponseStruct>;
-declare const PricesResponsePaginatedStruct: _mysten_bcs.BcsStruct<{
-    total_count: _mysten_bcs.BcsType<string, string | number | bigint, "u64">;
-    has_next_page: _mysten_bcs.BcsType<boolean, boolean, "bool">;
-    next_cursor: _mysten_bcs.BcsType<string | null, string | null | undefined, "Option<string>">;
-    prices: _mysten_bcs.BcsType<{
-        price: {
-            price: string;
-            expiry: string;
-        };
-        last_updated_ms: string;
-        updater: string;
-    }[], Iterable<{
-        price: {
-            price: string | number | bigint;
-            expiry: string | number | bigint;
-        };
-        last_updated_ms: string | number | bigint;
-        updater: string;
-    }> & {
-        length: number;
-    }, string>;
-}, string>;
-type PricesResponsePaginatedStructOutput = BcsParsed<typeof PricesResponsePaginatedStruct>;
 
 declare const RouterConfigStruct: _mysten_bcs.BcsStruct<{
     admin: _mysten_bcs.BcsType<string, string, "address">;
@@ -329,7 +310,7 @@ declare class BoltSuiClient extends BaseClient<Signer, SuiTransactionBlockRespon
     /**
      * Cached instance of the Signer for transaction execution
      */
-    signer?: Signer;
+    signer?: Signer | WalletSigner;
     /**
      * Instance of the Sui client to interact with the blockchain
      */
@@ -442,7 +423,7 @@ declare class BoltSuiClient extends BaseClient<Signer, SuiTransactionBlockRespon
      * const signer = client.getSigner(newSigner);
      * ```
      */
-    getSigner(newSigner?: Signer): Signer;
+    getSigner(newSigner?: Signer | WalletSigner): Signer | WalletSigner;
     /** @inheritdoc */
     getOracleConfig(): Promise<OracleConfig>;
     /** @inheritdoc */
@@ -513,7 +494,7 @@ declare class BoltSuiClient extends BaseClient<Signer, SuiTransactionBlockRespon
      * This implementation returns a SuiTransactionBlockResponse as the transaction output,
      * which includes details like gas costs, transaction effects, object changes, and events.
      */
-    swap(params: SwapParams, signer?: Signer): Promise<SwapResult<SuiTransactionBlockResponse>>;
+    swap(params: SwapParams, signer?: Signer | WalletSigner): Promise<SwapResult<SuiTransactionBlockResponse>>;
     /**
      * @inheritdoc
      *
@@ -542,7 +523,7 @@ declare class BoltSuiClient extends BaseClient<Signer, SuiTransactionBlockRespon
      * - The gasAdjustment parameter helps account for variations in actual execution
      * - Sui's gas model includes computation, storage, and storage rebates
      */
-    estimateSwapGasFees(params: SwapParams, signer?: Signer, gasAdjustment?: number): Promise<Coin | undefined>;
+    estimateSwapGasFees(params: SwapParams, signer?: Signer | WalletSigner, gasAdjustment?: number): Promise<Coin | undefined>;
     /**
      * Loads configuration from a remote URL for testnet environments.
      *
@@ -566,4 +547,4 @@ declare class BoltSuiClient extends BaseClient<Signer, SuiTransactionBlockRespon
     private loadConfigFromUrl;
 }
 
-export { AssetPairResponseStruct, type AssetPairResponseStructOutput, AssetPairStruct, type AssetPairStructOutput, AssetPairsResponseStruct, type AssetPairsResponseStructOutput, BaseLiquidityInfoStruct, type BaseLiquidityInfoStructOutput, BaseLiquidityResponseStruct, type BaseLiquidityResponseStructOutput, BcsAddressType, type BcsParsed, type BcsParsedMultiple, BoltSuiClient, MarketResponseStruct, type MarketResponseStructOutput, MarketStruct, type MarketStructOutput, MarketsResponsePaginatedStruct, type MarketsResponsePaginatedStructOutput, MarketsResponseStruct, type MarketsResponseStructOutput, OracleConfigStruct, type OracleConfigStructOutput, PaginationStruct, PoolFeesInfoStruct, type PoolFeesInfoStructOutput, PoolInfoStruct, type PoolInfoStructOutput, PriceDataStruct, type PriceDataStructOutput, PriceResponseStruct, type PriceResponseStructOutput, PricesResponsePaginatedStruct, type PricesResponsePaginatedStructOutput, ProtocolFeesInfoStruct, type ProtocolFeesInfoStructOutput, RawPairStruct, type RawPairStructOutput, RawPriceStruct, type RawPriceStructOutput, RouterConfigStruct, type RouterConfigStructOutput, type SuiChainConfig, type SuiClientConfig, TypeNameStruct, type TypeNameStructOutput };
+export { AssetPairResponseStruct, type AssetPairResponseStructOutput, AssetPairStruct, type AssetPairStructOutput, AssetPairsResponseStruct, type AssetPairsResponseStructOutput, BaseLiquidityInfoStruct, type BaseLiquidityInfoStructOutput, BaseLiquidityResponseStruct, type BaseLiquidityResponseStructOutput, BcsAddressType, type BcsParsed, type BcsParsedMultiple, BoltSuiClient, MarketResponseStruct, type MarketResponseStructOutput, MarketStruct, type MarketStructOutput, MarketsResponsePaginatedStruct, type MarketsResponsePaginatedStructOutput, MarketsResponseStruct, type MarketsResponseStructOutput, OracleConfigStruct, type OracleConfigStructOutput, PaginationStruct, PoolFeesInfoStruct, type PoolFeesInfoStructOutput, PoolInfoStruct, type PoolInfoStructOutput, PriceDataStruct, type PriceDataStructOutput, PriceResponseStruct, type PriceResponseStructOutput, ProtocolFeesInfoStruct, type ProtocolFeesInfoStructOutput, RawPairStruct, type RawPairStructOutput, RawPriceStruct, type RawPriceStructOutput, RouterConfigStruct, type RouterConfigStructOutput, type SuiChainConfig, type SuiClientConfig, TypeNameStruct, type TypeNameStructOutput, type WalletSigner };

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { ChainConfig, ClientConfig, Pool, BaseClient, OracleConfig, OracleAssetPair, InvertiblePrice, Price, RouterConfig, Address, BaseLiquidityDetails, Coin, PoolConfig, Asset, SwapParams, SwapResult } from '@bolt-liquidity-hq/core';
 import { SuiClient, SuiTransactionBlockResponse } from '@mysten/sui/client';
 import { Signer } from '@mysten/sui/cryptography';
+import { WalletContextState } from '@suiet/wallet-kit';
 import * as _mysten_bcs from '@mysten/bcs';
 import { BcsType } from '@mysten/bcs';
 
@@ -17,8 +18,10 @@ type BcsParsedMultiple<T extends readonly BcsType<any>[]> = {
 
 type SuiChainConfig = ChainConfig;
 
+type WalletSigner = WalletContextState;
+
 type SuiClientConfig = ClientConfig<SuiChainConfig> & {
-    signer?: Signer;
+    signer?: Signer | WalletSigner;
     suiClient?: SuiClient;
     customOverride?: ClientConfig<SuiChainConfig>['customOverride'] & {
         packageId?: string;
@@ -132,31 +135,9 @@ declare const PriceResponseStruct: _mysten_bcs.BcsStruct<{
         last_updated_ms: string | number | bigint;
         updater: string;
     } | null | undefined, `Option<${string}>`>;
+    is_inverted: _mysten_bcs.BcsType<boolean, boolean, "bool">;
 }, string>;
 type PriceResponseStructOutput = BcsParsed<typeof PriceResponseStruct>;
-declare const PricesResponsePaginatedStruct: _mysten_bcs.BcsStruct<{
-    total_count: _mysten_bcs.BcsType<string, string | number | bigint, "u64">;
-    has_next_page: _mysten_bcs.BcsType<boolean, boolean, "bool">;
-    next_cursor: _mysten_bcs.BcsType<string | null, string | null | undefined, "Option<string>">;
-    prices: _mysten_bcs.BcsType<{
-        price: {
-            price: string;
-            expiry: string;
-        };
-        last_updated_ms: string;
-        updater: string;
-    }[], Iterable<{
-        price: {
-            price: string | number | bigint;
-            expiry: string | number | bigint;
-        };
-        last_updated_ms: string | number | bigint;
-        updater: string;
-    }> & {
-        length: number;
-    }, string>;
-}, string>;
-type PricesResponsePaginatedStructOutput = BcsParsed<typeof PricesResponsePaginatedStruct>;
 
 declare const RouterConfigStruct: _mysten_bcs.BcsStruct<{
     admin: _mysten_bcs.BcsType<string, string, "address">;
@@ -329,7 +310,7 @@ declare class BoltSuiClient extends BaseClient<Signer, SuiTransactionBlockRespon
     /**
      * Cached instance of the Signer for transaction execution
      */
-    signer?: Signer;
+    signer?: Signer | WalletSigner;
     /**
      * Instance of the Sui client to interact with the blockchain
      */
@@ -442,7 +423,7 @@ declare class BoltSuiClient extends BaseClient<Signer, SuiTransactionBlockRespon
      * const signer = client.getSigner(newSigner);
      * ```
      */
-    getSigner(newSigner?: Signer): Signer;
+    getSigner(newSigner?: Signer | WalletSigner): Signer | WalletSigner;
     /** @inheritdoc */
     getOracleConfig(): Promise<OracleConfig>;
     /** @inheritdoc */
@@ -513,7 +494,7 @@ declare class BoltSuiClient extends BaseClient<Signer, SuiTransactionBlockRespon
      * This implementation returns a SuiTransactionBlockResponse as the transaction output,
      * which includes details like gas costs, transaction effects, object changes, and events.
      */
-    swap(params: SwapParams, signer?: Signer): Promise<SwapResult<SuiTransactionBlockResponse>>;
+    swap(params: SwapParams, signer?: Signer | WalletSigner): Promise<SwapResult<SuiTransactionBlockResponse>>;
     /**
      * @inheritdoc
      *
@@ -542,7 +523,7 @@ declare class BoltSuiClient extends BaseClient<Signer, SuiTransactionBlockRespon
      * - The gasAdjustment parameter helps account for variations in actual execution
      * - Sui's gas model includes computation, storage, and storage rebates
      */
-    estimateSwapGasFees(params: SwapParams, signer?: Signer, gasAdjustment?: number): Promise<Coin | undefined>;
+    estimateSwapGasFees(params: SwapParams, signer?: Signer | WalletSigner, gasAdjustment?: number): Promise<Coin | undefined>;
     /**
      * Loads configuration from a remote URL for testnet environments.
      *
@@ -566,4 +547,4 @@ declare class BoltSuiClient extends BaseClient<Signer, SuiTransactionBlockRespon
     private loadConfigFromUrl;
 }
 
-export { AssetPairResponseStruct, type AssetPairResponseStructOutput, AssetPairStruct, type AssetPairStructOutput, AssetPairsResponseStruct, type AssetPairsResponseStructOutput, BaseLiquidityInfoStruct, type BaseLiquidityInfoStructOutput, BaseLiquidityResponseStruct, type BaseLiquidityResponseStructOutput, BcsAddressType, type BcsParsed, type BcsParsedMultiple, BoltSuiClient, MarketResponseStruct, type MarketResponseStructOutput, MarketStruct, type MarketStructOutput, MarketsResponsePaginatedStruct, type MarketsResponsePaginatedStructOutput, MarketsResponseStruct, type MarketsResponseStructOutput, OracleConfigStruct, type OracleConfigStructOutput, PaginationStruct, PoolFeesInfoStruct, type PoolFeesInfoStructOutput, PoolInfoStruct, type PoolInfoStructOutput, PriceDataStruct, type PriceDataStructOutput, PriceResponseStruct, type PriceResponseStructOutput, PricesResponsePaginatedStruct, type PricesResponsePaginatedStructOutput, ProtocolFeesInfoStruct, type ProtocolFeesInfoStructOutput, RawPairStruct, type RawPairStructOutput, RawPriceStruct, type RawPriceStructOutput, RouterConfigStruct, type RouterConfigStructOutput, type SuiChainConfig, type SuiClientConfig, TypeNameStruct, type TypeNameStructOutput };
+export { AssetPairResponseStruct, type AssetPairResponseStructOutput, AssetPairStruct, type AssetPairStructOutput, AssetPairsResponseStruct, type AssetPairsResponseStructOutput, BaseLiquidityInfoStruct, type BaseLiquidityInfoStructOutput, BaseLiquidityResponseStruct, type BaseLiquidityResponseStructOutput, BcsAddressType, type BcsParsed, type BcsParsedMultiple, BoltSuiClient, MarketResponseStruct, type MarketResponseStructOutput, MarketStruct, type MarketStructOutput, MarketsResponsePaginatedStruct, type MarketsResponsePaginatedStructOutput, MarketsResponseStruct, type MarketsResponseStructOutput, OracleConfigStruct, type OracleConfigStructOutput, PaginationStruct, PoolFeesInfoStruct, type PoolFeesInfoStructOutput, PoolInfoStruct, type PoolInfoStructOutput, PriceDataStruct, type PriceDataStructOutput, PriceResponseStruct, type PriceResponseStructOutput, ProtocolFeesInfoStruct, type ProtocolFeesInfoStructOutput, RawPairStruct, type RawPairStructOutput, RawPriceStruct, type RawPriceStructOutput, RouterConfigStruct, type RouterConfigStructOutput, type SuiChainConfig, type SuiClientConfig, TypeNameStruct, type TypeNameStructOutput, type WalletSigner };

package/dist/index.js

@@ -5,11 +5,15 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 // src/lib/client.ts
 import { BaseClient, MissingParameterError as MissingParameterError2 } from "@bolt-liquidity-hq/core";
 import { SuiClient } from "@mysten/sui/client";
-import { normalizeStructTag as normalizeStructTag5 } from "@mysten/sui/utils";
+import { normalizeStructTag as normalizeStructTag7 } from "@mysten/sui/utils";
 import axios from "axios";
 
+// src/config/common.ts
+import { normalizeStructTag, SUI_TYPE_ARG } from "@mysten/sui/utils";
+var SUI_TOKEN_DENOM = normalizeStructTag(SUI_TYPE_ARG);
+
 // src/config/mainnet.ts
-import { SUI_DECIMALS, SUI_TYPE_ARG } from "@mysten/sui/utils";
+import { SUI_DECIMALS } from "@mysten/sui/utils";
 var MainnetChainConfig = {
   name: "Sui",
   id: "101",
@@ -21,13 +25,13 @@ var MainnetContracts = {
 };
 var MainnetPackageId = "0x...";
 var MainnetPoolGlobalConfigId = "0x...";
-var MainnetNativeTokenDenom = SUI_TYPE_ARG;
+var MainnetNativeTokenDenom = SUI_TOKEN_DENOM;
 var MainnetAssets = {
-  [SUI_TYPE_ARG]: {
+  [SUI_TOKEN_DENOM]: {
     symbol: "SUI",
     name: "Sui",
     chainId: "101",
-    denom: SUI_TYPE_ARG,
+    denom: SUI_TOKEN_DENOM,
     decimals: SUI_DECIMALS,
     logo: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/sui/info/logo.png",
     coingeckoId: "sui"
@@ -45,7 +49,7 @@ var MainnetAssets = {
 var MainnetPools = [];
 
 // src/config/testnet.ts
-import { SUI_DECIMALS as SUI_DECIMALS2, SUI_TYPE_ARG as SUI_TYPE_ARG2 } from "@mysten/sui/utils";
+import { SUI_DECIMALS as SUI_DECIMALS2 } from "@mysten/sui/utils";
 var TestnetConfigUrl = "https://phi-labs-ltd.github.io/sui-outpost/testnet.json";
 var TestnetChainConfig = {
   name: "Sui Testnet",
@@ -58,14 +62,14 @@ var TestnetContracts = {
 };
 var TestnetPackageId = "";
 var TestnetPoolGlobalConfigId = "";
-var TestnetNativeTokenDenom = SUI_TYPE_ARG2;
+var TestnetNativeTokenDenom = SUI_TOKEN_DENOM;
 var TestnetHelperAssets = ["::test_btc::TEST_BTC", "::test_usdt::TEST_USDT"];
 var TestnetAssets = {
-  [SUI_TYPE_ARG2]: {
+  [SUI_TOKEN_DENOM]: {
     symbol: "SUI",
     name: "Sui",
     chainId: "103",
-    denom: SUI_TYPE_ARG2,
+    denom: SUI_TOKEN_DENOM,
     decimals: SUI_DECIMALS2,
     logo: "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/sui/info/logo.png",
     coingeckoId: "sui"
@@ -85,7 +89,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": {
@@ -94,7 +98,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"
   }
 };
@@ -140,7 +144,7 @@ var parseDevInspectResult = (result, bcsType, resultIndex = 0, returnValueIndex
 
 // src/lib/helpers/coin-manager.ts
 import { InsufficientFundsError, MissingParameterError } from "@bolt-liquidity-hq/core";
-import { SUI_TYPE_ARG as SUI_TYPE_ARG3 } from "@mysten/sui/utils";
+import { normalizeStructTag as normalizeStructTag2 } from "@mysten/sui/utils";
 var CoinManager = class {
   /**
    * Creates a new CoinManager instance.
@@ -507,7 +511,7 @@ var CoinManager = class {
    */
   async prepareCoinInput(tx, coinType, amount, options = {}, owner) {
     const ownerAddress = this.getOwnerAddress(owner);
-    if (coinType === SUI_TYPE_ARG3) {
+    if (normalizeStructTag2(coinType) === SUI_TOKEN_DENOM) {
       const [coin] = tx.splitCoins(tx.gas, [amount]);
       return coin;
     }
@@ -579,7 +583,7 @@ import {
 } from "@bolt-liquidity-hq/core";
 import { bcs as bcs2 } from "@mysten/bcs";
 import { Transaction as Transaction2 } from "@mysten/sui/transactions";
-import { normalizeStructTag, SUI_CLOCK_OBJECT_ID, SUI_TYPE_ARG as SUI_TYPE_ARG4 } from "@mysten/sui/utils";
+import { normalizeStructTag as normalizeStructTag3, SUI_CLOCK_OBJECT_ID } from "@mysten/sui/utils";
 import { BigNumber } from "bignumber.js";
 var buildSwapTxArgs = async (client, swapParams, signer) => {
   const { assetIn, amountIn, assetOut, minimumAmountOut, receiver } = swapParams;
@@ -587,14 +591,16 @@ var buildSwapTxArgs = async (client, swapParams, signer) => {
   if (!pool) {
     throw new NotFoundError(`Pool for the pair ${assetIn}/${assetOut}`);
   }
-  const isSell = normalizeStructTag(assetIn) === pool.baseDenom;
+  const isSell = normalizeStructTag3(assetIn) === pool.baseDenom;
   const FUNCTION_NAME = isSell ? "swap_sell" : "swap_buy";
   const finalSigner = client.getSigner(signer);
   const tx = new Transaction2();
-  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,
@@ -602,7 +608,7 @@ var buildSwapTxArgs = async (client, swapParams, signer) => {
       SUI_CLOCK_OBJECT_ID,
       coinInput,
       bcs2.u64().serialize(amountIn),
-      bcs2.option(bcs2.string()).serialize(minimumAmountOut),
+      bcs2.option(bcs2.u64()).serialize(minimumAmountOut),
       bcs2.option(bcs2.string()).serialize(receiver)
     ],
     typeArguments: [isSell ? assetIn : assetOut, isSell ? assetOut : assetIn],
@@ -621,15 +627,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 TransactionFailedError2(result.digest, result.effects?.status.error, { result });
+      }
     } else {
-      throw new TransactionFailedError2(result.digest, result.effects?.status.error, { result });
+      const result = await signer.signAndExecuteTransaction({
+        transaction: tx
+      });
+      if (!result.digest) {
+        throw new TransactionFailedError2("not found");
+      }
+      const fullTx = await suiClient.waitForTransaction({
+        digest: result.digest,
+        options
+      });
+      return fullTx;
     }
   } catch (error) {
     throw UnexpectedError2.from(error, "Failed to execute transaction", {
@@ -672,13 +692,20 @@ var estimateTxGasPrice = async (suiClient, senderAddress, target, args, typeArgu
     const totalGasCost = BigNumber(gasUsed.computationCost).plus(gasUsed.storageCost).minus(gasUsed.storageRebate);
     const adjustedGasCost = totalGasCost.times(gasAdjustment);
     return {
-      denom: SUI_TYPE_ARG4,
+      denom: SUI_TOKEN_DENOM,
       amount: adjustedGasCost.toFixed(0, BigNumber.ROUND_CEIL)
     };
   } catch {
     return;
   }
 };
+var getSignerAddress = (signer) => {
+  const address = "address" in signer ? signer.address : signer.toSuiAddress?.();
+  if (!address) {
+    throw new NotFoundError("Signer account's address");
+  }
+  return address;
+};
 
 // src/lib/oracle/parsers.ts
 import { InvalidObjectError as InvalidObjectError2 } from "@bolt-liquidity-hq/core";
@@ -713,20 +740,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: BigNumber2(output.price.expiry).times(1e6).toFixed(),
-    isInverse: false
+    isInverse: isInverted ?? false
   };
 };
 var parsePriceResponseStructOutput = (output, baseDenom, quoteDenom) => {
   if (!output.pair_data) {
     throw new InvalidObjectError2("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
@@ -789,11 +816,8 @@ var PriceDataStruct = bcs4.struct("PriceData", {
   updater: BcsAddressType
 });
 var PriceResponseStruct = bcs4.struct("PriceResponse", {
-  pair_data: bcs4.option(PriceDataStruct)
-});
-var PricesResponsePaginatedStruct = bcs4.struct("PricesResponsePaginated", {
-  prices: bcs4.vector(PriceDataStruct),
-  ...PaginationStruct
+  pair_data: bcs4.option(PriceDataStruct),
+  is_inverted: bcs4.bool()
 });
 
 // src/types/router.ts
@@ -863,13 +887,19 @@ var getAssetPairs = async (client) => {
 };
 
 // src/lib/oracle/get-assets.ts
-import { normalizeStructTag as normalizeStructTag2 } from "@mysten/sui/utils";
+import { normalizeStructTag as normalizeStructTag4 } from "@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[normalizeStructTag4(item.base.symbol)] = {
+      ...item.base,
+      symbol: normalizeStructTag4(item.base.symbol)
+    };
+    uniqueOracleAssets[normalizeStructTag4(item.quote.symbol)] = {
+      ...item.quote,
+      symbol: normalizeStructTag4(item.quote.symbol)
+    };
   }
   return Object.values(uniqueOracleAssets).map(
     (item) => client.assetsConfig[item.symbol] ?? // Fallback to minimal asset data from oracle
@@ -877,7 +907,7 @@ var getAssets = async (client) => {
       symbol: item.name,
       name: item.name,
       chainId: client.chainConfig.id,
-      denom: normalizeStructTag2(item.symbol),
+      denom: normalizeStructTag4(item.symbol),
       decimals: item.precision,
       logo: void 0,
       coingeckoId: void 0
@@ -912,7 +942,7 @@ var getPrice = async (client, baseDenom, quoteDenom) => {
 
 // src/lib/oracle/get-prices.ts
 import { NotFoundError as NotFoundError2 } from "@bolt-liquidity-hq/core";
-import { normalizeStructTag as normalizeStructTag3 } from "@mysten/sui/utils";
+import { normalizeStructTag as normalizeStructTag5 } from "@mysten/sui/utils";
 var getPrices = async (client) => {
   const oracleObject = await client.suiClient.getObject({
     id: client.contracts.oracle,
@@ -947,8 +977,8 @@ var getPrices = async (client) => {
         const pairKey = dynamicFields.data[index]?.name?.value;
         if (fields && pairKey) {
           prices.push({
-            baseDenom: normalizeStructTag3(pairKey.base.name),
-            quoteDenom: normalizeStructTag3(pairKey.quote.name),
+            baseDenom: normalizeStructTag5(pairKey.base.name),
+            quoteDenom: normalizeStructTag5(pairKey.quote.name),
             price: fields.price,
             expiryTime: fields.expiry
           });
@@ -967,7 +997,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,
@@ -993,9 +1023,9 @@ var getAllQuotesForUser = async (_client, _lpAddress) => {
 // src/lib/router/get-pool-by-denom.ts
 import { NotFoundError as NotFoundError3 } from "@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 NotFoundError3("Pool", `Didn't find a pool to swap ${baseDenom} for ${quoteDenom}`);
+    throw new NotFoundError3("Pool", `Didn't find a pool to swap ${quoteDenom} for ${baseDenom}`);
   }
   return result;
 };
@@ -1012,22 +1042,22 @@ var getRouterConfig = async (_client) => {
 };
 
 // src/lib/router/router-client/RouterClient.ts
-import { normalizeStructTag as normalizeStructTag4 } from "@mysten/sui/utils";
+import { normalizeStructTag as normalizeStructTag6 } from "@mysten/sui/utils";
 var RouterClient = class {
   constructor(pools) {
     this.pools = pools;
   }
   getPool(denomIn, denomOut) {
-    const normalizedDenomIn = normalizeStructTag4(denomIn);
-    const normalizedDenomOut = normalizeStructTag4(denomOut);
+    const normalizedDenomIn = normalizeStructTag6(denomIn);
+    const normalizedDenomOut = normalizeStructTag6(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;
@@ -1060,15 +1090,16 @@ var swapExactIn = async (client, swapParams, signer) => {
 };
 
 // src/lib/settlement/get-pool-info.ts
-import { SUI_TYPE_ARG as SUI_TYPE_ARG5 } from "@mysten/sui/utils";
+import { NotFoundError as NotFoundError4 } from "@bolt-liquidity-hq/core";
 
 // src/lib/settlement/parsers.ts
+import { BigNumber as BigNumber3 } from "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: BigNumber3(poolFeesInfo.swap_fee_pct).div(100).toFixed(),
+    lpFee: BigNumber3(poolFeesInfo.lp_fee_pct).div(100).toFixed(),
     allowanceMode: "allow",
     // Should come from pool config
     lps: routerClient.getPools().map((item) => item.poolAddress),
@@ -1081,22 +1112,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 NotFoundError4(`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
-      [SUI_TYPE_ARG5]
+      [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
-      [SUI_TYPE_ARG5]
+      [pool.baseDenom]
     )
   ]);
   const poolFeesInfoOutput = parseDevInspectResult(poolFeesInfo, PoolFeesInfoStruct);
@@ -1487,8 +1520,8 @@ var BoltSuiClient = class extends BaseClient {
       for (const item of pools) {
         this.routerClient.pools.push({
           poolAddress: item.pool_object_id,
-          baseDenom: normalizeStructTag5(item.base),
-          quoteDenoms: Object.values(assets).map((auxAsset) => normalizeStructTag5(auxAsset)).filter((auxAsset) => auxAsset !== normalizeStructTag5(item.base))
+          baseDenom: normalizeStructTag7(item.base),
+          quoteDenoms: Object.values(assets).map((auxAsset) => normalizeStructTag7(auxAsset)).filter((auxAsset) => auxAsset !== normalizeStructTag7(item.base))
         });
       }
     }
@@ -1513,7 +1546,6 @@ export {
   PoolInfoStruct,
   PriceDataStruct,
   PriceResponseStruct,
-  PricesResponsePaginatedStruct,
   ProtocolFeesInfoStruct,
   RawPairStruct,
   RawPriceStruct,