@sodax/dapp-kit 0.0.1-rc.16 → 0.0.1-rc.18

package/src/hooks/provider/useSpokeProvider.ts

@@ -1,3 +1,4 @@
+import { useSodaxContext } from '@/index';
 import {
   EvmSpokeProvider,
   spokeChainConfig,
@@ -27,7 +28,6 @@ import type {
   IStellarWalletProvider,
   ISolanaWalletProvider,
 } from '@sodax/types';
-import { getXChainType, useWalletProvider } from '@sodax/wallet-sdk';
 import { useMemo } from 'react';
 
 /**
@@ -48,48 +48,52 @@ export function useSpokeProvider(
   spokeChainId: SpokeChainId | undefined,
   walletProvider?: IWalletProvider | undefined,
 ): SpokeProvider | undefined {
-  const xChainType = getXChainType(spokeChainId);
-  const walletProvider_ = useWalletProvider(spokeChainId);
-  const _walletProvider = walletProvider ?? walletProvider_;
+  const { rpcConfig } = useSodaxContext();
+  const xChainType = spokeChainId ? spokeChainConfig[spokeChainId]?.chain.type : undefined;
 
   const spokeProvider = useMemo(() => {
-    if (!_walletProvider) return undefined;
+    if (!walletProvider) return undefined;
     if (!spokeChainId) return undefined;
+    if (!xChainType) return undefined;
+    if (!rpcConfig) return undefined;
 
     if (xChainType === 'EVM') {
       if (spokeChainId === SONIC_MAINNET_CHAIN_ID) {
         return new SonicSpokeProvider(
-          _walletProvider as IEvmWalletProvider,
+          walletProvider as IEvmWalletProvider,
           spokeChainConfig[spokeChainId] as SonicSpokeChainConfig,
         );
       }
       return new EvmSpokeProvider(
-        _walletProvider as IEvmWalletProvider,
+        walletProvider as IEvmWalletProvider,
         spokeChainConfig[spokeChainId] as EvmSpokeChainConfig,
       );
     }
+
     if (xChainType === 'SUI') {
       return new SuiSpokeProvider(
         spokeChainConfig[spokeChainId] as SuiSpokeChainConfig,
-        _walletProvider as ISuiWalletProvider,
+        walletProvider as ISuiWalletProvider,
       );
     }
+
     if (xChainType === 'ICON') {
       return new IconSpokeProvider(
-        _walletProvider as IIconWalletProvider,
+        walletProvider as IIconWalletProvider,
         spokeChainConfig[spokeChainId] as IconSpokeChainConfig,
       );
     }
+
     if (xChainType === 'INJECTIVE') {
       return new InjectiveSpokeProvider(
         spokeChainConfig[spokeChainId] as InjectiveSpokeChainConfig,
-        _walletProvider as IInjectiveWalletProvider,
+        walletProvider as IInjectiveWalletProvider,
       );
     }
 
     if (xChainType === 'STELLAR') {
       const stellarConfig = spokeChainConfig[spokeChainId] as StellarSpokeChainConfig;
-      return new StellarSpokeProvider(_walletProvider as IStellarWalletProvider, stellarConfig, {
+      return new StellarSpokeProvider(walletProvider as IStellarWalletProvider, stellarConfig, {
         horizonRpcUrl: stellarConfig.horizonRpcUrl,
         sorobanRpcUrl: stellarConfig.sorobanRpcUrl,
       });
@@ -97,13 +101,18 @@ export function useSpokeProvider(
 
     if (xChainType === 'SOLANA') {
       return new SolanaSpokeProvider(
-        _walletProvider as ISolanaWalletProvider,
-        spokeChainConfig[spokeChainId] as SolanaChainConfig,
+        walletProvider as ISolanaWalletProvider,
+        rpcConfig.solana
+          ? ({
+              ...spokeChainConfig[spokeChainId],
+              rpcUrl: rpcConfig.solana,
+            } as SolanaChainConfig)
+          : (spokeChainConfig[spokeChainId] as SolanaChainConfig),
       );
     }
 
     return undefined;
-  }, [spokeChainId, xChainType, _walletProvider]);
+  }, [spokeChainId, xChainType, walletProvider, rpcConfig]);
 
   return spokeProvider;
 }

package/src/hooks/swap/index.ts

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

package/src/hooks/swap/{useCreateIntentOrder.ts → useSwap.ts}

@@ -7,14 +7,14 @@ import type {
   Intent,
   IntentError,
   SpokeProvider,
-  Hex,
+  IntentDeliveryInfo,
 } from '@sodax/sdk';
 import { useMutation, 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 intent order for cross-chain swaps.
+ * Hook for creating and submitting an swap intent order for cross-chain swaps.
  * Uses React Query's useMutation for better state management and caching.
  *
  * @param {SpokeProvider} spokeProvider - The spoke provider to use for the swap
@@ -22,10 +22,10 @@ type CreateIntentResult = Result<[SolverExecutionResponse, Intent, Hex], IntentE
  *
  * @example
  * ```typescript
- * const { mutateAsync: createIntent, isPending } = useCreateIntentOrder(spokeProvider);
+ * const { mutateAsync: swap, isPending } = useSwap(spokeProvider);
  *
  * const handleSwap = async () => {
- *   const result = await createIntent({
+ *   const result = await swap({
  *     token_src: '0x...',
  *     token_src_blockchain_id: 'arbitrum',
  *     token_dst: '0x...',
@@ -36,7 +36,7 @@ type CreateIntentResult = Result<[SolverExecutionResponse, Intent, Hex], IntentE
  * };
  * ```
  */
-export function useCreateIntentOrder(
+export function useSwap(
   spokeProvider: SpokeProvider | undefined,
 ): UseMutationResult<CreateIntentResult, Error, CreateIntentParams> {
   const { sodax } = useSodaxContext();
@@ -46,7 +46,10 @@ export function useCreateIntentOrder(
       if (!spokeProvider) {
         throw new Error('Spoke provider not found');
       }
-      return sodax.solver.createAndSubmitIntent(params, spokeProvider);
+      return sodax.solver.swap({
+        intentParams: params,
+        spokeProvider,
+      });
     },
   });
 }

package/src/hooks/swap/useSwapAllowance.ts

@@ -33,7 +33,10 @@ export function useSwapAllowance(
       if (!spokeProvider || !params) {
         return false;
       }
-      const allowance = await sodax.solver.isAllowanceValid(params, spokeProvider);
+      const allowance = await sodax.solver.isAllowanceValid({
+        intentParams: params,
+        spokeProvider,
+      });
       if (allowance.ok) {
         return allowance.value;
       }

package/src/hooks/swap/useSwapApprove.ts

@@ -1,11 +1,9 @@
 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';
+import type { CreateIntentParams, SpokeProvider } from '@sodax/sdk';
 
 interface UseApproveReturn {
-  approve: ({ amount }: { amount: string }) => Promise<boolean>;
+  approve: ({ params }: { params: CreateIntentParams }) => Promise<boolean>;
   isLoading: boolean;
   error: Error | null;
   resetError: () => void;
@@ -25,7 +23,10 @@ interface UseApproveReturn {
  * ```
  */
 
-export function useSwapApprove(token: Token | undefined, spokeProvider: SpokeProvider | undefined): UseApproveReturn {
+export function useSwapApprove(
+  params: CreateIntentParams | undefined,
+  spokeProvider: SpokeProvider | undefined,
+): UseApproveReturn {
   const { sodax } = useSodaxContext();
   const queryClient = useQueryClient();
 
@@ -35,27 +36,26 @@ export function useSwapApprove(token: Token | undefined, spokeProvider: SpokePro
     error,
     reset: resetError,
   } = useMutation({
-    mutationFn: async ({ amount }: { amount: string }) => {
+    mutationFn: async ({ params }: { params: CreateIntentParams | undefined }) => {
       if (!spokeProvider) {
         throw new Error('Spoke provider not found');
       }
-      if (!token) {
-        throw new Error('Token not found');
+      if (!params) {
+        throw new Error('Swap Params not found');
       }
 
-      const allowance = await sodax.solver.approve(
-        token.address as Address,
-        parseUnits(amount, token.decimals),
+      const allowance = await sodax.solver.approve({
+        intentParams: params,
         spokeProvider,
-      );
+      });
       if (!allowance.ok) {
-        throw new Error('Failed to approve tokens');
+        throw new Error('Failed to approve input token');
       }
       return allowance.ok;
     },
     onSuccess: () => {
       // Invalidate allowance query to refetch the new allowance
-      queryClient.invalidateQueries({ queryKey: ['allowance', token?.address] });
+      queryClient.invalidateQueries({ queryKey: ['allowance', params?.inputToken] });
     },
   });
 

package/src/index.ts

@@ -1,3 +1,4 @@
 export * from './hooks';
 export * from './providers';
 export * from './core';
+export * from './types';

package/src/providers/SodaxProvider.tsx

@@ -2,14 +2,16 @@ import type { ReactNode, ReactElement } from 'react';
 import { EvmHubProvider, getHubChainConfig, Sodax, type SodaxConfig } from '@sodax/sdk';
 import { SodaxContext } from '@/contexts';
 import React, { useMemo } from 'react';
+import type { RpcConfig } from '@/types';
 
 interface SodaxProviderProps {
   children: ReactNode;
   testnet?: boolean;
-  config: SodaxConfig;
+  config?: SodaxConfig;
+  rpcConfig: RpcConfig;
 }
 
-export const SodaxProvider = ({ children, testnet = false, config }: SodaxProviderProps): ReactElement => {
+export const SodaxProvider = ({ children, testnet = false, config, rpcConfig }: SodaxProviderProps): ReactElement => {
   const sodax = new Sodax(config);
 
   const hubChainId = config?.hubProviderConfig?.chainConfig.chain.id;
@@ -27,5 +29,5 @@ export const SodaxProvider = ({ children, testnet = false, config }: SodaxProvid
     return undefined;
   }, [hubChainId, hubRpcUrl]);
 
-  return <SodaxContext.Provider value={{ sodax, testnet, hubProvider }}>{children}</SodaxContext.Provider>;
+  return <SodaxContext.Provider value={{ sodax, testnet, hubProvider, rpcConfig }}>{children}</SodaxContext.Provider>;
 };

package/src/types.ts

@@ -0,0 +1,22 @@
+import type { StellarRpcConfig } from '@sodax/sdk';
+
+export type RpcConfig = {
+  // EVM chains - all use string RPC URLs
+  sonic?: string;
+  '0xa86a.avax'?: string;
+  '0xa4b1.arbitrum'?: string;
+  '0x2105.base'?: string;
+  '0x38.bsc'?: string;
+  '0xa.optimism'?: string;
+  '0x89.polygon'?: string;
+  nibiru?: string;
+
+  // Other chains - all use string RPC URLs
+  'injective-1'?: string;
+  sui?: string;
+  solana?: string;
+  '0x1.icon'?: string;
+
+  // Stellar - uses object with horizon and soroban RPC URLs
+  stellar?: StellarRpcConfig;
+};

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

@@ -1 +0,0 @@
-{"version":3,"file":"useCreateIntentOrder.d.ts","sourceRoot":"","sources":["../../../src/hooks/swap/useCreateIntentOrder.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,oBAAoB,CAClC,aAAa,EAAE,aAAa,GAAG,SAAS,GACvC,iBAAiB,CAAC,kBAAkB,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAWlE"}