@sodax/dapp-kit 1.0.0-rc.8 → 1.0.1-beta-rc1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sodax/dapp-kit",
   "license": "MIT",
-  "version": "1.0.0-rc.8",
+  "version": "1.0.1-beta-rc1",
   "description": "dapp-kit of New World",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,8 +16,8 @@
   },
   "dependencies": {
     "viem": "2.29.2",
-    "@sodax/sdk": "1.0.0-rc.8",
-    "@sodax/types": "1.0.0-rc.8"
+    "@sodax/sdk": "1.0.1-beta-rc1",
+    "@sodax/types": "1.0.1-beta-rc1"
   },
   "devDependencies": {
     "@types/react": "18.3.1",

package/src/hooks/bridge/useBridge.ts

@@ -1,5 +1,12 @@
 import { useSodaxContext } from '../shared/useSodaxContext';
-import type { BridgeError, BridgeErrorCode, SpokeTxHash, HubTxHash, Result, CreateBridgeIntentParams } from '@sodax/sdk';
+import type {
+  BridgeError,
+  BridgeErrorCode,
+  SpokeTxHash,
+  HubTxHash,
+  Result,
+  CreateBridgeIntentParams,
+} from '@sodax/sdk';
 import { useMutation, type UseMutationResult } from '@tanstack/react-query';
 import type { SpokeProvider } from '@sodax/sdk';
 

package/src/hooks/migrate/types.ts

@@ -1,15 +1,15 @@
-import type { XToken } from '@sodax/types';
-
-export const MIGRATION_MODE_ICX_SODA = 'icxsoda';
-export const MIGRATION_MODE_BNUSD = 'bnusd';
-
-export type MigrationMode = typeof MIGRATION_MODE_ICX_SODA | typeof MIGRATION_MODE_BNUSD;
-
-export interface MigrationIntentParams {
-  token: XToken | undefined;
-  amount: string | undefined;
-  sourceAddress: string | undefined;
-  migrationMode?: MigrationMode;
-  toToken?: XToken;
-  destinationAddress?: string;
-}
+import type { XToken } from '@sodax/types';
+
+export const MIGRATION_MODE_ICX_SODA = 'icxsoda';
+export const MIGRATION_MODE_BNUSD = 'bnusd';
+
+export type MigrationMode = typeof MIGRATION_MODE_ICX_SODA | typeof MIGRATION_MODE_BNUSD;
+
+export interface MigrationIntentParams {
+  token: XToken | undefined;
+  amount: string | undefined;
+  sourceAddress: string | undefined;
+  migrationMode?: MigrationMode;
+  toToken?: XToken;
+  destinationAddress?: string;
+}

package/src/hooks/mm/useAToken.ts

@@ -24,9 +24,7 @@ import { useSodaxContext } from '../shared/useSodaxContext';
  *   - isLoading: Loading state indicator.
  *   - error: Any error that occurred during data fetching.
  */
-export function useAToken(
-  aToken: Address | undefined,
-): UseQueryResult<XToken, Error> {
+export function useAToken(aToken: Address | undefined): UseQueryResult<XToken, Error> {
   const { sodax } = useSodaxContext();
 
   return useQuery({

package/src/hooks/provider/useSpokeProvider.ts

@@ -56,7 +56,7 @@ export function useSpokeProvider(
     if (!spokeChainId) return undefined;
     if (!xChainType) return undefined;
     if (!rpcConfig) return undefined;
-    
+
     if (xChainType === 'EVM') {
       if (spokeChainId === SONIC_MAINNET_CHAIN_ID) {
         return new SonicSpokeProvider(

package/src/hooks/shared/index.ts

@@ -2,4 +2,4 @@ export * from './useSodaxContext';
 export * from './useEstimateGas';
 export * from './useDeriveUserWalletAddress';
 export * from './useStellarTrustlineCheck';
-export * from './useRequestTrustline';
+export * from './useRequestTrustline';

package/src/hooks/shared/useDeriveUserWalletAddress.ts

@@ -1,5 +1,4 @@
-// packages/dapp-kit/src/hooks/shared/useDeriveUserWalletAddress.ts
-import { deriveUserWalletAddress, type SpokeProvider } from '@sodax/sdk';
+import { deriveUserWalletAddress, type SpokeProvider, type SpokeChainId } from '@sodax/sdk';
 import { useQuery, type UseQueryResult } from '@tanstack/react-query';
 import { useSodaxContext } from './useSodaxContext';
 import type { Address } from 'viem';
@@ -7,38 +6,48 @@ import type { Address } from 'viem';
 /**
  * Hook for deriving user wallet address for hub abstraction.
  *
- * This hook derives the user's abstracted wallet address for the hub chain.
- * If the spoke chain is the same as the hub chain, it returns the original wallet address.
- * Otherwise, it returns the abstracted wallet address for cross-chain operations.
+ * This hook derives the user's abstracted wallet address for the hub chain based on the spoke chain ID and address.
+ * If the spoke chain is the same as the hub chain, it returns the encoded spoke address.
+ * Otherwise, it derives and returns the abstracted wallet address for cross-chain operations.
  *
- * @param spokeProvider - The spoke provider instance for the origin chain
- * @param walletAddress - Optional user wallet address on spoke chain. If not provided, will fetch from spokeProvider
+ * The query is automatically enabled when both `spokeChainId` and `spokeAddress` are provided.
+ * This is a deterministic operation, so the result is cached and not refetched automatically.
+ *
+ * @param spokeChainId - Optional spoke chain ID. If not provided, the query will be disabled.
+ * @param spokeAddress - Optional user wallet address on the spoke chain. If not provided, the query will be disabled.
  * @returns A React Query result object containing:
- *   - data: The derived user wallet address when available
+ *   - data: The derived user wallet address (Address) when available
  *   - isLoading: Loading state indicator
- *   - error: Any error that occurred during derivation
+ *   - error: Any error that occurred during derivation (Error)
  *
  * @example
  * ```typescript
- * const { data: derivedAddress, isLoading, error } = useDeriveUserWalletAddress(spokeProvider, userAddress);
+ * const { data: derivedAddress, isLoading, error } = useDeriveUserWalletAddress(spokeChainId, userAddress);
+ *
+ * if (isLoading) return <div>Deriving address...</div>;
+ * if (error) return <div>Error: {error.message}</div>;
+ * if (derivedAddress) return <div>Derived Address: {derivedAddress}</div>;
  * ```
  */
 export function useDeriveUserWalletAddress(
-  spokeProvider: SpokeProvider | undefined,
-  walletAddress?: string | undefined,
+  spokeChainId?: SpokeChainId | SpokeProvider | undefined,
+  spokeAddress?: string | undefined,
 ): UseQueryResult<Address, Error> {
   const { sodax } = useSodaxContext();
 
   return useQuery({
-    queryKey: ['deriveUserWalletAddress', spokeProvider?.chainConfig.chain.id, walletAddress],
+    queryKey: ['deriveUserWalletAddress', spokeChainId, spokeAddress],
     queryFn: async (): Promise<Address> => {
-      if (!spokeProvider) {
-        throw new Error('Spoke provider is required');
+      if (!spokeChainId || !spokeAddress) {
+        throw new Error('Spoke chain id and address are required');
       }
 
-      return await deriveUserWalletAddress(spokeProvider, sodax.hubProvider, walletAddress);
+      // Determine if spokeChainId is a SpokeProvider object or SpokeChainId value
+      spokeChainId = typeof spokeChainId === 'object' ? spokeChainId.chainConfig.chain.id : spokeChainId;
+
+      return await deriveUserWalletAddress(sodax.hubProvider, spokeChainId, spokeAddress);
     },
-    enabled: !!spokeProvider,
+    enabled: !!spokeChainId && !!spokeAddress,
     refetchInterval: false, // This is a deterministic operation, no need to refetch
   });
 }

package/src/hooks/swap/useCancelSwap.ts

@@ -38,7 +38,7 @@ export function useCancelSwap(
       if (!spokeProvider) {
         throw new Error('Spoke provider not found');
       }
-      return sodax.swap.cancelIntent(intent, spokeProvider, raw);
+      return sodax.swaps.cancelIntent(intent, spokeProvider, raw);
     },
   });
 }

package/src/hooks/swap/useQuote.ts

@@ -42,7 +42,7 @@ export const useQuote = (
   payload: SolverIntentQuoteRequest | undefined,
 ): UseQueryResult<Result<SolverIntentQuoteResponse, SolverErrorResponse> | undefined> => {
   const { sodax } = useSodaxContext();
-  
+
   // Create a serializable query key by converting BigInt to string
   const queryKey = useMemo(() => {
     if (!payload) return ['quote', undefined];
@@ -61,7 +61,7 @@ export const useQuote = (
       if (!payload) {
         return undefined;
       }
-      return sodax.swap.getQuote(payload);
+      return sodax.swaps.getQuote(payload);
     },
     enabled: !!payload,
     refetchInterval: 3000,

package/src/hooks/swap/useStatus.ts

@@ -37,7 +37,7 @@ export const useStatus = (
   return useQuery({
     queryKey: [intent_tx_hash],
     queryFn: async () => {
-      return sodax.swap.getStatus({ intent_tx_hash });
+      return sodax.swaps.getStatus({ intent_tx_hash });
     },
     refetchInterval: 3000, // 3s
   });

package/src/hooks/swap/useSwap.ts

@@ -47,7 +47,7 @@ export function useSwap(
       if (!spokeProvider) {
         throw new Error('Spoke provider not found');
       }
-      return sodax.swap.swap({
+      return sodax.swaps.swap({
         intentParams: params,
         spokeProvider,
       });

package/src/hooks/swap/useSwapAllowance.ts

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

package/src/hooks/swap/useSwapApprove.ts

@@ -44,7 +44,7 @@ export function useSwapApprove(
         throw new Error('Swap Params not found');
       }
 
-      const allowance = await sodax.swap.approve({
+      const allowance = await sodax.swaps.approve({
         intentParams: params,
         spokeProvider,
       });