@xyo-network/react-wallet 2.45.0-rc.22 → 2.45.0-rc.24

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

@@ -15,13 +15,13 @@ const arrayRange = (length, start = 0) => {
 };
 const WalletAccountSelect = (_a) => {
     var { iconOnly, iconSize = 24, icons, maxAccounts = 1, size } = _a, props = tslib_1.__rest(_a, ["iconOnly", "iconSize", "icons", "maxAccounts", "size"]);
-    const { deriveRootAccount, activeAccountIndex = 0, setActiveAccountIndex, wallet } = (0, contexts_1.useWallet)();
+    const { activeAccountIndex = 0, setActiveAccountIndex, wallet } = (0, contexts_1.useWallet)();
     return ((0, jsx_runtime_1.jsx)(react_common_1.SelectEx, Object.assign({ renderValue: (selected) => {
-            const account = deriveRootAccount === null || deriveRootAccount === void 0 ? void 0 : deriveRootAccount(selected.toString());
+            const account = wallet === null || wallet === void 0 ? void 0 : wallet.deriveAccount(selected.toString());
             return ((0, jsx_runtime_1.jsxs)(react_flexbox_1.FlexRow, Object.assign({ justifyContent: "flex-start", gap: 1 }, { children: [icons ? ((0, jsx_runtime_1.jsx)(react_flexbox_1.FlexRow, { children: (0, jsx_runtime_1.jsx)(react_identicon_1.Identicon, { size: iconSize, value: account === null || account === void 0 ? void 0 : account.addressValue.hex }) })) : null, (0, jsx_runtime_1.jsx)(react_crypto_1.EthAccountBox, { alignItems: "stretch", iconOnly: iconOnly, address: eth_address_1.EthAddress.fromString(account === null || account === void 0 ? void 0 : account.addressValue.hex) })] })));
         }, value: activeAccountIndex, onChange: (event) => setActiveAccountIndex === null || setActiveAccountIndex === void 0 ? void 0 : setActiveAccountIndex(parseInt(`${event.target.value}`)), size: size, variant: "outlined" }, props, { children: wallet
             ? arrayRange(maxAccounts).map((index) => {
-                const account = deriveRootAccount === null || deriveRootAccount === void 0 ? void 0 : deriveRootAccount(index.toString());
+                const account = wallet === null || wallet === void 0 ? void 0 : wallet.deriveAccount(index.toString());
                 return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, Object.assign({ value: index }, { children: (0, jsx_runtime_1.jsx)(react_crypto_1.EthAccountBox, { iconSize: iconSize, icon: icons, address: eth_address_1.EthAddress.fromString(account === null || account === void 0 ? void 0 : account.addressValue.hex) }) }), index));
             })
             : null })));

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

@@ -1 +1 @@
-{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../../src/components/WalletAccountSelect/Select.tsx"],"names":[],"mappings":";;;;;AAAA,4CAAqD;AACrD,qDAAgD;AAChD,uDAA+C;AAC/C,uDAAoD;AACpD,yDAA+C;AAC/C,6DAAmD;AAEnD,6CAA0C;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;AAEM,MAAM,mBAAmB,GAAuC,CAAC,EAAmE,EAAE,EAAE;QAAvE,EAAE,QAAQ,EAAE,QAAQ,GAAG,EAAE,EAAE,KAAK,EAAE,WAAW,GAAG,CAAC,EAAE,IAAI,OAAY,EAAP,KAAK,sBAAjE,wDAAmE,CAAF;IACvI,MAAM,EAAE,iBAAiB,EAAE,kBAAkB,GAAG,CAAC,EAAE,qBAAqB,EAAE,MAAM,EAAE,GAAG,IAAA,oBAAS,GAAE,CAAA;IAEhG,OAAO,CACL,uBAAC,uBAAQ,kBACP,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE;YACxB,MAAM,OAAO,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;YACxD,OAAO,CACL,wBAAC,uBAAO,kBAAC,cAAc,EAAC,YAAY,EAAC,GAAG,EAAE,CAAC,iBACxC,KAAK,CAAC,CAAC,CAAC,CACP,uBAAC,uBAAO,cACN,uBAAC,2BAAS,IAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,GAAG,GAAI,GACvD,CACX,CAAC,CAAC,CAAC,IAAI,EACR,uBAAC,4BAAa,IAAC,UAAU,EAAC,SAAS,EAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,wBAAU,CAAC,UAAU,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,GAAG,CAAC,GAAI,KAC7G,CACX,CAAA;QACH,CAAC,EACD,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAG,QAAQ,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAC/E,IAAI,EAAE,IAAI,EACV,OAAO,EAAC,UAAU,IACd,KAAK,cAER,MAAM;YACL,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACpC,MAAM,OAAO,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACrD,OAAO,CACL,uBAAC,mBAAQ,kBAAa,KAAK,EAAE,KAAK,gBAChC,uBAAC,4BAAa,IAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,wBAAU,CAAC,UAAU,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,GAAG,CAAC,GAAI,KADhG,KAAK,CAET,CACZ,CAAA;YACH,CAAC,CAAC;YACJ,CAAC,CAAC,IAAI,IACC,CACZ,CAAA;AACH,CAAC,CAAA;AApCY,QAAA,mBAAmB,uBAoC/B"}
+{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../../src/components/WalletAccountSelect/Select.tsx"],"names":[],"mappings":";;;;;AAAA,4CAAqD;AACrD,qDAAgD;AAChD,uDAA+C;AAC/C,uDAAoD;AACpD,yDAA+C;AAC/C,6DAAmD;AAEnD,6CAA0C;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;AAEM,MAAM,mBAAmB,GAAuC,CAAC,EAAmE,EAAE,EAAE;QAAvE,EAAE,QAAQ,EAAE,QAAQ,GAAG,EAAE,EAAE,KAAK,EAAE,WAAW,GAAG,CAAC,EAAE,IAAI,OAAY,EAAP,KAAK,sBAAjE,wDAAmE,CAAF;IACvI,MAAM,EAAE,kBAAkB,GAAG,CAAC,EAAE,qBAAqB,EAAE,MAAM,EAAE,GAAG,IAAA,oBAAS,GAAE,CAAA;IAE7E,OAAO,CACL,uBAAC,uBAAQ,kBACP,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE;YACxB,MAAM,OAAO,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC1D,OAAO,CACL,wBAAC,uBAAO,kBAAC,cAAc,EAAC,YAAY,EAAC,GAAG,EAAE,CAAC,iBACxC,KAAK,CAAC,CAAC,CAAC,CACP,uBAAC,uBAAO,cACN,uBAAC,2BAAS,IAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,GAAG,GAAI,GACvD,CACX,CAAC,CAAC,CAAC,IAAI,EACR,uBAAC,4BAAa,IAAC,UAAU,EAAC,SAAS,EAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,wBAAU,CAAC,UAAU,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,GAAG,CAAC,GAAI,KAC7G,CACX,CAAA;QACH,CAAC,EACD,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAG,QAAQ,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAC/E,IAAI,EAAE,IAAI,EACV,OAAO,EAAC,UAAU,IACd,KAAK,cAER,MAAM;YACL,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACpC,MAAM,OAAO,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACvD,OAAO,CACL,uBAAC,mBAAQ,kBAAa,KAAK,EAAE,KAAK,gBAChC,uBAAC,4BAAa,IAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,wBAAU,CAAC,UAAU,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,GAAG,CAAC,GAAI,KADhG,KAAK,CAET,CACZ,CAAA;YACH,CAAC,CAAC;YACJ,CAAC,CAAC,IAAI,IACC,CACZ,CAAA;AACH,CAAC,CAAA;AApCY,QAAA,mBAAmB,uBAoC/B"}

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

@@ -7,42 +7,35 @@ const react_1 = require("react");
 const Account_1 = require("../Account");
 const Context_1 = require("./Context");
 const use_1 = require("./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 } = (0, use_1.useWallet)();
-    return (0, jsx_runtime_1.jsx)(Account_1.AccountContext.Provider, Object.assign({ value: { account: wallet === null || wallet === void 0 ? void 0 : wallet.deriveAccount(`${WalletRootPath}${activeAccountIndex}`), provided: true } }, props));
+    return (0, jsx_runtime_1.jsx)(Account_1.AccountContext.Provider, Object.assign({ value: { account: wallet === null || wallet === void 0 ? void 0 : wallet.deriveAccount(activeAccountIndex.toString()), provided: true } }, props));
 };
 const WalletProvider = (_a) => {
     var { children, defaultActiveAccountIndex = 0, defaultWallet } = _a, props = tslib_1.__rest(_a, ["children", "defaultActiveAccountIndex", "defaultWallet"]);
     const [wallet, setWallet] = (0, react_1.useState)(defaultWallet);
     const [activeAccountIndex, setActiveAccountIndex] = (0, react_1.useState)(defaultActiveAccountIndex);
-    const [activeRootAccountPath, setActiveRootAccountPath] = (0, react_1.useState)();
-    (0, react_1.useEffect)(() => {
-        setActiveRootAccountPath(`${WalletRootPath}${activeAccountIndex.toString()}`);
-    }, [activeAccountIndex]);
     (0, react_1.useEffect)(() => {
         if (defaultActiveAccountIndex !== undefined) {
             setActiveAccountIndex(defaultActiveAccountIndex);
         }
     }, [defaultActiveAccountIndex]);
     (0, react_1.useEffect)(() => {
+        // ensure the wallet has the proper base
         if (defaultWallet) {
-            setWallet(defaultWallet);
+            try {
+                const walletWithBasePath = defaultWallet === null || defaultWallet === void 0 ? void 0 : 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 ((0, jsx_runtime_1.jsx)(Context_1.WalletContext.Provider, Object.assign({ value: {
             activeAccountIndex,
-            activeRootAccountPath,
-            deriveRootAccount,
             provided: true,
             setActiveAccountIndex,
             setWallet,

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

@@ -1 +1 @@
-{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";;;;;AAEA,iCAA2C;AAE3C,wCAA2C;AAC3C,uCAAyC;AACzC,+BAAiC;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,IAAA,eAAS,GAAE,CAAA;IAEtD,OAAO,uBAAC,wBAAc,CAAC,QAAQ,kBAAC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,GAAG,cAAc,GAAG,kBAAkB,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAM,KAAK,EAAI,CAAA;AACpJ,CAAC,CAAA;AAEM,MAAM,cAAc,GAAgD,CAAC,EAAoE,EAAE,EAAE;QAAxE,EAAE,QAAQ,EAAE,yBAAyB,GAAG,CAAC,EAAE,aAAa,OAAY,EAAP,KAAK,sBAAlE,0DAAoE,CAAF;IAC5I,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAuB,aAAa,CAAC,CAAA;IACzE,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,IAAA,gBAAQ,EAAC,yBAAyB,CAAC,CAAA;IACvF,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,GAAG,IAAA,gBAAQ,GAAU,CAAA;IAE5E,IAAA,iBAAS,EAAC,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,IAAA,iBAAS,EAAC,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,IAAA,iBAAS,EAAC,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,uBAAC,uBAAa,CAAC,QAAQ,kBACrB,KAAK,EAAE;YACL,kBAAkB;YAClB,qBAAqB;YACrB,iBAAiB;YACjB,QAAQ,EAAE,IAAI;YACd,qBAAqB;YACrB,SAAS;YACT,MAAM;SACP,IACG,KAAK,cAET,uBAAC,qBAAqB,cAAE,QAAQ,GAAyB,IAClC,CAC1B,CAAA;AACH,CAAC,CAAA;AA7CY,QAAA,cAAc,kBA6C1B"}
+{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";;;;;AAEA,iCAA2C;AAE3C,wCAA2C;AAC3C,uCAAyC;AACzC,+BAAiC;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,IAAA,eAAS,GAAE,CAAA;IAEtD,OAAO,uBAAC,wBAAc,CAAC,QAAQ,kBAAC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAM,KAAK,EAAI,CAAA;AACzI,CAAC,CAAA;AAEM,MAAM,cAAc,GAAgD,CAAC,EAAoE,EAAE,EAAE;QAAxE,EAAE,QAAQ,EAAE,yBAAyB,GAAG,CAAC,EAAE,aAAa,OAAY,EAAP,KAAK,sBAAlE,0DAAoE,CAAF;IAC5I,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAuB,aAAa,CAAC,CAAA;IACzE,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,IAAA,gBAAQ,EAAC,yBAAyB,CAAC,CAAA;IAEvF,IAAA,iBAAS,EAAC,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,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,wCAAwC;QACxC,IAAI,aAAa,EAAE;YACjB,IAAI;gBACF,MAAM,kBAAkB,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,UAAU,CAAC,UAAU,EAAE,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,uBAAC,uBAAa,CAAC,QAAQ,kBACrB,KAAK,EAAE;YACL,kBAAkB;YAClB,QAAQ,EAAE,IAAI;YACd,qBAAqB;YACrB,SAAS;YACT,MAAM;SACP,IACG,KAAK,cAET,uBAAC,qBAAqB,cAAE,QAAQ,GAAyB,IAClC,CAC1B,CAAA;AACH,CAAC,CAAA;AApCY,QAAA,cAAc,kBAoC1B"}