@xyo-network/react-wallet 2.45.0-rc.9 → 2.45.0

package/dist/esm/components/WalletAccountDetails/WalletAccountDetails.js

@@ -6,7 +6,7 @@ import { NumberStatus } from '@xylabs/react-number-status';
 import { useNetwork } from '@xyo-network/react-network';
 import { useAccount } from '../../contexts';
 export const WalletAccountDetails = ({ exploreUrl = 'https://explore.xyo.network', account: accountProp, ...props }) => {
-    const { account = accountProp } = useAccount();
+    const [account = accountProp] = useAccount();
     const { network } = useNetwork();
     const exploreAddressUrl = `${exploreUrl}/recent?account=${account?.addressValue.hex}&network=${network?.name ?? 'main'}`;
     return (_jsxs(FlexCol, { ...props, children: [_jsx(EthAccountButton, { address: EthAddress.fromString(account?.addressValue.hex) }), _jsxs(FlexRow, { gap: 1, children: [_jsx(NumberStatus, { rounded: true, title: "Tokens", value: 0, to: `${exploreAddressUrl}&schema=network.xyo.account.tokens`, target: "_blank" }), _jsx(NumberStatus, { rounded: true, title: "NFTs", value: 0, to: `${exploreAddressUrl}&schema=network.xyo.account.nfts`, target: "_blank" }), _jsx(NumberStatus, { rounded: true, title: "Signatures", value: 0, to: `${exploreAddressUrl}&schema=network.xyo.account.signatures`, target: "_blank" }), _jsx(NumberStatus, { rounded: true, title: "Signins", value: 0, to: `${exploreAddressUrl}&schema=network.xyo.account.signins`, target: "_blank" })] })] }));

package/dist/esm/components/WalletAccountDetails/WalletAccountDetails.js.map

@@ -1 +1 @@
-{"version":3,"file":"WalletAccountDetails.js","sourceRoot":"","sources":["../../../../src/components/WalletAccountDetails/WalletAccountDetails.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAgB,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAO3C,MAAM,CAAC,MAAM,oBAAoB,GAAwC,CAAC,EACxE,UAAU,GAAG,6BAA6B,EAC1C,OAAO,EAAE,WAAW,EACpB,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,EAAE,OAAO,GAAG,WAAW,EAAE,GAAG,UAAU,EAAE,CAAA;IAC9C,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAChC,MAAM,iBAAiB,GAAG,GAAG,UAAU,mBAAmB,OAAO,EAAE,YAAY,CAAC,GAAG,YAAY,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,CAAA;IAExH,OAAO,CACL,MAAC,OAAO,OAAK,KAAK,aAChB,KAAC,gBAAgB,IAAC,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,GAAI,EAC/E,MAAC,OAAO,IAAC,GAAG,EAAE,CAAC,aACb,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,QAAQ,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,oCAAoC,EAAE,MAAM,EAAC,QAAQ,GAAG,EAC/H,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,MAAM,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,kCAAkC,EAAE,MAAM,EAAC,QAAQ,GAAG,EAC3H,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,YAAY,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,wCAAwC,EAAE,MAAM,EAAC,QAAQ,GAAG,EACvI,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,SAAS,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,qCAAqC,EAAE,MAAM,EAAC,QAAQ,GAAG,IACzH,IACF,CACX,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"WalletAccountDetails.js","sourceRoot":"","sources":["../../../../src/components/WalletAccountDetails/WalletAccountDetails.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAgB,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAO3C,MAAM,CAAC,MAAM,oBAAoB,GAAwC,CAAC,EACxE,UAAU,GAAG,6BAA6B,EAC1C,OAAO,EAAE,WAAW,EACpB,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC,GAAG,UAAU,EAAE,CAAA;IAC5C,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAChC,MAAM,iBAAiB,GAAG,GAAG,UAAU,mBAAmB,OAAO,EAAE,YAAY,CAAC,GAAG,YAAY,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,CAAA;IAExH,OAAO,CACL,MAAC,OAAO,OAAK,KAAK,aAChB,KAAC,gBAAgB,IAAC,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,GAAI,EAC/E,MAAC,OAAO,IAAC,GAAG,EAAE,CAAC,aACb,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,QAAQ,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,oCAAoC,EAAE,MAAM,EAAC,QAAQ,GAAG,EAC/H,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,MAAM,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,kCAAkC,EAAE,MAAM,EAAC,QAAQ,GAAG,EAC3H,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,YAAY,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,wCAAwC,EAAE,MAAM,EAAC,QAAQ,GAAG,EACvI,KAAC,YAAY,IAAC,OAAO,QAAC,KAAK,EAAC,SAAS,EAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,iBAAiB,qCAAqC,EAAE,MAAM,EAAC,QAAQ,GAAG,IACzH,IACF,CACX,CAAA;AACH,CAAC,CAAA"}

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

@@ -10,14 +10,14 @@ 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 { wallet, activeAccountIndex = 0, setActiveAccountIndex } = useWallet();
+    const { activeAccountIndex = 0, setActiveAccountIndex, wallet } = useWallet();
     return (_jsx(SelectEx, { renderValue: (selected) => {
-            const account = wallet?.getAccount(parseInt(`${selected}`));
+            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 = wallet?.getAccount(index);
-                return (_jsx(MenuItem, { value: index, children: _jsx(EthAccountBox, { iconSize: iconSize, icon: icons, address: EthAddress.fromString(account.addressValue.hex) }) }, index));
+                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,MAAM,EAAE,kBAAkB,GAAG,CAAC,EAAE,qBAAqB,EAAE,GAAG,SAAS,EAAE,CAAA;IAE7E,OAAO,CACL,KAAC,QAAQ,IACP,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE;YACxB,MAAM,OAAO,GAAG,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAA;YAC3D,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,UAAU,CAAC,KAAK,CAAC,CAAA;gBACzC,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,CAAC,YAAY,CAAC,GAAG,CAAC,GAAI,IAD/F,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/Account/MemoryProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryProvider.js","sourceRoot":"","sources":["../../../../src/contexts/Account/MemoryProvider.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAM1C,MAAM,CAAC,MAAM,qBAAqB,GAAuD,CAAC,EAAE,cAAc,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACxH,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAsB,cAAc,CAAC,CAAA;IAE3E,OAAO,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,KAAM,KAAK,GAAI,CAAA;AACxG,CAAC,CAAA"}
+{"version":3,"file":"MemoryProvider.js","sourceRoot":"","sources":["../../../../src/contexts/Account/MemoryProvider.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAM1C,MAAM,CAAC,MAAM,qBAAqB,GAAuD,CAAC,EAAE,cAAc,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACxH,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAA8B,cAAc,CAAC,CAAA;IAEnF,OAAO,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,KAAM,KAAK,GAAI,CAAA;AACxG,CAAC,CAAA"}

package/dist/esm/contexts/Account/use.js

@@ -1,6 +1,7 @@
 import { useContextEx } from '@xyo-network/react-shared';
 import { AccountContext } from './Context';
 export const useAccount = (required = false) => {
-    return useContextEx(AccountContext, 'Account', required);
+    const { account } = useContextEx(AccountContext, 'Account', required);
+    return [account];
 };
 //# sourceMappingURL=use.js.map

package/dist/esm/contexts/Account/use.js.map

@@ -1 +1 @@
-{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../../src/contexts/Account/use.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAE1C,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,QAAQ,GAAG,KAAK,EAAE,EAAE;IAC7C,OAAO,YAAY,CAAC,cAAc,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;AAC1D,CAAC,CAAA"}
+{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../../src/contexts/Account/use.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAE1C,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,QAAQ,GAAG,KAAK,EAAE,EAAE;IAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC,cAAc,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;IACrE,OAAO,CAAC,OAAO,CAAC,CAAA;AAClB,CAAC,CAAA"}

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

@@ -3,9 +3,11 @@ import { useEffect, useState } from 'react';
 import { AccountContext } from '../Account';
 import { WalletContext } from './Context';
 import { useWallet } from './use';
+const WalletBase = 'm';
+const WalletRootPath = "44'/60'/0'/0";
 const AccountWalletProvider = (props) => {
     const { wallet, activeAccountIndex = 0 } = useWallet();
-    return _jsx(AccountContext.Provider, { value: { account: wallet?.getAccount(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);
@@ -16,8 +18,15 @@ export const WalletProvider = ({ children, defaultActiveAccountIndex = 0, defaul
         }
     }, [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]);
     return (_jsx(WalletContext.Provider, { value: {

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;AAOjC,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,UAAU,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAM,KAAK,GAAI,CAAA;AAC3H,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,CAA4B,aAAa,CAAC,CAAA;IAC9E,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,IAAI,aAAa,EAAE;YACjB,SAAS,CAAC,aAAa,CAAC,CAAA;SACzB;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"}
+{"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/Account/MemoryProvider.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import { WithChildren } from '@xylabs/react-shared';
-import { Account } from '@xyo-network/account';
+import { AccountInstance } from '@xyo-network/account-model';
 export interface AccountMemoryProviderProps {
-    defaultAccount?: Account;
+    defaultAccount?: AccountInstance;
 }
 export declare const AccountMemoryProvider: React.FC<WithChildren<AccountMemoryProviderProps>>;
 //# sourceMappingURL=MemoryProvider.d.ts.map

package/dist/types/contexts/Account/MemoryProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryProvider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/MemoryProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAK9C,MAAM,WAAW,0BAA0B;IACzC,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAIpF,CAAA"}
+{"version":3,"file":"MemoryProvider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/MemoryProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAK5D,MAAM,WAAW,0BAA0B;IACzC,cAAc,CAAC,EAAE,eAAe,CAAA;CACjC;AAED,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAIpF,CAAA"}

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

@@ -1,8 +1,8 @@
-import { Account } from '@xyo-network/account';
+import { AccountInstance } from '@xyo-network/account-model';
 import { ContextExState } from '@xyo-network/react-shared';
 import { Dispatch } from 'react';
 export interface AccountContextState extends ContextExState {
-    account?: Account;
-    setAccount?: Dispatch<Account>;
+    account?: AccountInstance;
+    setAccount?: Dispatch<AccountInstance>;
 }
 //# sourceMappingURL=State.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/State.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,MAAM,WAAW,mBAAoB,SAAQ,cAAc;IACzD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,UAAU,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;CAC/B"}
+{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/State.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,MAAM,WAAW,mBAAoB,SAAQ,cAAc;IACzD,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,UAAU,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAA;CACvC"}

package/dist/types/contexts/Account/use.d.ts

@@ -1,2 +1,2 @@
-export declare const useAccount: (required?: boolean) => Omit<import("./State").AccountContextState & import("@xyo-network/react-shared").ContextExState, "provided">;
+export declare const useAccount: (required?: boolean) => (import("@xyo-network/account-model").AccountInstance | undefined)[];
 //# sourceMappingURL=use.d.ts.map

package/dist/types/contexts/Account/use.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/use.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,UAAU,sIAEtB,CAAA"}
+{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../../src/contexts/Account/use.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,UAAU,8FAGtB,CAAA"}

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

@@ -1,9 +1,9 @@
 /// <reference types="react" />
 import { WithChildren } from '@xylabs/react-shared';
-import { XyoWalletBase } from '@xyo-network/wallet';
+import { HDWallet } from '@xyo-network/account';
 export interface WalletProviderProps {
     defaultActiveAccountIndex?: number;
-    defaultWallet?: XyoWalletBase;
+    defaultWallet?: HDWallet;
 }
 export declare const WalletProvider: React.FC<WithChildren<WalletProviderProps>>;
 //# sourceMappingURL=Provider.d.ts.map

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,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAOnD,MAAM,WAAW,mBAAmB;IAClC,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAClC,aAAa,CAAC,EAAE,aAAa,CAAA;CAC9B;AAQD,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,CAAC,CA8BtE,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,10 +1,10 @@
+import { HDWallet } from '@xyo-network/account';
 import { ContextExState } from '@xyo-network/react-shared';
-import { XyoWalletBase } from '@xyo-network/wallet';
-import { Dispatch } from 'react';
+import { Dispatch, SetStateAction } from 'react';
 export interface WalletContextState extends ContextExState {
     activeAccountIndex?: number;
     setActiveAccountIndex?: Dispatch<number>;
-    setWallet?: Dispatch<XyoWalletBase>;
-    wallet?: XyoWalletBase;
+    setWallet?: Dispatch<SetStateAction<HDWallet | undefined>>;
+    wallet?: HDWallet;
 }
 //# sourceMappingURL=State.d.ts.map

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,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,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,aAAa,CAAC,CAAA;IACnC,MAAM,CAAC,EAAE,aAAa,CAAA;CACvB"}
+{"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

@@ -12,14 +12,16 @@
   "dependencies": {
     "@scure/bip39": "^1.1.1",
     "@xylabs/eth-address": "^2.7.4",
-    "@xylabs/react-common": "^2.16.8",
-    "@xylabs/react-crypto": "^2.16.8",
-    "@xylabs/react-flexbox": "^2.16.8",
-    "@xylabs/react-identicon": "^2.16.8",
-    "@xylabs/react-number-status": "^2.16.8",
-    "@xylabs/react-shared": "^2.16.8",
-    "@xyo-network/react-network": "^2.45.0-rc.9",
-    "@xyo-network/react-shared": "^2.45.0-rc.9"
+    "@xylabs/react-common": "^2.16.11",
+    "@xylabs/react-crypto": "^2.16.11",
+    "@xylabs/react-flexbox": "^2.16.11",
+    "@xylabs/react-identicon": "^2.16.11",
+    "@xylabs/react-number-status": "^2.16.11",
+    "@xylabs/react-shared": "^2.16.11",
+    "@xyo-network/account": "^2.51.7",
+    "@xyo-network/account-model": "^2.51.7",
+    "@xyo-network/react-network": "^2.45.0",
+    "@xyo-network/react-shared": "^2.45.0"
   },
   "peerDependencies": {
     "@mui/icons-material": "^5",
@@ -34,10 +36,9 @@
   "description": "Common React library for all XYO projects that use React",
   "devDependencies": {
     "@storybook/react": "^6.5.16",
-    "@xylabs/ts-scripts-yarn3": "^2.16.0",
-    "@xylabs/tsconfig-react": "^2.16.0",
-    "@xyo-network/account": "^2.51.2",
-    "@xyo-network/wallet": "^2.51.2",
+    "@xylabs/ts-scripts-yarn3": "^2.16.1",
+    "@xylabs/tsconfig-react": "^2.16.1",
+    "@xyo-network/react-storybook": "^2.45.0",
     "require-from-string": "^2.0.2",
     "typescript": "^4.9.5"
   },
@@ -83,6 +84,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.45.0-rc.9",
-  "stableVersion": "2.44.1"
+  "version": "2.45.0"
 }

package/src/components/WalletAccountDetails/WalletAccountDetails.tsx

@@ -17,7 +17,7 @@ export const WalletAccountDetails: React.FC<WalletAccountDetailsProps> = ({
   account: accountProp,
   ...props
 }) => {
-  const { account = accountProp } = useAccount()
+  const [account = accountProp] = useAccount()
   const { network } = useNetwork()
   const exploreAddressUrl = `${exploreUrl}/recent?account=${account?.addressValue.hex}&network=${network?.name ?? 'main'}`
 

package/src/components/WalletAccountDetails/WalletAccountDetailsWithProvider.stories.tsx

@@ -1,5 +1,6 @@
 import { ComponentMeta, ComponentStory } from '@storybook/react'
-import { XyoWalletBase } from '@xyo-network/wallet'
+import { HDWallet } from '@xyo-network/account'
+import { DefaultSeedPhrase } from '@xyo-network/react-storybook'
 import { BrowserRouter } from 'react-router-dom'
 
 import { WalletProvider } from '../../contexts'
@@ -19,7 +20,7 @@ const StorybookEntry = {
 const Template: ComponentStory<typeof WalletAccountDetails> = (args) => {
   return (
     <BrowserRouter>
-      <WalletProvider defaultWallet={new XyoWalletBase('test me')}>
+      <WalletProvider defaultWallet={HDWallet.fromMnemonic(DefaultSeedPhrase)}>
         <WalletAccountDetails {...args}></WalletAccountDetails>
       </WalletProvider>
     </BrowserRouter>

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 { wallet, activeAccountIndex = 0, setActiveAccountIndex } = useWallet()
+  const { activeAccountIndex = 0, setActiveAccountIndex, wallet } = useWallet()
 
   return (
     <SelectEx
       renderValue={(selected) => {
-        const account = wallet?.getAccount(parseInt(`${selected}`))
+        const account = wallet?.deriveAccount(selected.toString())
         return (
           <FlexRow justifyContent="flex-start" gap={1}>
             {icons ? (
@@ -44,10 +44,10 @@ export const WalletAccountSelect: React.FC<WalletAccountSelectProps> = ({ iconOn
     >
       {wallet
         ? arrayRange(maxAccounts).map((index) => {
-            const account = wallet?.getAccount(index)
+            const account = wallet?.deriveAccount(index.toString())
             return (
               <MenuItem key={index} value={index}>
-                <EthAccountBox iconSize={iconSize} icon={icons} address={EthAddress.fromString(account.addressValue.hex)} />
+                <EthAccountBox iconSize={iconSize} icon={icons} address={EthAddress.fromString(account?.addressValue.hex)} />
               </MenuItem>
             )
           })

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

@@ -1,6 +1,6 @@
-/* eslint-disable import/no-internal-modules */
 import { ComponentMeta, ComponentStory } from '@storybook/react'
-import { XyoWalletBase } from '@xyo-network/wallet'
+import { HDWallet } from '@xyo-network/account'
+import { DefaultSeedPhrase } from '@xyo-network/react-storybook'
 
 import { WalletProvider } from '../../contexts'
 import { WalletAccountSelect } from './Select'
@@ -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={new XyoWalletBase('test me')}>
-      <WalletAccountSelect {...args}></WalletAccountSelect>
+    <WalletProvider defaultWallet={HDWallet.fromMnemonic(DefaultSeedPhrase)}>
+      <WalletAccountSelect {...args} />
     </WalletProvider>
   )
 }

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

@@ -1,6 +1,6 @@
-/* eslint-disable import/no-internal-modules */
 import { ComponentMeta, ComponentStory } from '@storybook/react'
-import { XyoWalletBase } from '@xyo-network/wallet'
+import { HDWallet } from '@xyo-network/account'
+import { DefaultSeedPhrase } from '@xyo-network/react-storybook'
 
 import { WalletProvider } from '../../contexts'
 import { WalletAccountSelectBar } from './SelectBar'
@@ -22,8 +22,8 @@ const Template: ComponentStory<typeof WalletAccountSelectBar> = (args) => {
 
 const WithWalletTemplate: ComponentStory<typeof WalletAccountSelectBar> = (args) => {
   return (
-    <WalletProvider defaultWallet={new XyoWalletBase('test me')}>
-      <WalletAccountSelectBar {...args}></WalletAccountSelectBar>
+    <WalletProvider defaultWallet={HDWallet.fromMnemonic(DefaultSeedPhrase)}>
+      <WalletAccountSelectBar {...args} />
     </WalletProvider>
   )
 }
@@ -37,7 +37,10 @@ WithWallet.args = {}
 const WithWalletIcon = WithWalletTemplate.bind({})
 WithWalletIcon.args = { icons: true }
 
-export { Default, WithWallet, WithWalletIcon }
+const WithAdditionalAccounts = WithWalletTemplate.bind({})
+WithAdditionalAccounts.args = { icons: true, maxAccounts: 10 }
+
+export { Default, WithAdditionalAccounts, WithWallet, WithWalletIcon }
 
 // eslint-disable-next-line import/no-default-export
 export default StorybookEntry

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

@@ -1,5 +1,6 @@
 import { ComponentMeta, ComponentStory } from '@storybook/react'
-import { XyoWalletBase } from '@xyo-network/wallet'
+import { HDWallet } from '@xyo-network/account'
+import { DefaultSeedPhrase } from '@xyo-network/react-storybook'
 
 import { WalletProvider } from '../../contexts'
 import { WalletAccountSelect } from './Select'
@@ -17,7 +18,7 @@ const StorybookEntry = {
 
 const Template: ComponentStory<typeof WalletAccountSelect> = (args) => {
   return (
-    <WalletProvider defaultWallet={new XyoWalletBase('test me')}>
+    <WalletProvider defaultWallet={HDWallet.fromMnemonic(DefaultSeedPhrase)}>
       <WalletAccountSelect {...args}></WalletAccountSelect>
     </WalletProvider>
   )

package/src/contexts/Account/MemoryProvider.tsx

@@ -1,15 +1,15 @@
 import { WithChildren } from '@xylabs/react-shared'
-import { Account } from '@xyo-network/account'
+import { AccountInstance } from '@xyo-network/account-model'
 import { useState } from 'react'
 
 import { AccountContext } from './Context'
 
 export interface AccountMemoryProviderProps {
-  defaultAccount?: Account
+  defaultAccount?: AccountInstance
 }
 
 export const AccountMemoryProvider: React.FC<WithChildren<AccountMemoryProviderProps>> = ({ defaultAccount, ...props }) => {
-  const [account, setAccount] = useState<Account | undefined>(defaultAccount)
+  const [account, setAccount] = useState<AccountInstance | undefined>(defaultAccount)
 
   return <AccountContext.Provider value={{ account: account, provided: true, setAccount }} {...props} />
 }

package/src/contexts/Account/State.ts

@@ -1,8 +1,8 @@
-import { Account } from '@xyo-network/account'
+import { AccountInstance } from '@xyo-network/account-model'
 import { ContextExState } from '@xyo-network/react-shared'
 import { Dispatch } from 'react'
 
 export interface AccountContextState extends ContextExState {
-  account?: Account
-  setAccount?: Dispatch<Account>
+  account?: AccountInstance
+  setAccount?: Dispatch<AccountInstance>
 }

package/src/contexts/Account/use.ts

@@ -3,5 +3,6 @@ import { useContextEx } from '@xyo-network/react-shared'
 import { AccountContext } from './Context'
 
 export const useAccount = (required = false) => {
-  return useContextEx(AccountContext, 'Account', required)
+  const { account } = useContextEx(AccountContext, 'Account', required)
+  return [account]
 }

package/src/contexts/Wallet/Provider.tsx

@@ -1,24 +1,27 @@
 import { WithChildren } from '@xylabs/react-shared'
-import { XyoWalletBase } from '@xyo-network/wallet'
+import { HDWallet } from '@xyo-network/account'
 import { useEffect, useState } from 'react'
 
 import { AccountContext } from '../Account'
 import { WalletContext } from './Context'
 import { useWallet } from './use'
 
+const WalletBase = 'm'
+const WalletRootPath = "44'/60'/0'/0"
+
 export interface WalletProviderProps {
   defaultActiveAccountIndex?: number
-  defaultWallet?: XyoWalletBase
+  defaultWallet?: HDWallet
 }
 
 const AccountWalletProvider: React.FC<WithChildren> = (props) => {
   const { wallet, activeAccountIndex = 0 } = useWallet()
 
-  return <AccountContext.Provider value={{ account: wallet?.getAccount(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<XyoWalletBase | undefined>(defaultWallet)
+  const [wallet, setWallet] = useState<HDWallet | undefined>(defaultWallet)
   const [activeAccountIndex, setActiveAccountIndex] = useState(defaultActiveAccountIndex)
 
   useEffect(() => {
@@ -28,8 +31,14 @@ 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])
 

package/src/contexts/Wallet/State.ts

@@ -1,10 +1,10 @@
+import { HDWallet } from '@xyo-network/account'
 import { ContextExState } from '@xyo-network/react-shared'
-import { XyoWalletBase } from '@xyo-network/wallet'
-import { Dispatch } from 'react'
+import { Dispatch, SetStateAction } from 'react'
 
 export interface WalletContextState extends ContextExState {
   activeAccountIndex?: number
   setActiveAccountIndex?: Dispatch<number>
-  setWallet?: Dispatch<XyoWalletBase>
-  wallet?: XyoWalletBase
+  setWallet?: Dispatch<SetStateAction<HDWallet | undefined>>
+  wallet?: HDWallet
 }