@sodax/dapp-kit 0.0.1-rc.17 → 0.0.1-rc.19

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) [2025] [Sodax]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -10,10 +10,14 @@ dApp Kit is a collection of React components, hooks, and utilities designed to s
   - Withdraw tokens from the money market (`useWithdraw`)
   - Borrow tokens from the money market (`useBorrow`)
   - Repay borrowed tokens (`useRepay`)
-  - Get user reserves data (`useUserReservesData`)
-  - Get reserves data (`useReservesData`)
   - Check token allowance (`useMMAllowance`)
   - Approve token spending (`useMMApprove`)
+  - Get user reserves data (`useUserReservesData`)
+  - Get reserves data (`useReservesData`)
+  - Get humanized reserves data (`useReservesHumanized`)
+  - Get list of reserves (`useReservesList`)
+  - Get USD formatted reserves data (`useReservesUsdFormat`)
+  - Get formatted user portfolio summary (`useUserFormattedSummary`)
 
 - Swap/Intent
   - Get quote for an intent order (`useQuote`)
@@ -42,7 +46,7 @@ pnpm add @sodax/dapp-kit
 1. First, install the required dependencies:
 
 ```bash
-npm install @sodax/dapp-kit @tanstack/react-query @sodax/wallet-sdk
+pnpm install @sodax/dapp-kit @tanstack/react-query @sodax/wallet-sdk
 ```
 
 2. Set up the providers in your app:
@@ -51,31 +55,16 @@ npm install @sodax/dapp-kit @tanstack/react-query @sodax/wallet-sdk
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { XWagmiProviders } from '@sodax/wallet-sdk';
 import { SodaxProvider } from '@sodax/dapp-kit';
-import { SONIC_MAINNET_CHAIN_ID } from '@sodax/types';
 
 const queryClient = new QueryClient();
 
-// Configure Sodax
-const sodaxConfig = {
-  hubProviderConfig: {
-    hubRpcUrl: 'https://rpc.soniclabs.com',
-    chainConfig: getHubChainConfig(SONIC_MAINNET_CHAIN_ID),
-  },
-  moneyMarket: getMoneyMarketConfig(SONIC_MAINNET_CHAIN_ID),
-  solver: {
-    intentsContract: '0x6382D6ccD780758C5e8A6123c33ee8F4472F96ef',
-    solverApiEndpoint: 'https://sodax-solver-staging.iconblockchain.xyz',
-    partnerFee: {
-      address: '0x0Ab764AB3816cD036Ea951bE973098510D8105A6',
-      percentage: 100, // 1%
-    },
-  },
-  relayerApiEndpoint: 'https://xcall-relay.nw.iconblockchain.xyz',
+const rpcConfig = {
+  "solana": "private rpc url",
 };
 
 function App() {
   return (
-    <SodaxProvider testnet={false} config={sodaxConfig}>
+    <SodaxProvider testnet={false} rpcConfig={rpcConfig}>
       <QueryClientProvider client={queryClient}>
         <XWagmiProviders
           config={{

package/dist/contexts/index.d.ts

@@ -1,8 +1,10 @@
 import type { EvmHubProvider, Sodax } from '@sodax/sdk';
+import type { RpcConfig } from '@/types';
 export interface SodaxContextType {
     sodax: Sodax;
     testnet: boolean;
     hubProvider: EvmHubProvider | undefined;
+    rpcConfig: RpcConfig;
 }
 export declare const SodaxContext: import("react").Context<SodaxContextType | null>;
 //# sourceMappingURL=index.d.ts.map

package/dist/contexts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contexts/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExD,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,cAAc,GAAG,SAAS,CAAC;CACzC;AAED,eAAO,MAAM,YAAY,kDAA+C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contexts/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEzC,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,cAAc,GAAG,SAAS,CAAC;IACxC,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,eAAO,MAAM,YAAY,kDAA+C,CAAC"}

package/dist/hooks/mm/useReservesData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useReservesData.d.ts","sourceRoot":"","sources":["../../../src/hooks/mm/useReservesData.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAAgB,eAAe,mKAc9B"}
+{"version":3,"file":"useReservesData.d.ts","sourceRoot":"","sources":["../../../src/hooks/mm/useReservesData.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;GAgBG;AAEH,wBAAgB,eAAe,mKAS9B"}

package/dist/hooks/mm/useReservesHumanized.d.ts

@@ -0,0 +1,21 @@
+import type { ReservesDataHumanized } from '@sodax/sdk';
+import { type UseQueryResult } from '@tanstack/react-query';
+/**
+ * Hook for fetching humanized reserves data from the Sodax money market.
+ *
+ * This hook provides access to the current state of all reserves (humanized format) in the money market protocol,
+ * including liquidity, interest rates, and other key metrics. The data is automatically
+ * fetched and cached using React Query.
+ *
+ * @example
+ * ```typescript
+ * const { data: reservesHumanized, isLoading, error } = useReservesHumanized();
+ * ```
+ *
+ * @returns A React Query result object containing:
+ *   - data: The reserves humanized data when available
+ *   - isLoading: Loading state indicator
+ *   - error: Any error that occurred during data fetching
+ */
+export declare function useReservesHumanized(): UseQueryResult<ReservesDataHumanized, Error>;
+//# sourceMappingURL=useReservesHumanized.d.ts.map

package/dist/hooks/mm/useReservesHumanized.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useReservesHumanized.d.ts","sourceRoot":"","sources":["../../../src/hooks/mm/useReservesHumanized.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEtE;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,oBAAoB,IAAI,cAAc,CAAC,qBAAqB,EAAE,KAAK,CAAC,CASnF"}

package/dist/hooks/mm/useReservesList.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Hook for fetching list of reserves from the Sodax money market.
+ *
+ * This hook provides access to the list of addresses of all reserves in the money market protocol.
+ * The data is automatically fetched and cached using React Query.
+ *
+ * @example
+ * ```typescript
+ * const { data: reservesList, isLoading, error } = useReservesList();
+ * ```
+ *
+ * @returns A React Query result object containing:
+ *   - data: The reserves list when available
+ *   - isLoading: Loading state indicator
+ *   - error: Any error that occurred during data fetching
+ */
+export declare function useReservesList(): import("@tanstack/react-query").UseQueryResult<readonly `0x${string}`[], Error>;
+//# sourceMappingURL=useReservesList.d.ts.map

package/dist/hooks/mm/useReservesList.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useReservesList.d.ts","sourceRoot":"","sources":["../../../src/hooks/mm/useReservesList.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,oFAS9B"}

package/dist/hooks/mm/useReservesUsdFormat.d.ts

@@ -0,0 +1,23 @@
+import type { FormatReserveUSDResponse, ReserveData } from '@sodax/sdk';
+import { type UseQueryResult } from '@tanstack/react-query';
+/**
+ * Hook for fetching formatted summary of Sodax user portfolio (holdings, total liquidity,
+ *  collateral, borrows, liquidation threshold, health factor, available borrowing power, etc..).
+ *
+ * This hook provides access to the current state of user portfolio in the money market protocol.
+ * The data is automatically fetched and cached using React Query.
+ *
+ * @example
+ * ```typescript
+ * const { data: userFormattedSummary, isLoading, error } = useUserFormattedSummary();
+ * ```
+ *
+ * @returns A React Query result object containing:
+ *   - data: The formatted summary of Sodax user portfolio when available
+ *   - isLoading: Loading state indicator
+ *   - error: Any error that occurred during data fetching
+ */
+export declare function useReservesUsdFormat(): UseQueryResult<(ReserveData & {
+    priceInMarketReferenceCurrency: string;
+} & FormatReserveUSDResponse)[], Error>;
+//# sourceMappingURL=useReservesUsdFormat.d.ts.map

package/dist/hooks/mm/useReservesUsdFormat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useReservesUsdFormat.d.ts","sourceRoot":"","sources":["../../../src/hooks/mm/useReservesUsdFormat.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGtE;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,oBAAoB,IAAI,cAAc,CACpD,CAAC,WAAW,GAAG;IAAE,8BAA8B,EAAE,MAAM,CAAA;CAAE,GAAG,wBAAwB,CAAC,EAAE,EACvF,KAAK,CACN,CAaA"}

package/dist/hooks/mm/useUserFormattedSummary.d.ts

@@ -0,0 +1,22 @@
+import { type FormatUserSummaryResponse, type FormatReserveUSDResponse } from '@sodax/sdk';
+import type { ChainId } from '@sodax/types';
+import { type UseQueryResult } from '@tanstack/react-query';
+/**
+ * Hook for fetching formatted summary of Sodax user portfolio (holdings, total liquidity,
+ *  collateral, borrows, liquidation threshold, health factor, available borrowing power, etc..).
+ *
+ * This hook provides access to the current state of user portfolio in the money market protocol.
+ * The data is automatically fetched and cached using React Query.
+ *
+ * @example
+ * ```typescript
+ * const { data: userFormattedSummary, isLoading, error } = useUserFormattedSummary();
+ * ```
+ *
+ * @returns A React Query result object containing:
+ *   - data: The formatted summary of Sodax user portfolio when available
+ *   - isLoading: Loading state indicator
+ *   - error: Any error that occurred during data fetching
+ */
+export declare function useUserFormattedSummary(spokeChainId: ChainId | undefined, address: string | undefined): UseQueryResult<FormatUserSummaryResponse<FormatReserveUSDResponse> | undefined, Error>;
+//# sourceMappingURL=useUserFormattedSummary.d.ts.map

package/dist/hooks/mm/useUserFormattedSummary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useUserFormattedSummary.d.ts","sourceRoot":"","sources":["../../../src/hooks/mm/useUserFormattedSummary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,yBAAyB,EAAE,KAAK,wBAAwB,EAA4B,MAAM,YAAY,CAAC;AACrH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAItE;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,OAAO,GAAG,SAAS,EACjC,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,cAAc,CAAC,yBAAyB,CAAC,wBAAwB,CAAC,GAAG,SAAS,EAAE,KAAK,CAAC,CA8BxF"}

package/dist/hooks/mm/useUserReservesData.d.ts

@@ -1,3 +1,21 @@
+import { type UserReserveData } from '@sodax/sdk';
 import type { ChainId } from '@sodax/types';
-export declare function useUserReservesData(spokeChainId: ChainId, address: string | undefined): readonly import("@sodax/sdk").UserReserveData[] | undefined;
+import { type UseQueryResult } from '@tanstack/react-query';
+/**
+ * Hook for fetching user reserves data from the Sodax money market.
+ *
+ * This hook provides access to the current state of user reserves in the money market protocol.
+ * The data is automatically fetched and cached using React Query.
+ *
+ * @example
+ * ```typescript
+ * const { data: userReservesData, isLoading, error } = useUserReservesData();
+ * ```
+ *
+ * @returns A React Query result object containing:
+ *   - data: The user reserves data when available
+ *   - isLoading: Loading state indicator
+ *   - error: Any error that occurred during data fetching
+ */
+export declare function useUserReservesData(spokeChainId: ChainId | undefined, address: string | undefined, refetchInterval?: number): UseQueryResult<readonly [readonly UserReserveData[], number] | undefined, Error>;
 //# sourceMappingURL=useUserReservesData.d.ts.map

package/dist/hooks/mm/useUserReservesData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useUserReservesData.d.ts","sourceRoot":"","sources":["../../../src/hooks/mm/useUserReservesData.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAM5C,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,+DAiCrF"}
+{"version":3,"file":"useUserReservesData.d.ts","sourceRoot":"","sources":["../../../src/hooks/mm/useUserReservesData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAA4B,MAAM,YAAY,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAItE;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,OAAO,GAAG,SAAS,EACjC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,eAAe,SAAO,GACrB,cAAc,CAAC,SAAS,CAAC,SAAS,eAAe,EAAE,EAAE,MAAM,CAAC,GAAG,SAAS,EAAE,KAAK,CAAC,CAgBlF"}

package/dist/hooks/provider/useSpokeProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSpokeProvider.d.ts","sourceRoot":"","sources":["../../../src/hooks/provider/useSpokeProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAYL,KAAK,aAAa,EAClB,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAIV,YAAY,EAIb,MAAM,cAAc,CAAC;AAItB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,cAAc,CAAC,EAAE,eAAe,GAAG,SAAS,GAC3C,aAAa,GAAG,SAAS,CA2D3B"}
+{"version":3,"file":"useSpokeProvider.d.ts","sourceRoot":"","sources":["../../../src/hooks/provider/useSpokeProvider.ts"],"names":[],"mappings":"AACA,OAAO,EAYL,KAAK,aAAa,EAClB,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAIV,YAAY,EAIb,MAAM,cAAc,CAAC;AAGtB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,cAAc,CAAC,EAAE,eAAe,GAAG,SAAS,GAC3C,aAAa,GAAG,SAAS,CAoE3B"}

package/dist/hooks/swap/useSwap.d.ts

@@ -1,6 +1,6 @@
-import type { CreateIntentParams, SolverExecutionResponse, Result, IntentErrorCode, Intent, IntentError, SpokeProvider, Hex } from '@sodax/sdk';
+import type { CreateIntentParams, SolverExecutionResponse, Result, IntentErrorCode, Intent, IntentError, SpokeProvider, IntentDeliveryInfo } from '@sodax/sdk';
 import { type UseMutationResult } from '@tanstack/react-query';
-type CreateIntentResult = Result<[SolverExecutionResponse, Intent, Hex], IntentError<IntentErrorCode>>;
+type CreateIntentResult = Result<[SolverExecutionResponse, Intent, IntentDeliveryInfo], IntentError<IntentErrorCode>>;
 /**
  * Hook for creating and submitting an swap intent order for cross-chain swaps.
  * Uses React Query's useMutation for better state management and caching.

package/dist/hooks/swap/useSwap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSwap.d.ts","sourceRoot":"","sources":["../../../src/hooks/swap/useSwap.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,kBAAkB,EAClB,uBAAuB,EACvB,MAAM,EACN,eAAe,EACf,MAAM,EACN,WAAW,EACX,aAAa,EACb,GAAG,EACJ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAe,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE5E,KAAK,kBAAkB,GAAG,MAAM,CAAC,CAAC,uBAAuB,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;AAEvG;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,OAAO,CACrB,aAAa,EAAE,aAAa,GAAG,SAAS,GACvC,iBAAiB,CAAC,kBAAkB,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAclE"}
+{"version":3,"file":"useSwap.d.ts","sourceRoot":"","sources":["../../../src/hooks/swap/useSwap.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,kBAAkB,EAClB,uBAAuB,EACvB,MAAM,EACN,eAAe,EACf,MAAM,EACN,WAAW,EACX,aAAa,EACb,kBAAkB,EACnB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAe,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE5E,KAAK,kBAAkB,GAAG,MAAM,CAAC,CAAC,uBAAuB,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;AAEtH;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,OAAO,CACrB,aAAa,EAAE,aAAa,GAAG,SAAS,GACvC,iBAAiB,CAAC,kBAAkB,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAclE"}

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './hooks';
 export * from './providers';
 export * from './core';
+export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}

package/dist/index.js

@@ -3,7 +3,6 @@
 var React = require('react');
 var sdk = require('@sodax/sdk');
 var reactQuery = require('@tanstack/react-query');
-var walletSdk = require('@sodax/wallet-sdk');
 var viem = require('viem');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -37,57 +36,61 @@ function useHubProvider() {
   return hubProvider;
 }
 function useSpokeProvider(spokeChainId, walletProvider) {
-  const xChainType = walletSdk.getXChainType(spokeChainId);
-  const walletProvider_ = walletSdk.useWalletProvider(spokeChainId);
-  const _walletProvider = walletProvider ?? walletProvider_;
+  const { rpcConfig } = useSodaxContext();
+  const xChainType = spokeChainId ? sdk.spokeChainConfig[spokeChainId]?.chain.type : void 0;
   const spokeProvider = React.useMemo(() => {
-    if (!_walletProvider) return void 0;
+    if (!walletProvider) return void 0;
     if (!spokeChainId) return void 0;
+    if (!xChainType) return void 0;
+    if (!rpcConfig) return void 0;
     if (xChainType === "EVM") {
       if (spokeChainId === sdk.SONIC_MAINNET_CHAIN_ID) {
         return new sdk.SonicSpokeProvider(
-          _walletProvider,
+          walletProvider,
           sdk.spokeChainConfig[spokeChainId]
         );
       }
       return new sdk.EvmSpokeProvider(
-        _walletProvider,
+        walletProvider,
         sdk.spokeChainConfig[spokeChainId]
       );
     }
     if (xChainType === "SUI") {
       return new sdk.SuiSpokeProvider(
         sdk.spokeChainConfig[spokeChainId],
-        _walletProvider
+        walletProvider
       );
     }
     if (xChainType === "ICON") {
       return new sdk.IconSpokeProvider(
-        _walletProvider,
+        walletProvider,
         sdk.spokeChainConfig[spokeChainId]
       );
     }
     if (xChainType === "INJECTIVE") {
       return new sdk.InjectiveSpokeProvider(
         sdk.spokeChainConfig[spokeChainId],
-        _walletProvider
+        walletProvider
       );
     }
     if (xChainType === "STELLAR") {
       const stellarConfig = sdk.spokeChainConfig[spokeChainId];
-      return new sdk.StellarSpokeProvider(_walletProvider, stellarConfig, {
+      return new sdk.StellarSpokeProvider(walletProvider, stellarConfig, {
         horizonRpcUrl: stellarConfig.horizonRpcUrl,
         sorobanRpcUrl: stellarConfig.sorobanRpcUrl
       });
     }
     if (xChainType === "SOLANA") {
       return new sdk.SolanaSpokeProvider(
-        _walletProvider,
-        sdk.spokeChainConfig[spokeChainId]
+        walletProvider,
+        rpcConfig.solana ? {
+          ...sdk.spokeChainConfig[spokeChainId],
+          rpcUrl: rpcConfig.solana
+        } : sdk.spokeChainConfig[spokeChainId]
       );
     }
     return void 0;
-  }, [spokeChainId, xChainType, _walletProvider]);
+  }, [spokeChainId, xChainType, walletProvider, rpcConfig]);
   return spokeProvider;
 }
 function useBorrow(spokeToken, spokeProvider) {
@@ -183,46 +186,27 @@ function useWithdraw(spokeToken, spokeProvider) {
     }
   });
 }
-function useUserReservesData(spokeChainId, address) {
+function useUserReservesData(spokeChainId, address, refetchInterval = 5e3) {
   const { sodax } = useSodaxContext();
-  const hubChainId = sodax.config?.hubProviderConfig?.chainConfig.chain.id ?? "sonic";
-  const hubProvider = useHubProvider();
   const spokeProvider = useSpokeProvider(spokeChainId);
-  const { data: userReserves } = reactQuery.useQuery({
+  return reactQuery.useQuery({
     queryKey: ["userReserves", spokeChainId, address],
     queryFn: async () => {
-      if (!hubProvider || !spokeProvider || !address) {
-        return;
+      if (!spokeProvider || !address) {
+        return void 0;
       }
-      const hubWalletAddress = await sdk.WalletAbstractionService.getUserHubWalletAddress(
-        address,
-        spokeProvider,
-        hubProvider
-      );
-      const moneyMarketConfig = sdk.getMoneyMarketConfig(hubChainId);
-      const [res] = await sodax.moneyMarket.getUserReservesData(
-        hubWalletAddress,
-        moneyMarketConfig.uiPoolDataProvider,
-        moneyMarketConfig.poolAddressesProvider
-      );
-      return res;
+      return await sodax.moneyMarket.data.getUserReservesData(spokeProvider);
     },
-    enabled: !!spokeChainId && !!hubProvider && !!address,
-    refetchInterval: 5e3
+    enabled: !!spokeChainId && !!address,
+    refetchInterval
   });
-  return userReserves;
 }
 function useReservesData() {
   const { sodax } = useSodaxContext();
-  const hubChainId = sodax.config?.hubProviderConfig?.chainConfig.chain.id ?? "sonic";
   return reactQuery.useQuery({
     queryKey: ["reservesData"],
     queryFn: async () => {
-      const moneyMarketConfig = sdk.getMoneyMarketConfig(hubChainId);
-      return await sodax.moneyMarket.getReservesData(
-        moneyMarketConfig.uiPoolDataProvider,
-        moneyMarketConfig.poolAddressesProvider
-      );
+      return await sodax.moneyMarket.data.getReservesData();
     }
   });
 }
@@ -380,7 +364,7 @@ function useSwapApprove(params, spokeProvider) {
     resetError
   };
 }
-var SodaxProvider = ({ children, testnet = false, config }) => {
+var SodaxProvider = ({ children, testnet = false, config, rpcConfig }) => {
   const sodax = new sdk.Sodax(config);
   const hubChainId = config?.hubProviderConfig?.chainConfig.chain.id;
   const hubRpcUrl = config?.hubProviderConfig?.hubRpcUrl;
@@ -394,7 +378,7 @@ var SodaxProvider = ({ children, testnet = false, config }) => {
     }
     return void 0;
   }, [hubChainId, hubRpcUrl]);
-  return /* @__PURE__ */ React__default.default.createElement(SodaxContext.Provider, { value: { sodax, testnet, hubProvider } }, children);
+  return /* @__PURE__ */ React__default.default.createElement(SodaxContext.Provider, { value: { sodax, testnet, hubProvider, rpcConfig } }, children);
 };
 var getSpokeTokenAddressByVault = (spokeChainId, vault) => {
   const tokens = sdk.hubAssets[spokeChainId];