@sodax/sdk 1.0.0-rc.3 → 1.0.0-rc.5

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { CHAIN_IDS, ICON_MAINNET_CHAIN_ID, spokeChainConfig, SUI_MAINNET_CHAIN_ID, STELLAR_MAINNET_CHAIN_ID, SOLANA_MAINNET_CHAIN_ID, ETHEREUM_MAINNET_CHAIN_ID, LIGHTLINK_MAINNET_CHAIN_ID, HYPEREVM_MAINNET_CHAIN_ID, NIBIRU_MAINNET_CHAIN_ID, POLYGON_MAINNET_CHAIN_ID, BSC_MAINNET_CHAIN_ID, OPTIMISM_MAINNET_CHAIN_ID, BASE_MAINNET_CHAIN_ID, ARBITRUM_MAINNET_CHAIN_ID, AVALANCHE_MAINNET_CHAIN_ID, SONIC_MAINNET_CHAIN_ID, defaultSodaxConfig, hubChainConfig, getIntentRelayChainId, getMoneyMarketConfig, getSolverConfig, ChainIdToIntentRelayChainId } from '@sodax/types';
+import { CHAIN_IDS, ICON_MAINNET_CHAIN_ID, spokeChainConfig, SUI_MAINNET_CHAIN_ID, STELLAR_MAINNET_CHAIN_ID, SOLANA_MAINNET_CHAIN_ID, ETHEREUM_MAINNET_CHAIN_ID, LIGHTLINK_MAINNET_CHAIN_ID, HYPEREVM_MAINNET_CHAIN_ID, POLYGON_MAINNET_CHAIN_ID, BSC_MAINNET_CHAIN_ID, OPTIMISM_MAINNET_CHAIN_ID, BASE_MAINNET_CHAIN_ID, ARBITRUM_MAINNET_CHAIN_ID, AVALANCHE_MAINNET_CHAIN_ID, SONIC_MAINNET_CHAIN_ID, defaultSodaxConfig, CONFIG_VERSION, hubChainConfig, getIntentRelayChainId, getMoneyMarketConfig, getSolverConfig, ChainIdToIntentRelayChainId } from '@sodax/types';
 export * from '@sodax/types';
 import { getAbiItem, defineChain, encodeAbiParameters, parseAbiParameters, fromHex, toHex, encodeFunctionData, erc20Abi as erc20Abi$1, encodePacked, parseEventLogs, keccak256, createPublicClient, http, decodeAbiParameters, isAddress } from 'viem';
-import { mainnet, lightlinkPhoenix, nibiru, polygon, bsc, optimism, base, arbitrum, avalanche, sonic } from 'viem/chains';
+import { mainnet, lightlinkPhoenix, polygon, bsc, optimism, base, arbitrum, avalanche, sonic } from 'viem/chains';
 import * as IconSdkRaw from 'icon-sdk-js';
 import { ChainGrpcWasmApi, TxGrpcApi, toBase64, fromBase64 } from '@injectivelabs/sdk-ts';
 import { getNetworkEndpoints, Network } from '@injectivelabs/networks';
@@ -6792,8 +6792,6 @@ function getEvmViemChain(id) {
       return bsc;
     case POLYGON_MAINNET_CHAIN_ID:
       return polygon;
-    case NIBIRU_MAINNET_CHAIN_ID:
-      return nibiru;
     case HYPEREVM_MAINNET_CHAIN_ID:
       return hyper;
     case LIGHTLINK_MAINNET_CHAIN_ID:
@@ -6869,9 +6867,16 @@ var ConfigService = class {
   }
   async initialize() {
     try {
-      this.sodaxConfig = await this.backendApiService.getAllConfig();
-      this.loadSodaxConfigDataStructures(this.sodaxConfig);
-      this.initialized = true;
+      const response = await this.backendApiService.getAllConfig();
+      if (!response.version || response.version < CONFIG_VERSION) {
+        console.warn(
+          `Dynamic config version is less than the current version, resorting to the default one. Current version: ${CONFIG_VERSION}, response version: ${response.version}`
+        );
+      } else {
+        this.sodaxConfig = response;
+        this.loadSodaxConfigDataStructures(this.sodaxConfig);
+        this.initialized = true;
+      }
       return {
         ok: true,
         value: void 0
@@ -7971,6 +7976,29 @@ var EvmVaultTokenService = class {
 var Erc20Service = class {
   constructor() {
   }
+  static async getErc20Token(token, publicClient) {
+    const [name, symbol, decimals] = await publicClient.multicall({
+      contracts: [
+        {
+          address: token,
+          abi: erc20Abi$1,
+          functionName: "name"
+        },
+        {
+          address: token,
+          abi: erc20Abi$1,
+          functionName: "symbol"
+        },
+        {
+          address: token,
+          abi: erc20Abi$1,
+          functionName: "decimals"
+        }
+      ],
+      allowFailure: false
+    });
+    return { name, symbol, decimals, address: token };
+  }
   /**
    * Check if spender has enough ERC20 allowance for given amount
    * @param token - ERC20 token address
@@ -9618,6 +9646,370 @@ function formatUserSummaryAndIncentives({
     calculatedUserIncentives
   };
 }
+
+// src/shared/abis/erc20-bnusd.abi.ts
+var erc20BnusdAbi = [
+  {
+    inputs: [{ internalType: "address", name: "admin", type: "address" }],
+    stateMutability: "nonpayable",
+    type: "constructor"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "address", name: "owner", type: "address" },
+      { indexed: true, internalType: "address", name: "spender", type: "address" },
+      { indexed: false, internalType: "uint256", name: "value", type: "uint256" }
+    ],
+    name: "Approval",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "address", name: "facilitatorAddress", type: "address" },
+      { indexed: true, internalType: "bytes32", name: "label", type: "bytes32" },
+      { indexed: false, internalType: "uint256", name: "bucketCapacity", type: "uint256" }
+    ],
+    name: "FacilitatorAdded",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "address", name: "facilitatorAddress", type: "address" },
+      { indexed: false, internalType: "uint256", name: "oldCapacity", type: "uint256" },
+      { indexed: false, internalType: "uint256", name: "newCapacity", type: "uint256" }
+    ],
+    name: "FacilitatorBucketCapacityUpdated",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "address", name: "facilitatorAddress", type: "address" },
+      { indexed: false, internalType: "uint256", name: "oldLevel", type: "uint256" },
+      { indexed: false, internalType: "uint256", name: "newLevel", type: "uint256" }
+    ],
+    name: "FacilitatorBucketLevelUpdated",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [{ indexed: true, internalType: "address", name: "facilitatorAddress", type: "address" }],
+    name: "FacilitatorRemoved",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "bytes32", name: "role", type: "bytes32" },
+      { indexed: true, internalType: "bytes32", name: "previousAdminRole", type: "bytes32" },
+      { indexed: true, internalType: "bytes32", name: "newAdminRole", type: "bytes32" }
+    ],
+    name: "RoleAdminChanged",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "bytes32", name: "role", type: "bytes32" },
+      { indexed: true, internalType: "address", name: "account", type: "address" },
+      { indexed: true, internalType: "address", name: "sender", type: "address" }
+    ],
+    name: "RoleGranted",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "bytes32", name: "role", type: "bytes32" },
+      { indexed: true, internalType: "address", name: "account", type: "address" },
+      { indexed: true, internalType: "address", name: "sender", type: "address" }
+    ],
+    name: "RoleRevoked",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "address", name: "from", type: "address" },
+      { indexed: true, internalType: "address", name: "to", type: "address" },
+      { indexed: false, internalType: "uint256", name: "value", type: "uint256" }
+    ],
+    name: "Transfer",
+    type: "event"
+  },
+  {
+    inputs: [],
+    name: "BUCKET_MANAGER_ROLE",
+    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "DEFAULT_ADMIN_ROLE",
+    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "DOMAIN_SEPARATOR",
+    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "FACILITATOR_MANAGER_ROLE",
+    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "PERMIT_TYPEHASH",
+    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "address", name: "facilitatorAddress", type: "address" },
+      { internalType: "string", name: "facilitatorLabel", type: "string" },
+      { internalType: "uint128", name: "bucketCapacity", type: "uint128" }
+    ],
+    name: "addFacilitator",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "address", name: "", type: "address" },
+      { internalType: "address", name: "", type: "address" }
+    ],
+    name: "allowance",
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "address", name: "spender", type: "address" },
+      { internalType: "uint256", name: "amount", type: "uint256" }
+    ],
+    name: "approve",
+    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "address", name: "", type: "address" }],
+    name: "balanceOf",
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "uint256", name: "amount", type: "uint256" }],
+    name: "burn",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "decimals",
+    outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "address", name: "facilitator", type: "address" }],
+    name: "getFacilitator",
+    outputs: [
+      {
+        components: [
+          { internalType: "uint128", name: "bucketCapacity", type: "uint128" },
+          { internalType: "uint128", name: "bucketLevel", type: "uint128" },
+          { internalType: "string", name: "label", type: "string" }
+        ],
+        internalType: "struct IGhoToken.Facilitator",
+        name: "",
+        type: "tuple"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "address", name: "facilitator", type: "address" }],
+    name: "getFacilitatorBucket",
+    outputs: [
+      { internalType: "uint256", name: "", type: "uint256" },
+      { internalType: "uint256", name: "", type: "uint256" }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "getFacilitatorsList",
+    outputs: [{ internalType: "address[]", name: "", type: "address[]" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "bytes32", name: "role", type: "bytes32" }],
+    name: "getRoleAdmin",
+    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "bytes32", name: "role", type: "bytes32" },
+      { internalType: "address", name: "account", type: "address" }
+    ],
+    name: "grantRole",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "bytes32", name: "role", type: "bytes32" },
+      { internalType: "address", name: "account", type: "address" }
+    ],
+    name: "hasRole",
+    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "address", name: "account", type: "address" },
+      { internalType: "uint256", name: "amount", type: "uint256" }
+    ],
+    name: "mint",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "name",
+    outputs: [{ internalType: "string", name: "", type: "string" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "address", name: "", type: "address" }],
+    name: "nonces",
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "address", name: "owner", type: "address" },
+      { internalType: "address", name: "spender", type: "address" },
+      { internalType: "uint256", name: "value", type: "uint256" },
+      { internalType: "uint256", name: "deadline", type: "uint256" },
+      { internalType: "uint8", name: "v", type: "uint8" },
+      { internalType: "bytes32", name: "r", type: "bytes32" },
+      { internalType: "bytes32", name: "s", type: "bytes32" }
+    ],
+    name: "permit",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "address", name: "facilitatorAddress", type: "address" }],
+    name: "removeFacilitator",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "bytes32", name: "role", type: "bytes32" },
+      { internalType: "address", name: "account", type: "address" }
+    ],
+    name: "renounceRole",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "bytes32", name: "role", type: "bytes32" },
+      { internalType: "address", name: "account", type: "address" }
+    ],
+    name: "revokeRole",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "address", name: "facilitator", type: "address" },
+      { internalType: "uint128", name: "newCapacity", type: "uint128" }
+    ],
+    name: "setFacilitatorBucketCapacity",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "bytes4", name: "interfaceId", type: "bytes4" }],
+    name: "supportsInterface",
+    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "symbol",
+    outputs: [{ internalType: "string", name: "", type: "string" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "totalSupply",
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "address", name: "to", type: "address" },
+      { internalType: "uint256", name: "amount", type: "uint256" }
+    ],
+    name: "transfer",
+    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "address", name: "from", type: "address" },
+      { internalType: "address", name: "to", type: "address" },
+      { internalType: "uint256", name: "amount", type: "uint256" }
+    ],
+    name: "transferFrom",
+    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    stateMutability: "nonpayable",
+    type: "function"
+  }
+];
+
+// src/moneyMarket/UiPoolDataProviderService.ts
 var UiPoolDataProviderService = class {
   hubProvider;
   uiPoolDataProvider;
@@ -9672,29 +10064,76 @@ var UiPoolDataProviderService = class {
   }
   /**
    * Get the list of all reserves in the pool
-   * @param uiPoolDataProvider - The address of the UI Pool Data Provider
-   * @param poolAddressesProvider - The address of the Pool Addresses Provider
+   * @param unfiltered - If true, returns all reserves in the pool (including bnUSD (debt) reserve); if false (default), filters out bnUSD.
    * @returns {Promise<readonly Address[]>} - Array of reserve addresses
    */
-  async getReservesList() {
-    return this.hubProvider.publicClient.readContract({
+  async getReservesList(unfiltered = false) {
+    const reservesList = await this.hubProvider.publicClient.readContract({
       address: this.uiPoolDataProvider,
       abi: uiPoolDataAbi,
       functionName: "getReservesList",
       args: [this.poolAddressesProvider]
     });
+    if (unfiltered) {
+      return reservesList;
+    }
+    return reservesList.filter(
+      (reserve) => reserve.toLowerCase() !== getMoneyMarketConfig(this.hubProvider.chainConfig.chain.id).bnUSD.toLowerCase()
+    );
+  }
+  /**
+   * @description Get the bnUSD facilitator bucket
+   * @returns {Promise<readonly [bigint, bigint]>} - The bnUSD [cap, current borrowed]
+   */
+  async getBnusdFacilitatorBucket() {
+    return this.hubProvider.publicClient.readContract({
+      address: getMoneyMarketConfig(this.hubProvider.chainConfig.chain.id).bnUSD,
+      abi: erc20BnusdAbi,
+      functionName: "getFacilitatorBucket",
+      args: [getMoneyMarketConfig(this.hubProvider.chainConfig.chain.id).bnUSDAToken]
+    });
   }
   /**
    * Get detailed data for all reserves in the pool
    * @returns {Promise<readonly [readonly AggregatedReserveData[], BaseCurrencyInfo]>} - Tuple containing array of reserve data and base currency info
    */
   async getReservesData() {
-    return this.hubProvider.publicClient.readContract({
-      address: this.uiPoolDataProvider,
-      abi: uiPoolDataAbi,
-      functionName: "getReservesData",
-      args: [this.poolAddressesProvider]
-    });
+    const [reserveData, bnUSDFacilitatorBucket] = await Promise.all([
+      this.hubProvider.publicClient.readContract({
+        address: this.uiPoolDataProvider,
+        abi: uiPoolDataAbi,
+        functionName: "getReservesData",
+        args: [this.poolAddressesProvider]
+      }),
+      this.getBnusdFacilitatorBucket()
+    ]);
+    const [cap, currentBorrowed] = bnUSDFacilitatorBucket;
+    const reserves = reserveData[0];
+    const baseCurrencyInfo = reserveData[1];
+    const bnUSD = getMoneyMarketConfig(this.hubProvider.chainConfig.chain.id).bnUSD.toLowerCase();
+    const bnUSDVault = getMoneyMarketConfig(this.hubProvider.chainConfig.chain.id).bnUSDVault.toLowerCase();
+    const bnUSDReserve = reserves.find((r) => bnUSD === r.underlyingAsset.toLowerCase());
+    const bnUSDVaultReserve = reserves.find((r) => bnUSDVault === r.underlyingAsset.toLowerCase());
+    if (!bnUSDReserve || !bnUSDVaultReserve) {
+      return reserveData;
+    }
+    const mergedBNUSDReserve = {
+      ...bnUSDVaultReserve,
+      borrowCap: cap,
+      availableLiquidity: cap - currentBorrowed,
+      totalScaledVariableDebt: bnUSDReserve.totalScaledVariableDebt + bnUSDVaultReserve.totalScaledVariableDebt,
+      virtualUnderlyingBalance: bnUSDReserve.virtualUnderlyingBalance + bnUSDVaultReserve.virtualUnderlyingBalance,
+      accruedToTreasury: bnUSDReserve.accruedToTreasury + bnUSDVaultReserve.accruedToTreasury
+    };
+    return [
+      [
+        mergedBNUSDReserve,
+        ...reserves.filter(
+          (r) => r.underlyingAsset.toLowerCase() !== bnUSD && r.underlyingAsset.toLowerCase() !== bnUSDVault
+        )
+      ],
+      baseCurrencyInfo
+    ];
   }
   /**
    * Get user-specific reserve data
@@ -9704,12 +10143,35 @@ var UiPoolDataProviderService = class {
    * @returns {Promise<readonly [readonly UserReserveData[], number]>} - Tuple containing array of user reserve data and eMode category ID
    */
   async getUserReservesData(userAddress) {
-    return this.hubProvider.publicClient.readContract({
+    const userReserves = await this.hubProvider.publicClient.readContract({
       address: this.uiPoolDataProvider,
       abi: uiPoolDataAbi,
       functionName: "getUserReservesData",
       args: [this.poolAddressesProvider, userAddress]
     });
+    const userReservesData = userReserves[0];
+    const eModeCategoryId = userReserves[1];
+    const bnUSD = getMoneyMarketConfig(this.hubProvider.chainConfig.chain.id).bnUSD.toLowerCase();
+    const bnUSDVault = getMoneyMarketConfig(this.hubProvider.chainConfig.chain.id).bnUSDVault.toLowerCase();
+    const bnUSDReserve = userReservesData.find((r) => bnUSD === r.underlyingAsset.toLowerCase());
+    const bnUSDVaultReserve = userReservesData.find((r) => bnUSDVault === r.underlyingAsset.toLowerCase());
+    if (!bnUSDReserve || !bnUSDVaultReserve) {
+      return userReserves;
+    }
+    const mergedBNUSDReserve = {
+      ...bnUSDVaultReserve,
+      scaledATokenBalance: bnUSDReserve.scaledATokenBalance + bnUSDVaultReserve.scaledATokenBalance,
+      scaledVariableDebt: bnUSDReserve.scaledVariableDebt + bnUSDVaultReserve.scaledVariableDebt
+    };
+    return [
+      [
+        mergedBNUSDReserve,
+        ...userReservesData.filter(
+          (r) => r.underlyingAsset.toLowerCase() !== bnUSD && r.underlyingAsset.toLowerCase() !== bnUSDVault
+        )
+      ],
+      eModeCategoryId
+    ];
   }
   /**
    * Get the reserves data humanized
@@ -9837,6 +10299,9 @@ var MoneyMarketDataService = class {
     this.uiPoolDataProviderService = new UiPoolDataProviderService(hubProvider);
     this.lendingPoolService = new LendingPoolService(hubProvider);
   }
+  async getATokenData(aToken) {
+    return Erc20Service.getErc20Token(aToken, this.hubProvider.publicClient);
+  }
   /**
    * LendingPool
    */
@@ -9861,10 +10326,11 @@ var MoneyMarketDataService = class {
    */
   /**
    * Get the reserves list
+   * @param unfiltered - If true, return the list of all reserves in the pool (including bnUSD (debt) reserve)
    * @returns {Promise<readonly Address[]>} - List of reserve asset addresses
    */
-  async getReservesList() {
-    return this.uiPoolDataProviderService.getReservesList();
+  async getReservesList(unfiltered = false) {
+    return this.uiPoolDataProviderService.getReservesList(unfiltered);
   }
   /**
    * Get the reserves data
@@ -10633,7 +11099,7 @@ var SwapService = class {
    *     "token_dst_blockchain_id":"0xa4b1.arbitrum",
    *     "amount":1000000000000000n,
    *     "quote_type": "exact_input"
-   * } satisfies SolverIntentQuoteRequest
+   * } satisfies SolverIntentQuoteRequest & OptionalFee
    *
    * const response = await swapService.getQuote(payload);
    *
@@ -10647,7 +11113,7 @@ var SwapService = class {
   async getQuote(payload) {
     payload = {
       ...payload,
-      amount: adjustAmountByFee(payload.amount, this.config.partnerFee, payload.quote_type)
+      amount: adjustAmountByFee(payload.amount, payload.fee ?? this.config.partnerFee, payload.quote_type)
     };
     return SolverApiService.getQuote(payload, this.config, this.configService);
   }
@@ -14068,26 +14534,30 @@ var SolanaSpokeService = class _SolanaSpokeService {
     }
     return spokeProvider.walletProvider.sendTransaction(serializedTransaction);
   }
-  static async waitForConfirmation(spokeProvider, signature, commitment = "finalized", timeoutMs = 6e4) {
-    const connection = new Connection(spokeProvider.chainConfig.rpcUrl, commitment);
-    const deadline = Date.now() + timeoutMs;
-    while (Date.now() < deadline) {
-      try {
-        const tx = await connection.getTransaction(signature, { commitment, maxSupportedTransactionVersion: 0 });
-        if (tx) {
-          if (tx.meta?.err) {
-            return { ok: false, error: new Error(JSON.stringify(tx.meta.err)) };
+  static async waitForConfirmation(spokeProvider, signature, commitment = "finalized", timeoutMs = 12e4) {
+    try {
+      const connection = new Connection(spokeProvider.chainConfig.rpcUrl, commitment);
+      const deadline = Date.now() + timeoutMs;
+      while (Date.now() < deadline) {
+        try {
+          const tx = await connection.getTransaction(signature, { commitment, maxSupportedTransactionVersion: 0 });
+          if (tx) {
+            if (tx.meta?.err) {
+              return { ok: false, error: new Error(JSON.stringify(tx.meta.err)) };
+            }
+            return { ok: true, value: true };
           }
-          return { ok: true, value: true };
+        } catch {
         }
-      } catch {
+        await new Promise((r) => setTimeout(r, 750));
       }
-      await new Promise((r) => setTimeout(r, 750));
+      return {
+        ok: false,
+        error: new Error(`Timed out after ${timeoutMs}ms waiting for ${commitment} confirmation for ${signature}`)
+      };
+    } catch (error) {
+      return { ok: false, error: new Error(`Failed to get transaction confirmation: ${JSON.stringify(error)}`) };
     }
-    return {
-      ok: false,
-      error: new Error(`Timed out after ${timeoutMs}ms waiting for ${commitment} confirmation for ${signature}`)
-    };
   }
 };
 function isEvmHubChainConfig(value) {
@@ -14604,7 +15074,16 @@ var SpokeService = class _SpokeService {
    */
   static async verifyTxHash(txHash, spokeProvider) {
     if (isSolanaSpokeProvider(spokeProvider)) {
-      return SolanaSpokeService.waitForConfirmation(spokeProvider, txHash);
+      const result = await SolanaSpokeService.waitForConfirmation(spokeProvider, txHash);
+      if (!result.ok) {
+        console.warn(`Solana verifyTxHash failed: ${result.error}`);
+        console.warn("Returning true to assume transaction exists on chain in future ");
+        return {
+          ok: true,
+          value: true
+        };
+      }
+      return result;
     }
     if (isStellarSpokeProvider(spokeProvider)) {
       return StellarSpokeService.waitForTransaction(spokeProvider, txHash);