@xyo-network/react-wallet 2.56.2 → 2.56.4

package/src/hooks/useAccount.tsx

@@ -3,7 +3,7 @@ import { AccountInstance } from '@xyo-network/account-model'
 import { WalletInstance } from '@xyo-network/wallet-model'
 import { useState } from 'react'
 
-import { useCoinTypeWallet, useWalletContext } from '../contexts'
+import { useCoinTypeWallet, useWalletContext, useWalletProvided } from '../contexts'
 
 export interface AccountHookParams {
   account?: AccountInstance
@@ -13,9 +13,10 @@ export interface AccountHookParams {
 }
 
 export const useAccount = ({ wallet, account, index, required = false }: AccountHookParams = {}): [
-  AccountInstance | undefined,
+  AccountInstance | null | undefined,
   Error | undefined,
 ] => {
+  const walletContextProvided = useWalletProvided()
   const [validationError, setValidationError] = useState<Error>()
   if (wallet && account && !validationError) {
     setValidationError(Error('useAccount can not have both a wallet and an account in the parameters'))
@@ -48,5 +49,5 @@ export const useAccount = ({ wallet, account, index, required = false }: Account
     setError(validationError)
   }
 
-  return [error ? undefined : account ?? activeAccount, error]
+  return [error ? undefined : account ?? activeAccount ?? walletContextProvided ? null : undefined, error]
 }

package/src/hooks/useWallet.tsx

@@ -4,20 +4,21 @@ import { DataLike } from '@xyo-network/core'
 import { WalletInstance } from '@xyo-network/wallet-model'
 import { useState } from 'react'
 
-import { useSelectedWalletAccount } from '../contexts'
+import { useSelectedWalletAccount, useWalletProvided } from '../contexts'
 
 export interface WalletHookParams {
   mnemonic?: string
   path?: string
   required?: boolean
   seed?: DataLike
-  wallet?: WalletInstance
+  wallet?: WalletInstance | null
 }
 
 export const useWallet = ({ mnemonic, wallet, path, required = false, seed }: WalletHookParams = {}): [
-  WalletInstance | undefined,
+  WalletInstance | null | undefined,
   Error | undefined,
 ] => {
+  const walletContextProvided = useWalletProvided()
   const [error, setError] = useState<Error>()
   const [contextAccount] = useSelectedWalletAccount(!wallet && required)
   const [activeAccount] = usePromise(async () => {
@@ -42,5 +43,5 @@ export const useWallet = ({ mnemonic, wallet, path, required = false, seed }: Wa
       setError(ex as Error)
     }
   }, [mnemonic, contextAccount, seed, path, wallet])
-  return [activeAccount, error]
+  return [activeAccount ?? walletContextProvided ? null : activeAccount, error]
 }

package/src/hooks/useWallets.tsx

@@ -1,18 +1,20 @@
 import { usePromise } from '@xylabs/react-promise'
 import { WalletInstance } from '@xyo-network/wallet-model'
 
+import { useWalletProvided } from '../contexts'
 import { useWallet } from './useWallet'
 
 export interface WalletsHookParams {
   paths: string[]
-  wallet?: WalletInstance
+  wallet?: WalletInstance | null
 }
 
-export const useWallets = ({ wallet, paths }: WalletsHookParams): [WalletInstance[] | undefined, Error | undefined] => {
+export const useWallets = ({ wallet, paths }: WalletsHookParams): [WalletInstance[] | null | undefined, Error | undefined] => {
+  const walletContextProvided = useWalletProvided()
   const [foundWallet] = useWallet({ wallet })
   const [wallets, error] = usePromise(
     () => (foundWallet ? Promise.all(paths.map((path) => foundWallet.derivePath(path))) : undefined),
     [foundWallet, paths],
   )
-  return [wallets, error]
+  return [wallets ?? walletContextProvided ? null : wallets, error]
 }

package/src/hooks/useWrapperAccount.tsx

@@ -0,0 +1,34 @@
+import { State as PromiseState, usePromise } from '@xylabs/react-promise'
+import { HDWallet } from '@xyo-network/account'
+import { AccountInstance } from '@xyo-network/account-model'
+import { WalletInstance } from '@xyo-network/wallet-model'
+import { Mutex } from 'async-mutex'
+
+let globalWrapperWallet: WalletInstance | undefined = undefined
+const globalWrapperWalletMutex = new Mutex()
+
+export const useWrapperAccount = (
+  account?: AccountInstance | null,
+): [AccountInstance | null | undefined, Error | undefined, PromiseState | undefined] => {
+  return usePromise(async () => {
+    return await globalWrapperWalletMutex.runExclusive(async () => {
+      //if we are expecting to receive a wallet or did receive on, return the override account
+      if (account !== undefined) {
+        return account
+      }
+
+      if (globalWrapperWallet) {
+        return globalWrapperWallet
+      }
+
+      try {
+        globalWrapperWallet = await HDWallet.random()
+        console.log(`Global Wrapper Wallet Creation Success: ${globalWrapperWallet.address}`)
+      } catch (ex) {
+        const error = ex as Error
+        console.error(`Global Wrapper Wallet Creation Failed: ${error.message}`)
+      }
+      return globalWrapperWallet
+    })
+  }, [account])
+}

package/dist/cjs/hooks/useWrapperWallet.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useWrapperWallet.js","sourceRoot":"","sources":["../../../src/hooks/useWrapperWallet.tsx"],"names":[],"mappings":";;;;AAAA,yDAAkD;AAClD,kDAA+C;AAE/C,6CAAmC;AAEnC,IAAI,mBAAmB,GAA+B,SAAS,CAAA;AAC/D,MAAM,wBAAwB,GAAG,IAAI,mBAAK,EAAE,CAAA;AAErC,MAAM,gBAAgB,GAAG,GAA+B,EAAE;IAC/D,MAAM,CAAC,MAAM,CAAC,GAAG,IAAA,0BAAU,EAAC,GAAS,EAAE;QACrC,OAAO,MAAM,wBAAwB,CAAC,YAAY,CAAC,GAAS,EAAE;YAC5D,IAAI,mBAAmB,EAAE;gBACvB,OAAO,mBAAmB,CAAA;aAC3B;YACD,IAAI;gBACF,mBAAmB,GAAG,MAAM,kBAAQ,CAAC,MAAM,EAAE,CAAA;aAC9C;YAAC,OAAO,EAAE,EAAE;gBACX,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,CAAC,KAAK,CAAC,mCAAmC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;aAClE;YACD,OAAO,mBAAmB,CAAA;QAC5B,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAA,EAAE,EAAE,CAAC,CAAA;IACN,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAhBY,QAAA,gBAAgB,oBAgB5B"}

package/dist/esm/hooks/useWrapperWallet.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useWrapperWallet.js","sourceRoot":"","sources":["../../../src/hooks/useWrapperWallet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,IAAI,mBAAmB,GAA+B,SAAS,CAAA;AAC/D,MAAM,wBAAwB,GAAG,IAAI,KAAK,EAAE,CAAA;AAE5C,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAA+B,EAAE;IAC/D,MAAM,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QACrC,OAAO,MAAM,wBAAwB,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;YAC5D,IAAI,mBAAmB,EAAE;gBACvB,OAAO,mBAAmB,CAAA;aAC3B;YACD,IAAI;gBACF,mBAAmB,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAA;aAC9C;YAAC,OAAO,EAAE,EAAE;gBACX,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,CAAC,KAAK,CAAC,mCAAmC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;aAClE;YACD,OAAO,mBAAmB,CAAA;QAC5B,CAAC,CAAC,CAAA;IACJ,CAAC,EAAE,EAAE,CAAC,CAAA;IACN,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}

package/dist/types/hooks/useWrapperWallet.d.ts

@@ -1,3 +0,0 @@
-import { WalletInstance } from '@xyo-network/wallet-model';
-export declare const useWrapperWallet: () => WalletInstance | undefined;
-//# sourceMappingURL=useWrapperWallet.d.ts.map

package/dist/types/hooks/useWrapperWallet.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useWrapperWallet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWrapperWallet.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAM1D,eAAO,MAAM,gBAAgB,QAAO,cAAc,GAAG,SAgBpD,CAAA"}

package/src/hooks/useWrapperWallet.tsx

@@ -1,25 +0,0 @@
-import { usePromise } from '@xylabs/react-promise'
-import { HDWallet } from '@xyo-network/account'
-import { WalletInstance } from '@xyo-network/wallet-model'
-import { Mutex } from 'async-mutex'
-
-let globalWrapperWallet: WalletInstance | undefined = undefined
-const globalWrapperWalletMutex = new Mutex()
-
-export const useWrapperWallet = (): WalletInstance | undefined => {
-  const [wallet] = usePromise(async () => {
-    return await globalWrapperWalletMutex.runExclusive(async () => {
-      if (globalWrapperWallet) {
-        return globalWrapperWallet
-      }
-      try {
-        globalWrapperWallet = await HDWallet.random()
-      } catch (ex) {
-        const error = ex as Error
-        console.error(`Wrapper Wallet Creation Failed: ${error.message}`)
-      }
-      return globalWrapperWallet
-    })
-  }, [])
-  return wallet
-}