@sodax/dapp-kit 1.0.4-beta-rc1 → 1.0.4-beta

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sodax/dapp-kit",
   "license": "MIT",
-  "version": "1.0.4-beta-rc1",
+  "version": "1.0.4-beta",
   "description": "dapp-kit of New World",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,13 +16,13 @@
   },
   "dependencies": {
     "viem": "2.29.2",
-    "@sodax/sdk": "1.0.4-beta-rc1",
-    "@sodax/types": "1.0.4-beta-rc1"
+    "@sodax/sdk": "1.0.4-beta",
+    "@sodax/types": "1.0.4-beta"
   },
   "devDependencies": {
     "@types/react": "19.0.8",
     "knip": "5.30.5",
-    "tsup": "^8.4.0",
+    "tsup": "8.5.0",
     "typescript": "5.5.4"
   },
   "peerDependencies": {

package/src/hooks/bridge/useGetBridgeableAmount.ts

@@ -1,6 +1,6 @@
 import { useQuery, type UseQueryResult } from '@tanstack/react-query';
 import { useSodaxContext } from '../shared/useSodaxContext';
-import type { XToken } from '@sodax/sdk';
+import type { BridgeLimit, XToken } from '@sodax/sdk';
 
 /**
  * Hook for getting the amount available to be bridged.
@@ -11,8 +11,8 @@ import type { XToken } from '@sodax/sdk';
  * @param {SpokeChainId | undefined} chainId - The chain ID to get the balance for
  * @param {string | undefined} token - The token address to get the balance for
  *
- * @returns {UseQueryResult<bigint, Error>} A React Query result containing:
- *   - data: The available amount to be bridged (bigint)
+ * @returns {UseQueryResult<BridgeLimit, Error>} A React Query result containing:
+ *   - data: Data about available amount to be bridged
  *   - error: Any error that occurred during the check
  *
  * @example
@@ -27,23 +27,24 @@ import type { XToken } from '@sodax/sdk';
 export function useGetBridgeableAmount(
   from: XToken | undefined,
   to: XToken | undefined,
-): UseQueryResult<bigint, Error> {
+): UseQueryResult<BridgeLimit, Error> {
   const { sodax } = useSodaxContext();
 
   return useQuery({
     queryKey: ['spoke-asset-manager-token-balance', from, to],
     queryFn: async () => {
       if (!from || !to) {
-        return 0n;
+        return { amount: 0n, decimals: 0, type: 'DEPOSIT_LIMIT' } as const;
       }
 
       const result = await sodax.bridge.getBridgeableAmount(from, to);
+
       if (result.ok) {
         return result.value;
       }
 
       console.error('Error getting bridgeable amount:', result.error);
-      return 0n;
+      return { amount: 0n, decimals: 0, type: 'DEPOSIT_LIMIT' } as const;
     },
     enabled: !!from && !!to,
   });

package/src/hooks/mm/useATokensBalances.ts

@@ -3,7 +3,7 @@ import { isAddress, type Address } from 'viem';
 import { useQuery, type UseQueryOptions, type UseQueryResult } from '@tanstack/react-query';
 import { useSodaxContext } from '../shared/useSodaxContext';
 import type { SpokeProvider } from '@sodax/sdk';
-import { deriveUserWalletAddress } from '@sodax/sdk';
+import { HubService } from '@sodax/sdk';
 
 export type UseATokensBalancesParams = {
   aTokens: readonly Address[];
@@ -74,12 +74,7 @@ export function useATokensBalances({
         }
       }
 
-      // Derive user's hub wallet address
-      const hubWalletAddress = await deriveUserWalletAddress(
-        sodax.hubProvider,
-        spokeProvider.chainConfig.chain.id,
-        userAddress,
-      );
+      const hubWalletAddress = await HubService.getUserHubWalletAddress(userAddress, spokeProvider.chainConfig.chain.id, sodax.hubProvider);
 
       return await sodax.moneyMarket.data.getATokensBalances(aTokens, hubWalletAddress);
     },

package/src/hooks/shared/index.ts

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

package/src/hooks/shared/useGetUserHubWalletAddress.ts

@@ -0,0 +1,54 @@
+import { type SpokeProvider, type SpokeChainId, HubService } from '@sodax/sdk';
+import { useQuery, type UseQueryResult } from '@tanstack/react-query';
+import { useSodaxContext } from './useSodaxContext';
+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 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.
+ * NOTE: This hook is different from useDeriveUserWalletAddress because it uses wallet router address instead of CREATE3 address for Sonic (hub).
+ *
+ * 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 (Address) when available
+ *   - isLoading: Loading state indicator
+ *   - error: Any error that occurred during derivation (Error)
+ *
+ * @example
+ * ```typescript
+ * 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 useGetUserHubWalletAddress(
+  spokeChainId?: SpokeChainId | SpokeProvider | undefined,
+  spokeAddress?: string | undefined,
+): UseQueryResult<Address, Error> {
+  const { sodax } = useSodaxContext();
+
+  return useQuery({
+    queryKey: ['getUserHubWalletAddress', spokeChainId, spokeAddress],
+    queryFn: async (): Promise<Address> => {
+      if (!spokeChainId || !spokeAddress) {
+        throw new Error('Spoke chain id and address are required');
+      }
+
+      // Determine if spokeChainId is a SpokeProvider object or SpokeChainId value
+      spokeChainId = typeof spokeChainId === 'object' ? spokeChainId.chainConfig.chain.id : spokeChainId;
+
+      return await HubService.getUserHubWalletAddress(spokeAddress, spokeChainId, sodax.hubProvider);
+    },
+    enabled: !!spokeChainId && !!spokeAddress,
+    refetchInterval: false, // This is a deterministic operation, no need to refetch
+  });
+}