@sodax/dapp-kit 0.0.1-rc.7 → 0.0.1-rc.9

package/src/hooks/mm/useSupply.ts

@@ -6,7 +6,7 @@ import { useSodaxContext } from '../shared/useSodaxContext';
 
 interface SupplyResponse {
   ok: true;
-  value: [`0x${string}`, `0x${string}`];
+  value: [string, string];
 }
 
 /**
@@ -45,7 +45,7 @@ export function useSupply(
         throw new Error('spokeProvider is not found');
       }
 
-      const response = await sodax.moneyMarket.supplyAndSubmit(
+      const response = await sodax.moneyMarket.supply(
         {
           token: spokeToken.address,
           amount: parseUnits(amount, spokeToken.decimals),

package/src/hooks/mm/useUserReservesData.ts

@@ -1,4 +1,3 @@
-import { allXTokens } from '@/core';
 import { encodeAddress, EvmWalletAbstraction, getMoneyMarketConfig, type EvmHubProvider } from '@sodax/sdk';
 import type { HubChainId, SpokeChainId } from '@sodax/types';
 import type { ChainId } from '@sodax/types';
@@ -32,12 +31,7 @@ export function useUserReservesData(spokeChainId: ChainId, address: string | und
         moneyMarketConfig.poolAddressesProvider,
       );
 
-      return res?.map(r => {
-        return {
-          ...r,
-          token: allXTokens.find(t => t.address === r.underlyingAsset),
-        };
-      });
+      return res;
     },
     enabled: !!spokeChainId && !!hubProvider && !!address,
     refetchInterval: 5000,

package/src/hooks/mm/useWithdraw.ts

@@ -6,7 +6,7 @@ import { useSodaxContext } from '../shared/useSodaxContext';
 
 interface WithdrawResponse {
   ok: true;
-  value: [`0x${string}`, `0x${string}`];
+  value: [string, string];
 }
 
 /**
@@ -44,7 +44,7 @@ export function useWithdraw(
         throw new Error('spokeProvider is not found');
       }
 
-      const response = await sodax.moneyMarket.withdrawAndSubmit(
+      const response = await sodax.moneyMarket.withdraw(
         {
           token: spokeToken.address,
           // vault token on hub chain decimals is 18

package/src/hooks/provider/useSpokeProvider.ts

@@ -8,8 +8,12 @@ import {
   type IconSpokeChainConfig,
   CWSpokeProvider,
   type CosmosSpokeChainConfig,
+  StellarSpokeProvider,
+  type StellarSpokeChainConfig,
   type SpokeProvider,
   type IWalletProvider,
+  SolanaSpokeProvider,
+  type SolanaChainConfig,
 } from '@sodax/sdk';
 import type {
   IEvmWalletProvider,
@@ -17,6 +21,8 @@ import type {
   ISuiWalletProvider,
   SpokeChainId,
   IInjectiveWalletProvider,
+  IStellarWalletProvider,
+  ISolanaWalletProvider,
 } from '@sodax/types';
 import { getXChainType, useWalletProvider } from '@sodax/wallet-sdk';
 import { useMemo } from 'react';
@@ -72,6 +78,21 @@ export function useSpokeProvider(
       );
     }
 
+    if (xChainType === 'STELLAR') {
+      const stellarConfig = spokeChainConfig[spokeChainId] as StellarSpokeChainConfig;
+      return new StellarSpokeProvider(_walletProvider as IStellarWalletProvider, stellarConfig, {
+        horizonRpcUrl: stellarConfig.horizonRpcUrl,
+        sorobanRpcUrl: stellarConfig.sorobanRpcUrl,
+      });
+    }
+
+    if (xChainType === 'SOLANA') {
+      return new SolanaSpokeProvider(
+        _walletProvider as ISolanaWalletProvider,
+        spokeChainConfig[spokeChainId] as SolanaChainConfig,
+      );
+    }
+
     return undefined;
   }, [spokeChainId, xChainType, _walletProvider]);
 

package/src/hooks/swap/index.ts

@@ -1,3 +1,5 @@
 export * from './useQuote';
 export * from './useCreateIntentOrder';
 export * from './useStatus';
+export * from './useSwapAllowance';
+export * from './useSwapApprove';

package/src/hooks/swap/useCreateIntentOrder.ts

@@ -1,19 +1,19 @@
 import { useSodaxContext } from '../shared/useSodaxContext';
 import type {
   CreateIntentParams,
-  IntentExecutionResponse,
+  SolverExecutionResponse,
   Result,
-  IntentSubmitErrorCode,
+  IntentErrorCode,
   Intent,
   PacketData,
-  IntentSubmitError,
+  IntentError,
   SpokeProvider,
 } from '@sodax/sdk';
 import { useMutation, type UseMutationResult } from '@tanstack/react-query';
 
 type CreateIntentResult = Result<
-  [IntentExecutionResponse, Intent, PacketData],
-  IntentSubmitError<IntentSubmitErrorCode>
+  [SolverExecutionResponse, Intent, PacketData],
+  IntentError<IntentErrorCode>
 >;
 
 /**

package/src/hooks/swap/useQuote.ts

@@ -1,4 +1,4 @@
-import type { IntentErrorResponse, IntentQuoteRequest, IntentQuoteResponse, Result } from '@sodax/sdk';
+import type { SolverErrorResponse, SolverIntentQuoteRequest, SolverIntentQuoteResponse, Result } from '@sodax/sdk';
 import { useSodaxContext } from '../shared/useSodaxContext';
 import { useQuery, type UseQueryResult } from '@tanstack/react-query';
 
@@ -7,9 +7,9 @@ import { useQuery, type UseQueryResult } from '@tanstack/react-query';
  *
  * This hook provides real-time quote data for an intent-based swap.
  *
- * @param {IntentQuoteRequest | undefined} payload - The intent quote request parameters. If undefined, the query will be disabled.
+ * @param {SolverIntentQuoteRequest | undefined} payload - The intent quote request parameters. If undefined, the query will be disabled.
  *
- * @returns {UseQueryResult<Result<IntentQuoteResponse, IntentErrorResponse> | undefined>} A query result object containing:
+ * @returns {UseQueryResult<Result<SolverIntentQuoteResponse, SolverErrorResponse> | undefined>} A query result object containing:
  *   - data: The quote result from the solver
  *   - isLoading: Boolean indicating if the quote is being fetched
  *   - error: Error object if the quote request failed
@@ -38,8 +38,8 @@ import { useQuery, type UseQueryResult } from '@tanstack/react-query';
  * - Uses React Query for efficient caching and state management
  */
 export const useQuote = (
-  payload: IntentQuoteRequest | undefined,
-): UseQueryResult<Result<IntentQuoteResponse, IntentErrorResponse> | undefined> => {
+  payload: SolverIntentQuoteRequest | undefined,
+): UseQueryResult<Result<SolverIntentQuoteResponse, SolverErrorResponse> | undefined> => {
   const { sodax } = useSodaxContext();
   return useQuery({
     queryKey: [payload],

package/src/hooks/swap/useStatus.ts

@@ -1,4 +1,4 @@
-import type { Hex, IntentErrorResponse, IntentStatusResponse, Result } from '@sodax/sdk';
+import type { Hex, SolverErrorResponse, SolverIntentStatusResponse, Result } from '@sodax/sdk';
 import { useQuery, type UseQueryResult } from '@tanstack/react-query';
 import { useSodaxContext } from '../shared/useSodaxContext';
 
@@ -9,7 +9,7 @@ import { useSodaxContext } from '../shared/useSodaxContext';
  *
  * @param {Hex} intent_tx_hash - The transaction hash of the intent order on the hub chain
  *
- * @returns {UseQueryResult<Result<IntentStatusResponse, IntentErrorResponse> | undefined>} A query result object containing:
+ * @returns {UseQueryResult<Result<SolverIntentStatusResponse, SolverErrorResponse> | undefined>} A query result object containing:
  *   - data: The status result from the solver
  *   - isLoading: Boolean indicating if the status is being fetched
  *   - error: Error object if the status request failed
@@ -32,7 +32,7 @@ import { useSodaxContext } from '../shared/useSodaxContext';
 
 export const useStatus = (
   intent_tx_hash: Hex,
-): UseQueryResult<Result<IntentStatusResponse, IntentErrorResponse> | undefined> => {
+): UseQueryResult<Result<SolverIntentStatusResponse, SolverErrorResponse> | undefined> => {
   const { sodax } = useSodaxContext();
   return useQuery({
     queryKey: [intent_tx_hash],

package/src/hooks/swap/useSwapAllowance.ts

@@ -0,0 +1,44 @@
+import { useQuery, type UseQueryResult } from '@tanstack/react-query';
+import { useSodaxContext } from '../shared/useSodaxContext';
+import type { CreateIntentParams, SpokeProvider } from '@sodax/sdk';
+
+/**
+ * Hook for checking token allowance for money market operations.
+ *
+ * This hook verifies if the user has approved enough tokens for a specific money market action
+ * (borrow/repay). It automatically queries and tracks the allowance status.
+ *
+ * @param {CreateIntentParams} params - The parameters for the intent to check allowance for.
+ * @param {SpokeProvider} spokeProvider - The spoke provider to use for allowance checks
+ *
+ * @returns {UseQueryResult<boolean, Error>} A React Query result containing:
+ *   - data: Boolean indicating if allowance is sufficient
+ *   - isLoading: Loading state indicator
+ *   - error: Any error that occurred during the check
+ *
+ * @example
+ * ```typescript
+ * const { data: hasAllowed, isLoading } = useMMAllowance(params, spokeProvider);
+ * ```
+ */
+export function useSwapAllowance(
+  params: CreateIntentParams | undefined,
+  spokeProvider: SpokeProvider | undefined,
+): UseQueryResult<boolean, Error> {
+  const { sodax } = useSodaxContext();
+
+  return useQuery({
+    queryKey: ['allowance', params],
+    queryFn: async () => {
+      if (!spokeProvider || !params) {
+        return false;
+      }
+      const allowance = await sodax.solver.isAllowanceValid(params, spokeProvider);
+      if (allowance.ok) {
+        return allowance.value;
+      }
+      return false;
+    },
+    enabled: !!spokeProvider && !!params,
+  });
+}

package/src/hooks/swap/useSwapApprove.ts

@@ -0,0 +1,68 @@
+import { useSodaxContext } from '../shared/useSodaxContext';
+import type { Token } from '@sodax/types';
+import { type Address, parseUnits } from 'viem';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import type { SpokeProvider } from '@sodax/sdk';
+
+interface UseApproveReturn {
+  approve: ({ amount }: { amount: string }) => Promise<boolean>;
+  isLoading: boolean;
+  error: Error | null;
+  resetError: () => void;
+}
+
+/**
+ * Hook for approving token spending for money market actions
+ * @param token The token to approve spending for
+ * @param spokeProvider The spoke provider instance for the chain
+ * @returns Object containing approve function, loading state, error state and reset function
+ * @example
+ * ```tsx
+ * const { approve, isLoading, error } = useApprove(token, spokeProvider);
+ *
+ * // Approve tokens for supply action
+ * await approve({ amount: "100", action: "supply" });
+ * ```
+ */
+
+export function useSwapApprove(token: Token | undefined, spokeProvider: SpokeProvider | undefined): UseApproveReturn {
+  const { sodax } = useSodaxContext();
+  const queryClient = useQueryClient();
+
+  const {
+    mutateAsync: approve,
+    isPending,
+    error,
+    reset: resetError,
+  } = useMutation({
+    mutationFn: async ({ amount }: { amount: string }) => {
+      if (!spokeProvider) {
+        throw new Error('Spoke provider not found');
+      }
+      if (!token) {
+        throw new Error('Token not found');
+      }
+
+      const allowance = await sodax.solver.approve(
+        token.address as Address,
+        parseUnits(amount, token.decimals),
+        spokeProvider,
+      );
+      if (!allowance.ok) {
+        throw new Error('Failed to approve tokens');
+      }
+      return allowance.ok;
+    },
+    onSuccess: () => {
+      // Invalidate allowance query to refetch the new allowance
+      queryClient.invalidateQueries({ queryKey: ['allowance', token?.address] });
+    },
+  });
+
+  return {
+    approve,
+    isLoading: isPending,
+    error: error,
+    resetError,
+  };
+}

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

@@ -1,4 +0,0 @@
-import type { XToken } from '@sodax/types';
-import type { MoneyMarketAction } from '@sodax/sdk';
-export declare function useAllowance(token: XToken, amount: string, action: MoneyMarketAction): import("@tanstack/react-query").UseQueryResult<boolean, Error>;
-//# sourceMappingURL=useAllowance.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"useAllowance.d.ts","sourceRoot":"","sources":["../../../src/hooks/mm/useAllowance.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAgB,MAAM,EAAE,MAAM,cAAc,CAAC;AAIzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,kEAyBpF"}

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

@@ -1,14 +0,0 @@
-import type { XToken } from '@sodax/types';
-import type { MoneyMarketAction } from '@sodax/sdk';
-interface UseApproveReturn {
-    approve: ({ amount, action }: {
-        amount: string;
-        action: MoneyMarketAction;
-    }) => Promise<boolean>;
-    isLoading: boolean;
-    error: Error | null;
-    resetError: () => void;
-}
-export declare function useApprove(token: XToken): UseApproveReturn;
-export {};
-//# sourceMappingURL=useApprove.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"useApprove.d.ts","sourceRoot":"","sources":["../../../src/hooks/mm/useApprove.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAgB,MAAM,EAAE,MAAM,cAAc,CAAC;AAGzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,UAAU,gBAAgB;IACxB,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,iBAAiB,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACjG,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAwC1D"}

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

@@ -1,24 +0,0 @@
-import { type EvmHubProvider, type SpokeChainId } from '@sodax/sdk';
-import { type UseQueryResult } from '@tanstack/react-query';
-/**
- * Hook for retrieving the hub wallet address for a given spoke chain and address.
- *
- * This hook fetches the hub wallet address associated with a user's address on a specific spoke chain.
- * It uses the EvmWalletAbstraction to query the hub wallet address from the hub provider.
- *
- * @param spokeChainId - The chain ID of the spoke chain
- * @param address - The user's address on the spoke chain
- * @param hubProvider - The hub provider instance
- *
- * @returns {UseQueryResult<string | null>} A query result object containing:
- *   - data: The hub wallet address or null if not found
- *   - isLoading: Boolean indicating if the query is in progress
- *   - error: Error object if the query failed, null otherwise
- *
- * @example
- * ```typescript
- * const { data: hubWalletAddress, isLoading, error } = useHubWalletAddress(spokeChainId, address, hubProvider);
- * ```
- */
-export declare function useHubWalletAddress(spokeChainId: SpokeChainId, address: string | undefined, hubProvider: EvmHubProvider): UseQueryResult<string | null>;
-//# sourceMappingURL=useHubWalletAddress.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"useHubWalletAddress.d.ts","sourceRoot":"","sources":["../../../src/hooks/mm/useHubWalletAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAwB,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1F,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEtE;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,WAAW,EAAE,cAAc,GAC1B,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,CAoB/B"}

package/src/hooks/mm/useAllowance.ts

@@ -1,33 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import type { SpokeChainId, XToken } from '@sodax/types';
-import { useSodaxContext } from '../shared/useSodaxContext';
-import { useSpokeProvider } from '../provider/useSpokeProvider';
-import { parseUnits } from 'viem';
-import type { MoneyMarketAction } from '@sodax/sdk';
-
-export function useAllowance(token: XToken, amount: string, action: MoneyMarketAction) {
-  const { sodax } = useSodaxContext();
-  const spokeProvider = useSpokeProvider(token.xChainId as SpokeChainId);
-
-  return useQuery({
-    queryKey: ['allowance', token.address, amount, action],
-    queryFn: async () => {
-      if (!spokeProvider) {
-        return false;
-      }
-      const allowance = await sodax.moneyMarket.isAllowanceValid(
-        {
-          token: token.address,
-          amount: parseUnits(amount, token.decimals),
-          action,
-        },
-        spokeProvider,
-      );
-      if (allowance.ok) {
-        return allowance.value;
-      }
-      return false;
-    },
-    enabled: !!spokeProvider,
-  });
-}

package/src/hooks/mm/useHubWalletAddress.ts

@@ -1,49 +0,0 @@
-import { type EvmHubProvider, EvmWalletAbstraction, type SpokeChainId } from '@sodax/sdk';
-import { useQuery, type UseQueryResult } from '@tanstack/react-query';
-
-/**
- * Hook for retrieving the hub wallet address for a given spoke chain and address.
- *
- * This hook fetches the hub wallet address associated with a user's address on a specific spoke chain.
- * It uses the EvmWalletAbstraction to query the hub wallet address from the hub provider.
- *
- * @param spokeChainId - The chain ID of the spoke chain
- * @param address - The user's address on the spoke chain
- * @param hubProvider - The hub provider instance
- *
- * @returns {UseQueryResult<string | null>} A query result object containing:
- *   - data: The hub wallet address or null if not found
- *   - isLoading: Boolean indicating if the query is in progress
- *   - error: Error object if the query failed, null otherwise
- *
- * @example
- * ```typescript
- * const { data: hubWalletAddress, isLoading, error } = useHubWalletAddress(spokeChainId, address, hubProvider);
- * ```
- */
-
-export function useHubWalletAddress(
-  spokeChainId: SpokeChainId,
-  address: string | undefined,
-  hubProvider: EvmHubProvider,
-): UseQueryResult<string | null> {
-  return useQuery({
-    queryKey: ['hubWallet', spokeChainId, address],
-    queryFn: async () => {
-      if (!address) return null;
-
-      try {
-        const hubWalletAddress = await EvmWalletAbstraction.getUserHubWalletAddress(
-          spokeChainId,
-          address as `0x${string}`,
-          hubProvider,
-        );
-        return hubWalletAddress;
-      } catch (error) {
-        console.log('error', error);
-        return null;
-      }
-    },
-    enabled: !!address && !!hubProvider,
-  });
-}