@xyo-network/react-wallet 2.44.2 → 2.44.3

package/dist/esm/components/WalletAccountSelect/Select.js

@@ -10,13 +10,13 @@ const arrayRange = (length, start = 0) => {
     return Array.from(Array(length).keys()).map((x) => x + start);
 };
 export const WalletAccountSelect = ({ iconOnly, iconSize = 24, icons, maxAccounts = 1, size, ...props }) => {
-    const { deriveRootAccount, activeAccountIndex = 0, setActiveAccountIndex, wallet } = useWallet();
+    const { activeAccountIndex = 0, setActiveAccountIndex, wallet } = useWallet();
     return (_jsx(SelectEx, { renderValue: (selected) => {
-            const account = deriveRootAccount?.(selected.toString());
+            const account = wallet?.deriveAccount(selected.toString());
             return (_jsxs(FlexRow, { justifyContent: "flex-start", gap: 1, children: [icons ? (_jsx(FlexRow, { children: _jsx(Identicon, { size: iconSize, value: account?.addressValue.hex }) })) : null, _jsx(EthAccountBox, { alignItems: "stretch", iconOnly: iconOnly, address: EthAddress.fromString(account?.addressValue.hex) })] }));
         }, value: activeAccountIndex, onChange: (event) => setActiveAccountIndex?.(parseInt(`${event.target.value}`)), size: size, variant: "outlined", ...props, children: wallet
             ? arrayRange(maxAccounts).map((index) => {
-                const account = deriveRootAccount?.(index.toString());
+                const account = wallet?.deriveAccount(index.toString());
                 return (_jsx(MenuItem, { value: index, children: _jsx(EthAccountBox, { iconSize: iconSize, icon: icons, address: EthAddress.fromString(account?.addressValue.hex) }) }, index));
             })
             : null }));

package/dist/esm/components/WalletAccountSelect/Select.js.map

@@ -1 +1 @@
-{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../../src/components/WalletAccountSelect/Select.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAe,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAS1C,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE;IAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAuC,CAAC,EAAE,QAAQ,EAAE,QAAQ,GAAG,EAAE,EAAE,KAAK,EAAE,WAAW,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC7I,MAAM,EAAE,iBAAiB,EAAE,kBAAkB,GAAG,CAAC,EAAE,qBAAqB,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAA;IAEhG,OAAO,CACL,KAAC,QAAQ,IACP,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE;YACxB,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;YACxD,OAAO,CACL,MAAC,OAAO,IAAC,cAAc,EAAC,YAAY,EAAC,GAAG,EAAE,CAAC,aACxC,KAAK,CAAC,CAAC,CAAC,CACP,KAAC,OAAO,cACN,KAAC,SAAS,IAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,GAAI,GACvD,CACX,CAAC,CAAC,CAAC,IAAI,EACR,KAAC,aAAa,IAAC,UAAU,EAAC,SAAS,EAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,GAAI,IAC7G,CACX,CAAA;QACH,CAAC,EACD,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,qBAAqB,EAAE,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAC/E,IAAI,EAAE,IAAI,EACV,OAAO,EAAC,UAAU,KACd,KAAK,YAER,MAAM;YACL,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACpC,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACrD,OAAO,CACL,KAAC,QAAQ,IAAa,KAAK,EAAE,KAAK,YAChC,KAAC,aAAa,IAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,GAAI,IADhG,KAAK,CAET,CACZ,CAAA;YACH,CAAC,CAAC;YACJ,CAAC,CAAC,IAAI,GACC,CACZ,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../../src/components/WalletAccountSelect/Select.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAe,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAS1C,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE;IAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAuC,CAAC,EAAE,QAAQ,EAAE,QAAQ,GAAG,EAAE,EAAE,KAAK,EAAE,WAAW,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC7I,MAAM,EAAE,kBAAkB,GAAG,CAAC,EAAE,qBAAqB,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAA;IAE7E,OAAO,CACL,KAAC,QAAQ,IACP,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE;YACxB,MAAM,OAAO,GAAG,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC1D,OAAO,CACL,MAAC,OAAO,IAAC,cAAc,EAAC,YAAY,EAAC,GAAG,EAAE,CAAC,aACxC,KAAK,CAAC,CAAC,CAAC,CACP,KAAC,OAAO,cACN,KAAC,SAAS,IAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,GAAI,GACvD,CACX,CAAC,CAAC,CAAC,IAAI,EACR,KAAC,aAAa,IAAC,UAAU,EAAC,SAAS,EAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,GAAI,IAC7G,CACX,CAAA;QACH,CAAC,EACD,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,qBAAqB,EAAE,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAC/E,IAAI,EAAE,IAAI,EACV,OAAO,EAAC,UAAU,KACd,KAAK,YAER,MAAM;YACL,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACpC,MAAM,OAAO,GAAG,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACvD,OAAO,CACL,KAAC,QAAQ,IAAa,KAAK,EAAE,KAAK,YAChC,KAAC,aAAa,IAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,GAAI,IADhG,KAAK,CAET,CACZ,CAAA;YACH,CAAC,CAAC;YACJ,CAAC,CAAC,IAAI,GACC,CACZ,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/contexts/Wallet/Provider.js

@@ -3,41 +3,34 @@ import { useEffect, useState } from 'react';
 import { AccountContext } from '../Account';
 import { WalletContext } from './Context';
 import { useWallet } from './use';
-const WalletBase = 'm/';
-const WalletRootPath = `${WalletBase}44'/60'/0'/0/`;
+const WalletBase = 'm';
+const WalletRootPath = "44'/60'/0'/0";
 const AccountWalletProvider = (props) => {
     const { wallet, activeAccountIndex = 0 } = useWallet();
-    return _jsx(AccountContext.Provider, { value: { account: wallet?.deriveAccount(`${WalletRootPath}${activeAccountIndex}`), provided: true }, ...props });
+    return _jsx(AccountContext.Provider, { value: { account: wallet?.deriveAccount(activeAccountIndex.toString()), provided: true }, ...props });
 };
 export const WalletProvider = ({ children, defaultActiveAccountIndex = 0, defaultWallet, ...props }) => {
     const [wallet, setWallet] = useState(defaultWallet);
     const [activeAccountIndex, setActiveAccountIndex] = useState(defaultActiveAccountIndex);
-    const [activeRootAccountPath, setActiveRootAccountPath] = useState();
-    useEffect(() => {
-        setActiveRootAccountPath(`${WalletRootPath}${activeAccountIndex.toString()}`);
-    }, [activeAccountIndex]);
     useEffect(() => {
         if (defaultActiveAccountIndex !== undefined) {
             setActiveAccountIndex(defaultActiveAccountIndex);
         }
     }, [defaultActiveAccountIndex]);
     useEffect(() => {
+        // ensure the wallet has the proper base
         if (defaultWallet) {
-            setWallet(defaultWallet);
+            try {
+                const walletWithBasePath = defaultWallet?.derivePath(WalletBase).derivePath(WalletRootPath);
+                setWallet(walletWithBasePath);
+            }
+            catch (e) {
+                console.error('Error setting proper wallet base path', e);
+            }
         }
     }, [defaultWallet]);
-    const deriveRootAccount = (path) => {
-        if (wallet) {
-            return wallet.deriveAccount(`${WalletRootPath}${path}`);
-        }
-        else {
-            throw new Error('Wallet was not created');
-        }
-    };
     return (_jsx(WalletContext.Provider, { value: {
             activeAccountIndex,
-            activeRootAccountPath,
-            deriveRootAccount,
             provided: true,
             setActiveAccountIndex,
             setWallet,

package/dist/esm/contexts/Wallet/Provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEjC,MAAM,UAAU,GAAG,IAAI,CAAA;AACvB,MAAM,cAAc,GAAG,GAAG,UAAU,eAAe,CAAA;AAOnD,MAAM,qBAAqB,GAA2B,CAAC,KAAK,EAAE,EAAE;IAC9D,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,CAAC,EAAE,GAAG,SAAS,EAAE,CAAA;IAEtD,OAAO,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,cAAc,GAAG,kBAAkB,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAM,KAAK,GAAI,CAAA;AACpJ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAgD,CAAC,EAAE,QAAQ,EAAE,yBAAyB,GAAG,CAAC,EAAE,aAAa,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAClJ,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAuB,aAAa,CAAC,CAAA;IACzE,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAC,yBAAyB,CAAC,CAAA;IACvF,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,GAAG,QAAQ,EAAU,CAAA;IAE5E,SAAS,CAAC,GAAG,EAAE;QACb,wBAAwB,CAAC,GAAG,cAAc,GAAG,kBAAkB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IAC/E,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAA;IAExB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,yBAAyB,KAAK,SAAS,EAAE;YAC3C,qBAAqB,CAAC,yBAAyB,CAAC,CAAA;SACjD;IACH,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAA;IAE/B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,aAAa,EAAE;YACjB,SAAS,CAAC,aAAa,CAAC,CAAA;SACzB;IACH,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,EAAE;QACzC,IAAI,MAAM,EAAE;YACV,OAAO,MAAM,CAAC,aAAa,CAAC,GAAG,cAAc,GAAG,IAAI,EAAE,CAAC,CAAA;SACxD;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;SAC1C;IACH,CAAC,CAAA;IAED,OAAO,CACL,KAAC,aAAa,CAAC,QAAQ,IACrB,KAAK,EAAE;YACL,kBAAkB;YAClB,qBAAqB;YACrB,iBAAiB;YACjB,QAAQ,EAAE,IAAI;YACd,qBAAqB;YACrB,SAAS;YACT,MAAM;SACP,KACG,KAAK,YAET,KAAC,qBAAqB,cAAE,QAAQ,GAAyB,GAClC,CAC1B,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEjC,MAAM,UAAU,GAAG,GAAG,CAAA;AACtB,MAAM,cAAc,GAAG,cAAc,CAAA;AAOrC,MAAM,qBAAqB,GAA2B,CAAC,KAAK,EAAE,EAAE;IAC9D,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,CAAC,EAAE,GAAG,SAAS,EAAE,CAAA;IAEtD,OAAO,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAM,KAAK,GAAI,CAAA;AACzI,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAgD,CAAC,EAAE,QAAQ,EAAE,yBAAyB,GAAG,CAAC,EAAE,aAAa,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAClJ,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAuB,aAAa,CAAC,CAAA;IACzE,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAC,yBAAyB,CAAC,CAAA;IAEvF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,yBAAyB,KAAK,SAAS,EAAE;YAC3C,qBAAqB,CAAC,yBAAyB,CAAC,CAAA;SACjD;IACH,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAA;IAE/B,SAAS,CAAC,GAAG,EAAE;QACb,wCAAwC;QACxC,IAAI,aAAa,EAAE;YACjB,IAAI;gBACF,MAAM,kBAAkB,GAAG,aAAa,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,CAAA;gBAC3F,SAAS,CAAC,kBAAkB,CAAC,CAAA;aAC9B;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,CAAC,CAAC,CAAA;aAC1D;SACF;IACH,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,OAAO,CACL,KAAC,aAAa,CAAC,QAAQ,IACrB,KAAK,EAAE;YACL,kBAAkB;YAClB,QAAQ,EAAE,IAAI;YACd,qBAAqB;YACrB,SAAS;YACT,MAAM;SACP,KACG,KAAK,YAET,KAAC,qBAAqB,cAAE,QAAQ,GAAyB,GAClC,CAC1B,CAAA;AACH,CAAC,CAAA"}

package/dist/types/contexts/Wallet/Provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAU/C,MAAM,WAAW,mBAAmB;IAClC,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAClC,aAAa,CAAC,EAAE,QAAQ,CAAA;CACzB;AAQD,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CA6CtE,CAAA"}
+{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAU/C,MAAM,WAAW,mBAAmB;IAClC,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAClC,aAAa,CAAC,EAAE,QAAQ,CAAA;CACzB;AAQD,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAoCtE,CAAA"}

package/dist/types/contexts/Wallet/State.d.ts

@@ -1,11 +1,8 @@
 import { HDWallet } from '@xyo-network/account';
-import { AccountInstance } from '@xyo-network/account-model';
 import { ContextExState } from '@xyo-network/react-shared';
 import { Dispatch, SetStateAction } from 'react';
 export interface WalletContextState extends ContextExState {
     activeAccountIndex?: number;
-    activeRootAccountPath?: string;
-    deriveRootAccount?: (path: string) => AccountInstance;
     setActiveAccountIndex?: Dispatch<number>;
     setWallet?: Dispatch<SetStateAction<HDWallet | undefined>>;
     wallet?: HDWallet;

package/dist/types/contexts/Wallet/State.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/State.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAEhD,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,eAAe,CAAA;IACrD,qBAAqB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;IACxC,SAAS,CAAC,EAAE,QAAQ,CAAC,cAAc,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAA;IAC1D,MAAM,CAAC,EAAE,QAAQ,CAAA;CAClB"}
+{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Wallet/State.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAEhD,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;IACxC,SAAS,CAAC,EAAE,QAAQ,CAAC,cAAc,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAA;IAC1D,MAAM,CAAC,EAAE,QAAQ,CAAA;CAClB"}

package/package.json

@@ -20,8 +20,8 @@
     "@xylabs/react-shared": "^2.16.8",
     "@xyo-network/account": "^2.51.4",
     "@xyo-network/account-model": "^2.51.4",
-    "@xyo-network/react-network": "^2.44.2",
-    "@xyo-network/react-shared": "^2.44.2"
+    "@xyo-network/react-network": "^2.44.3",
+    "@xyo-network/react-shared": "^2.44.3"
   },
   "peerDependencies": {
     "@mui/icons-material": "^5",
@@ -38,7 +38,7 @@
     "@storybook/react": "^6.5.16",
     "@xylabs/ts-scripts-yarn3": "^2.16.0",
     "@xylabs/tsconfig-react": "^2.16.0",
-    "@xyo-network/react-storybook": "^2.44.2",
+    "@xyo-network/react-storybook": "^2.44.3",
     "require-from-string": "^2.0.2",
     "typescript": "^4.9.5"
   },
@@ -84,5 +84,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.44.2"
+  "version": "2.44.3"
 }

package/src/components/WalletAccountSelect/Select.tsx

@@ -19,12 +19,12 @@ const arrayRange = (length: number, start = 0) => {
 }
 
 export const WalletAccountSelect: React.FC<WalletAccountSelectProps> = ({ iconOnly, iconSize = 24, icons, maxAccounts = 1, size, ...props }) => {
-  const { deriveRootAccount, activeAccountIndex = 0, setActiveAccountIndex, wallet } = useWallet()
+  const { activeAccountIndex = 0, setActiveAccountIndex, wallet } = useWallet()
 
   return (
     <SelectEx
       renderValue={(selected) => {
-        const account = deriveRootAccount?.(selected.toString())
+        const account = wallet?.deriveAccount(selected.toString())
         return (
           <FlexRow justifyContent="flex-start" gap={1}>
             {icons ? (
@@ -44,7 +44,7 @@ export const WalletAccountSelect: React.FC<WalletAccountSelectProps> = ({ iconOn
     >
       {wallet
         ? arrayRange(maxAccounts).map((index) => {
-            const account = deriveRootAccount?.(index.toString())
+            const account = wallet?.deriveAccount(index.toString())
             return (
               <MenuItem key={index} value={index}>
                 <EthAccountBox iconSize={iconSize} icon={icons} address={EthAddress.fromString(account?.addressValue.hex)} />

package/src/components/WalletAccountSelect/WalletAccountSelect.stories.tsx

@@ -17,13 +17,13 @@ const StorybookEntry = {
 } as ComponentMeta<typeof WalletAccountSelect>
 
 const Template: ComponentStory<typeof WalletAccountSelect> = (args) => {
-  return <WalletAccountSelect {...args}></WalletAccountSelect>
+  return <WalletAccountSelect {...args} />
 }
 
 const WithWalletTemplate: ComponentStory<typeof WalletAccountSelect> = (args) => {
   return (
     <WalletProvider defaultWallet={HDWallet.fromMnemonic(DefaultSeedPhrase)}>
-      <WalletAccountSelect {...args}></WalletAccountSelect>
+      <WalletAccountSelect {...args} />
     </WalletProvider>
   )
 }

package/src/contexts/Wallet/Provider.tsx

@@ -6,8 +6,8 @@ import { AccountContext } from '../Account'
 import { WalletContext } from './Context'
 import { useWallet } from './use'
 
-const WalletBase = 'm/'
-const WalletRootPath = `${WalletBase}44'/60'/0'/0/`
+const WalletBase = 'm'
+const WalletRootPath = "44'/60'/0'/0"
 
 export interface WalletProviderProps {
   defaultActiveAccountIndex?: number
@@ -17,17 +17,12 @@ export interface WalletProviderProps {
 const AccountWalletProvider: React.FC<WithChildren> = (props) => {
   const { wallet, activeAccountIndex = 0 } = useWallet()
 
-  return <AccountContext.Provider value={{ account: wallet?.deriveAccount(`${WalletRootPath}${activeAccountIndex}`), provided: true }} {...props} />
+  return <AccountContext.Provider value={{ account: wallet?.deriveAccount(activeAccountIndex.toString()), provided: true }} {...props} />
 }
 
 export const WalletProvider: React.FC<WithChildren<WalletProviderProps>> = ({ children, defaultActiveAccountIndex = 0, defaultWallet, ...props }) => {
   const [wallet, setWallet] = useState<HDWallet | undefined>(defaultWallet)
   const [activeAccountIndex, setActiveAccountIndex] = useState(defaultActiveAccountIndex)
-  const [activeRootAccountPath, setActiveRootAccountPath] = useState<string>()
-
-  useEffect(() => {
-    setActiveRootAccountPath(`${WalletRootPath}${activeAccountIndex.toString()}`)
-  }, [activeAccountIndex])
 
   useEffect(() => {
     if (defaultActiveAccountIndex !== undefined) {
@@ -36,25 +31,21 @@ export const WalletProvider: React.FC<WithChildren<WalletProviderProps>> = ({ ch
   }, [defaultActiveAccountIndex])
 
   useEffect(() => {
+    // ensure the wallet has the proper base
     if (defaultWallet) {
-      setWallet(defaultWallet)
+      try {
+        const walletWithBasePath = defaultWallet?.derivePath(WalletBase).derivePath(WalletRootPath)
+        setWallet(walletWithBasePath)
+      } catch (e) {
+        console.error('Error setting proper wallet base path', e)
+      }
     }
   }, [defaultWallet])
 
-  const deriveRootAccount = (path: string) => {
-    if (wallet) {
-      return wallet.deriveAccount(`${WalletRootPath}${path}`)
-    } else {
-      throw new Error('Wallet was not created')
-    }
-  }
-
   return (
     <WalletContext.Provider
       value={{
         activeAccountIndex,
-        activeRootAccountPath,
-        deriveRootAccount,
         provided: true,
         setActiveAccountIndex,
         setWallet,

package/src/contexts/Wallet/State.ts

@@ -1,12 +1,9 @@
 import { HDWallet } from '@xyo-network/account'
-import { AccountInstance } from '@xyo-network/account-model'
 import { ContextExState } from '@xyo-network/react-shared'
 import { Dispatch, SetStateAction } from 'react'
 
 export interface WalletContextState extends ContextExState {
   activeAccountIndex?: number
-  activeRootAccountPath?: string
-  deriveRootAccount?: (path: string) => AccountInstance
   setActiveAccountIndex?: Dispatch<number>
   setWallet?: Dispatch<SetStateAction<HDWallet | undefined>>
   wallet?: HDWallet