v0.2.9

sdk/typescript/rooch-sdk-kit/src/hooks/client/useSignAndExecuteTransaction.ts

@@ -26,7 +26,7 @@ type UsesignAndExecuteTransactionOptions = Omit<
   'mutationFn'
 >
 
-export function UseSignAndExecuteTransaction({
+export function useSignAndExecuteTransaction({
   mutationKey,
   ...mutationOptions
 }: UsesignAndExecuteTransactionOptions = {}): UseMutationResult<

sdk/typescript/rooch-sdk-kit/src/hooks/useSession.ts

@@ -0,0 +1,17 @@
+// Copyright (c) RoochNetwork
+// SPDX-License-Identifier: Apache-2.0
+
+import { useSessionStore } from './useSessionsStore.js'
+
+/**
+ * Retrieves the all session account
+ */
+export function useSession(scope: string) {
+  return useSessionStore((state) =>
+    state.sessions.find((item) =>
+      scope.includes('::')
+        ? item.getScopes().find((_scope) => _scope === scope)
+        : item.getScopes().find((_scope) => _scope.startsWith(scope)) !== undefined,
+    ),
+  )
+}

sdk/typescript/rooch-sdk-kit/src/hooks/useSessions.ts

@@ -6,7 +6,7 @@ import { useSessionStore } from './useSessionsStore.js'
 /**
  * Retrieves the all session account
  */
-export function useSession() {
+export function useSessions() {
   return useSessionStore((state) =>
     state.sessions.sort((a, b) => b.getCreateTime() - a.getCreateTime()),
   )

sdk/typescript/rooch-sdk-kit/src/hooks/wallet/index.ts

@@ -4,9 +4,9 @@
 export * from './useAddresses.js'
 export * from './useAutoConnectWallet.js'
 export * from './useConnectWallet.js'
-export * from './useCurrentAccount.js'
+export * from './useCurrentAddress.js'
 export * from './useCurrentWallet.js'
 export * from './useWalletCreateSession.js'
 export * from './useWallets.js'
-export * from './useWalletStore.js'
 export * from './useWalletChanged.js'
+export * from './useConnectionStatus.js'

sdk/typescript/rooch-sdk-kit/src/hooks/wallet/useAutoConnectWallet.ts

@@ -4,13 +4,9 @@
 import { useQuery } from '@tanstack/react-query'
 import { useLayoutEffect, useState } from 'react'
 
-import {
-  useWalletStore,
-  useConnectWallet,
-  useWallets,
-  useCurrentWallet,
-  useCurrentAddress,
-} from './index.js'
+import { useConnectWallet, useWallets, useCurrentWallet, useCurrentAddress } from './index.js'
+
+import { useWalletStore } from './useWalletStore'
 
 export function useAutoConnectWallet(): 'disabled' | 'idle' | 'attempted' {
   const { mutateAsync: connectWallet } = useConnectWallet()

sdk/typescript/rooch-sdk-kit/src/hooks/wallet/useConnectWallet.ts

@@ -9,7 +9,7 @@ import { useWalletStore } from './useWalletStore.js'
 import { walletMutationKeys } from '../../constants/index.js'
 import { Wallet } from '../../wellet/index.js'
 import { useSessionStore } from '../useSessionsStore.js'
-import { useSession } from '../useSessions.js'
+import { useSessions } from '../useSessions.js'
 
 type ConnectWalletArgs = {
   wallet: Wallet
@@ -34,7 +34,7 @@ export function useConnectWallet({
   ConnectWalletArgs,
   unknown
 > {
-  const sessions = useSession()
+  const sessions = useSessions()
   const setCurrentSession = useSessionStore((state) => state.setCurrentSession)
   const setWalletConnected = useWalletStore((state) => state.setWalletConnected)
   const setWalletDisconnected = useWalletStore((state) => state.setWalletDisconnected)

sdk/typescript/rooch-sdk-kit/src/hooks/wallet/useConnectionStatus.ts

@@ -0,0 +1,8 @@
+// Copyright (c) RoochNetwork
+// SPDX-License-Identifier: Apache-2.0
+
+import { useWalletStore } from './useWalletStore'
+
+export function useConnectionStatus() {
+  return useWalletStore((state) => state.connectionStatus)
+}

sdk/typescript/rooch-sdk-kit/src/hooks/wallet/useCurrentAccount.ts → sdk/typescript/rooch-sdk-kit/src/hooks/wallet/useCurrentAddress.ts

@@ -1,7 +1,7 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
-import { useWalletStore } from './index.js'
+import { useWalletStore } from './useWalletStore'
 
 /**
  * Retrieves all wallets

sdk/typescript/rooch-sdk-kit/src/http/httpTransport.ts

@@ -5,21 +5,17 @@ import {
   RoochHTTPTransport,
   RoochTransportRequestOptions,
   RoochHTTPTransportOptions,
-  ErrorValidateInvalidAccountAuthKey,
-  ErrorValidateSessionIsExpired,
 } from '@roochnetwork/rooch-sdk'
 
-type SessionExpiredCallbackType = () => void
-
 export class HTTPTransport extends RoochHTTPTransport {
-  private readonly sessionExpiredCallback: SessionExpiredCallbackType
+  private readonly requestErrorCallback: (code: number, msg: string) => void
 
   constructor(
     options: RoochHTTPTransportOptions,
-    sessionExpiredCallback: SessionExpiredCallbackType,
+    requestErrorCallback: (code: number, msg: string) => void,
   ) {
     super(options)
-    this.sessionExpiredCallback = sessionExpiredCallback
+    this.requestErrorCallback = requestErrorCallback
   }
 
   async request<T>(input: RoochTransportRequestOptions): Promise<T> {
@@ -28,11 +24,8 @@ export class HTTPTransport extends RoochHTTPTransport {
       result = await super.request(input)
       return result
     } catch (e: any) {
-      if (
-        'code' in e &&
-        (e.code === ErrorValidateInvalidAccountAuthKey || e.code === ErrorValidateSessionIsExpired)
-      ) {
-        this.sessionExpiredCallback()
+      if ('code' in e) {
+        this.requestErrorCallback(e.code, e.message)
       }
       throw e
     }

sdk/typescript/rooch-sdk-kit/src/provider/errorProvider.tsx

@@ -0,0 +1,50 @@
+// Copyright (c) RoochNetwork
+// SPDX-License-Identifier: Apache-2.0
+
+import { createContext, ReactNode, useContext, useMemo, useState } from 'react'
+
+export type ErrorType = {
+  code: number
+  msg: string
+}
+
+export interface ErrorProviderContext {
+  error: ErrorType | null
+  setError: (error: ErrorType) => void
+  resolve: () => void
+}
+
+const ErrorContext = createContext<ErrorProviderContext | null>(null)
+
+export const useError = () => {
+  const ctx = useContext(ErrorContext)!
+  return {
+    error: ctx.error,
+    resolve: ctx.resolve,
+  }
+}
+
+export const useSetError = () => {
+  const ctx = useContext(ErrorContext)!
+  return ctx.setError
+}
+
+export type ErrorProviderProps = {
+  children: ReactNode
+}
+
+export const ErrorProvider = (props: ErrorProviderProps) => {
+  const { children } = props
+  const [error, setError] = useState<ErrorType | null>(null)
+
+  const ctx = useMemo((): ErrorProviderContext => {
+    return {
+      error: error,
+      setError: setError,
+      resolve: () => {
+        setError(null)
+      },
+    }
+  }, [error])
+  return <ErrorContext.Provider value={ctx}>{children}</ErrorContext.Provider>
+}

sdk/typescript/rooch-sdk-kit/src/provider/index.ts

@@ -4,3 +4,4 @@
 export * from './roochProvider.js'
 export * from './walletProvider.js'
 export type { NetworkConfigs } from './clientProvider.js'
+export { useError } from './errorProvider.js'

sdk/typescript/rooch-sdk-kit/src/provider/roochProvider.tsx

@@ -7,6 +7,7 @@ import { createContext, useRef } from 'react'
 import { NetworkConfigs, RoochClientProvider } from './clientProvider.js'
 import { createSessionStore, SessionStore } from './sessionStore.js'
 import { getDefaultStorage, StorageType } from '../utils/index.js'
+import { ErrorProvider } from './errorProvider.js'
 
 const DEFAULT_SESSION_STORAGE_KEY = function (_?: string) {
   return 'rooch-sdk-kit:rooch-session-info'
@@ -17,7 +18,7 @@ export const RoochContext = createContext<SessionStore | null>(null)
 export type RoochProviderProps<T extends NetworkConfigs> = {
   networks?: NetworkConfigs
   onNetworkChange?: (network: keyof T & string) => void
-
+  requestErrorCallback?: (code: number) => void
   children: ReactNode
 } & (
   | {
@@ -42,9 +43,11 @@ export function RoochProvider<T extends NetworkConfigs>(props: RoochProviderProp
   )
   return (
     <RoochContext.Provider value={storeRef.current}>
-      <RoochClientProvider networks={networks} defaultNetwork={defaultNetwork}>
-        {children}
-      </RoochClientProvider>
+      <ErrorProvider>
+        <RoochClientProvider networks={networks} defaultNetwork={defaultNetwork}>
+          {children}
+        </RoochClientProvider>
+      </ErrorProvider>
     </RoochContext.Provider>
   )
 }

sdk/typescript/rooch-sdk-kit/src/provider/useDefaultClient.ts

@@ -2,16 +2,22 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { useCallback, useMemo } from 'react'
-import { isRoochClient, RoochClient } from '@roochnetwork/rooch-sdk'
+import {
+  ErrorValidateInvalidAccountAuthKey,
+  ErrorValidateSessionIsExpired,
+  isRoochClient,
+  RoochClient,
+} from '@roochnetwork/rooch-sdk'
 import { useSessionStore } from '../hooks/useSessionsStore.js'
 import { NetworkConfig } from '../hooks/index.js'
 import { NetworkConfigs } from './clientProvider.js'
 import { HTTPTransport } from '../http/httpTransport.js'
+import { useSetError } from './errorProvider.js'
 
 const DEFAULT_CREATE_CLIENT = (
   _name: string,
   config: NetworkConfig | RoochClient,
-  setCurrentSession: any,
+  requestErrorCallback: (code: number, msg: string) => void,
 ) => {
   if (isRoochClient(config)) {
     return config
@@ -21,7 +27,7 @@ const DEFAULT_CREATE_CLIENT = (
     {
       url: config.url!.toString(),
     },
-    setCurrentSession,
+    requestErrorCallback,
   )
 
   return new RoochClient(config)
@@ -37,19 +43,27 @@ export function useDefaultClient(params: UseRoochClientParams) {
 
   const currentSession = useSessionStore((state) => state.currentSession)
   const removeSession = useSessionStore((state) => state.removeSession)
-  const clearSession = useCallback(() => {
-    try {
-      if (currentSession) {
-        removeSession(currentSession)
+  const setError = useSetError()
+  const _requestErrorCallback = useCallback(
+    (code: number, msg: string) => {
+      try {
+        if (code === ErrorValidateInvalidAccountAuthKey || code === ErrorValidateSessionIsExpired) {
+          if (currentSession) {
+            removeSession(currentSession)
+          }
+        }
+      } catch (e) {
+        console.error(e)
       }
-    } catch (e) {
-      console.error(e)
-    }
-  }, [removeSession, currentSession])
-
-  const client = useMemo(() => {
-    return DEFAULT_CREATE_CLIENT(currentNetwork, networks[currentNetwork], clearSession)
-  }, [currentNetwork, networks, clearSession])
+      setError({
+        code: code,
+        msg: msg,
+      })
+    },
+    [removeSession, currentSession, setError],
+  )
 
-  return client
+  return useMemo(() => {
+    return DEFAULT_CREATE_CLIENT(currentNetwork, networks[currentNetwork], _requestErrorCallback)
+  }, [currentNetwork, networks, _requestErrorCallback])
 }

sdk/typescript/rooch-sdk/scripts/gen.ts

@@ -44,6 +44,7 @@ const options: {
       typeAlias?: string
       alias?: string
       flatten?: boolean
+      create?: Record<string, ts.TypeNode>
     }
   >
   methods: Record<
@@ -60,7 +61,13 @@ const options: {
     }
   >
 } = {
-  types: {},
+  types: {
+    BalanceInfoView: {
+      create: {
+        fixedBalance: ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword),
+      },
+    },
+  },
   methods: {
     // rooch_executeViewFunction: {
     //   params:{
@@ -72,13 +79,15 @@ const options: {
       params: {
         account_addr: {
           alias: 'owner',
+          typeAlias: 'address',
         },
       },
     },
     rooch_getBalances: {
       params: {
         account_addr: {
           alias: 'owner',
+          typeAlias: 'address',
         },
       },
     },
@@ -169,7 +178,11 @@ fileGenerator.statements.push(
             normalizeName(name),
             undefined,
             undefined,
-            await createObjectMembers(schema as Extract<OpenRpcType, { type: 'object' }>),
+            await createObjectMembers(
+              schema as Extract<OpenRpcType, { type: 'object' }>,
+              undefined,
+              name,
+            ),
           ),
         )
       }),
@@ -193,6 +206,17 @@ methodGenerator.imports.push(
     ),
     ts.factory.createStringLiteral('./generated.js'),
   ),
+  ts.factory.createImportDeclaration(
+    undefined,
+    ts.factory.createImportClause(
+      true,
+      undefined,
+      ts.factory.createNamedImports([
+        ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier('address')),
+      ]),
+    ),
+    ts.factory.createStringLiteral('../../types/index.js'),
+  ),
 )
 
 methodGenerator.statements.push(
@@ -273,6 +297,7 @@ async function createMethodParam(method: OpenRpcMethod, param: OpenRpcParam) {
 async function createObjectMembers(
   type: Extract<OpenRpcTypeRef, { type: 'object' }>,
   namespace?: string,
+  typeName?: string,
 ) {
   const members: ts.TypeElement[] = []
 
@@ -328,6 +353,13 @@ async function createObjectMembers(
     )),
   )
 
+  if (typeName && options.types[typeName]?.create) {
+    const additionalFields = options.types[typeName].create
+    for (const [fieldName, fieldType] of Object.entries(additionalFields)) {
+      members.push(ts.factory.createPropertySignature(undefined, fieldName, undefined, fieldType))
+    }
+  }
+
   return members
 }