@xyo-network/react-node 2.55.8 → 2.55.9

package/dist/cjs/hooks/useModule.js

@@ -5,10 +5,10 @@ const tslib_1 = require("tslib");
 const react_async_effect_1 = require("@xylabs/react-async-effect");
 const react_1 = require("react");
 const useProvidedNode_1 = require("./useProvidedNode");
-const useModule = (nameOrAddressOrFilter, account, logger) => {
+const useModule = (nameOrAddressOrFilter, wallet, logger) => {
     const nameOrAddress = (0, react_1.useMemo)(() => (typeof nameOrAddressOrFilter === 'string' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter]);
     const filter = (0, react_1.useMemo)(() => (typeof nameOrAddressOrFilter === 'object' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter]);
-    const [node, nodeError] = (0, useProvidedNode_1.useProvidedWrappedNode)(account);
+    const [node, nodeError] = (0, useProvidedNode_1.useProvidedWrappedNode)(wallet);
     const [module, setModule] = (0, react_1.useState)();
     const [error, setError] = (0, react_1.useState)();
     const address = (0, react_1.useMemo)(() => module === null || module === void 0 ? void 0 : module.address, [module]);

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

@@ -1 +1 @@
-{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"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"}

package/dist/cjs/hooks/useModules.js

@@ -2,41 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useModules = void 0;
 const tslib_1 = require("tslib");
-const react_async_effect_1 = require("@xylabs/react-async-effect");
+const react_promise_1 = require("@xylabs/react-promise");
 const react_1 = require("react");
 const useProvidedNode_1 = require("./useProvidedNode");
 const useModules = (filter, logger) => {
     const [node, nodeError] = (0, useProvidedNode_1.useProvidedWrappedNode)();
-    const [modules, setModules] = (0, react_1.useState)();
-    const [error, setError] = (0, react_1.useState)();
     const modulesLength = (0, react_1.useRef)();
-    (0, react_async_effect_1.useAsyncEffect)(
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        /* Check pre-conditions */
-        if (nodeError || !node || !filter) {
-            if (mounted()) {
-                nodeError && (logger === null || logger === void 0 ? void 0 : logger.error(nodeError.message));
-                modulesLength.current = undefined;
-                setModules(undefined);
-                setError(nodeError);
-            }
-            return;
-        }
-        const eventUnsubscribe = [];
-        try {
-            const getModulesFromResolution = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const eventUnsubscribe = [];
+    const [resolvedModules, resolvedModulesError] = (0, react_promise_1.usePromise)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        const getModulesFromResolution = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+            if (node) {
                 const resolvedModules = yield node.resolve(filter);
-                if (mounted()) {
-                    if (resolvedModules.length !== modulesLength.current) {
-                        logger === null || logger === void 0 ? void 0 : logger.debug(`getModulesFromResolution-setting: [${resolvedModules.length}]`);
-                        modulesLength.current = resolvedModules.length;
-                        setModules(resolvedModules);
-                        setError(undefined);
-                    }
+                if ((resolvedModules === null || resolvedModules === void 0 ? void 0 : resolvedModules.length) !== modulesLength.current) {
+                    logger === null || logger === void 0 ? void 0 : logger.debug(`getModulesFromResolution-setting: [${resolvedModules === null || resolvedModules === void 0 ? void 0 : resolvedModules.length}]`);
+                    modulesLength.current = resolvedModules === null || resolvedModules === void 0 ? void 0 : resolvedModules.length;
+                    return resolvedModules;
                 }
-            });
-            yield getModulesFromResolution();
+            }
+        });
+        const modules = yield getModulesFromResolution();
+        if (node) {
             eventUnsubscribe.push(node.on('moduleAttached', () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
                 logger === null || logger === void 0 ? void 0 : logger.debug('moduleAttached: getModulesFromResolution');
                 yield getModulesFromResolution();
@@ -45,30 +30,16 @@ const useModules = (filter, logger) => {
                 logger === null || logger === void 0 ? void 0 : logger.debug('moduleDetached: getModulesFromResolution');
                 yield getModulesFromResolution();
             })));
-            //TODO: Obviously get rid of this timer
-            const timeoutFunc = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-                yield getModulesFromResolution();
-                if (mounted()) {
-                    setTimeout(timeoutFunc, 1000);
-                }
-            });
-            setTimeout(timeoutFunc, 1000);
-        }
-        catch (ex) {
-            if (mounted()) {
-                const error = ex;
-                logger === null || logger === void 0 ? void 0 : logger.error(`useModules: useAsyncEffect [${error.message}]`);
-                modulesLength.current = undefined;
-                setModules(undefined);
-                setError(error);
-            }
         }
+        return modules;
+    }), [node, filter, logger]);
+    (0, react_1.useEffect)(() => {
         return () => {
             //unsubscribe events
             eventUnsubscribe.forEach((func) => func());
         };
-    }), [filter, node, logger, nodeError]);
-    return [modules, error];
+    }, [filter, node, logger, nodeError]);
+    return [resolvedModules, resolvedModulesError];
 };
 exports.useModules = useModules;
 //# sourceMappingURL=useModules.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useModules.js","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useModules.js","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":";;;;AAAA,yDAAkD;AAIlD,iCAAyC;AAEzC,uDAA0D;AAEnD,MAAM,UAAU,GAAG,CAAkC,MAAqB,EAAE,MAAe,EAA8C,EAAE;IAChJ,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAA,wCAAsB,GAAE,CAAA;IAElD,MAAM,aAAa,GAAG,IAAA,cAAM,GAAU,CAAA;IAEtC,MAAM,gBAAgB,GAA+B,EAAE,CAAA;IAEvD,MAAM,CAAC,eAAe,EAAE,oBAAoB,CAAC,GAAG,IAAA,0BAAU,EAAwB,GAAS,EAAE;QAC3F,MAAM,wBAAwB,GAAG,GAAS,EAAE;YAC1C,IAAI,IAAI,EAAE;gBACR,MAAM,eAAe,GAA0B,MAAM,IAAI,CAAC,OAAO,CAAU,MAAM,CAAC,CAAA;gBAClF,IAAI,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,MAAK,aAAa,CAAC,OAAO,EAAE;oBACrD,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,sCAAsC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,GAAG,CAAC,CAAA;oBAC/E,aAAa,CAAC,OAAO,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,CAAA;oBAC/C,OAAO,eAAe,CAAA;iBACvB;aACF;QACH,CAAC,CAAA,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,wBAAwB,EAAE,CAAA;QAEhD,IAAI,IAAI,EAAE;YACR,gBAAgB,CAAC,IAAI,CACnB,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAS,EAAE;gBACnC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,0CAA0C,CAAC,CAAA;gBACzD,MAAM,wBAAwB,EAAE,CAAA;YAClC,CAAC,CAAA,CAAC,CACH,CAAA;YACD,gBAAgB,CAAC,IAAI,CACnB,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAS,EAAE;gBACnC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,0CAA0C,CAAC,CAAA;gBACzD,MAAM,wBAAwB,EAAE,CAAA;YAClC,CAAC,CAAA,CAAC,CACH,CAAA;SACF;QACD,OAAO,OAAO,CAAA;IAChB,CAAC,CAAA,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAE1B,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,oBAAoB;YACpB,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;QAC5C,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;IAErC,OAAO,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAA;AAChD,CAAC,CAAA;AA9CY,QAAA,UAAU,cA8CtB"}

package/dist/cjs/hooks/useProvidedNode.js

@@ -10,23 +10,15 @@ const useProvidedNode = () => {
     return [node];
 };
 exports.useProvidedNode = useProvidedNode;
-const useProvidedWrappedNode = (account) => {
-    const [accountToUse] = (0, react_wallet_1.useAccount)({ account });
+const useProvidedWrappedNode = (wallet) => {
+    const [walletToUse] = (0, react_wallet_1.useWallet)({ wallet });
     const [node] = (0, exports.useProvidedNode)();
     const [wrappedNode, setWrappedNode] = (0, react_1.useState)();
     const [error, setError] = (0, react_1.useState)();
-    /*
-    useEffect(() => {
-      if (!accountToUse) {
-        const error = Error('useProvidedWrappedNode requires either an Account context or account parameter')
-        setError(error)
-      }
-    }, [accountToUse])
-    */
     (0, react_1.useEffect)(() => {
         try {
-            if (node && accountToUse) {
-                setWrappedNode(node_1.NodeWrapper.wrap(node, accountToUse));
+            if (node && walletToUse) {
+                setWrappedNode(node_1.NodeWrapper.wrap(node, walletToUse));
                 setError(undefined);
             }
             else {
@@ -38,7 +30,7 @@ const useProvidedWrappedNode = (account) => {
             setWrappedNode(undefined);
             setError(ex);
         }
-    }, [node, accountToUse]);
+    }, [node, walletToUse]);
     return [wrappedNode, error];
 };
 exports.useProvidedWrappedNode = useProvidedWrappedNode;

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

@@ -1 +1 @@
-{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":";;;AACA,4CAA2D;AAC3D,wEAA6D;AAC7D,4DAAsD;AACtD,iCAAuD;AAEhD,MAAM,eAAe,GAAG,GAA6B,EAAE;IAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,kBAAU,EAAC,gCAAW,CAAC,CAAA;IAExC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,CAAC,CAAA;AAJY,QAAA,eAAe,mBAI3B;AAEM,MAAM,sBAAsB,GAAG,CAAC,OAAyB,EAAgD,EAAE;IAChH,MAAM,CAAC,YAAY,CAAC,GAAG,IAAA,yBAAU,EAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9C,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,uBAAe,GAAE,CAAA;IAChC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAE3C;;;;;;;MAOE;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI;YACF,IAAI,IAAI,IAAI,YAAY,EAAE;gBACxB,cAAc,CAAC,kBAAW,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;gBACpD,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;iBAAM;gBACL,cAAc,CAAC,SAAS,CAAC,CAAA;gBACzB,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,cAAc,CAAC,SAAS,CAAC,CAAA;YACzB,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;IAExB,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;AAC7B,CAAC,CAAA;AA/BY,QAAA,sBAAsB,0BA+BlC"}
+{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":";;;AAAA,4CAA2D;AAC3D,wEAA6D;AAC7D,4DAAqD;AAErD,iCAAuD;AAEhD,MAAM,eAAe,GAAG,GAA6B,EAAE;IAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,kBAAU,EAAC,gCAAW,CAAC,CAAA;IAExC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,CAAC,CAAA;AAJY,QAAA,eAAe,mBAI3B;AAEM,MAAM,sBAAsB,GAAG,CAAC,MAAuB,EAAgD,EAAE;IAC9G,MAAM,CAAC,WAAW,CAAC,GAAG,IAAA,wBAAS,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAC3C,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,uBAAe,GAAE,CAAA;IAChC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAE3C,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI;YACF,IAAI,IAAI,IAAI,WAAW,EAAE;gBACvB,cAAc,CAAC,kBAAW,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAA;gBACnD,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;iBAAM;gBACL,cAAc,CAAC,SAAS,CAAC,CAAA;gBACzB,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,cAAc,CAAC,SAAS,CAAC,CAAA;YACzB,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAA;IAEvB,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;AAC7B,CAAC,CAAA;AAtBY,QAAA,sBAAsB,0BAsBlC"}

package/dist/cjs/hooks/useWrappedModule.js

@@ -6,25 +6,27 @@ const react_wallet_1 = require("@xyo-network/react-wallet");
 const react_1 = require("react");
 const useModule_1 = require("./useModule");
 const WrappedModuleHookFactory = (wrapperObject, name) => {
-    const useHook = (nameOrAddress, account, logger) => {
+    const useHook = (nameOrAddress, wallet, logger) => {
         logger === null || logger === void 0 ? void 0 : logger.debug(`Render: ${name}`);
-        const [accountToUse] = (0, react_wallet_1.useAccount)({ account });
+        const [walletToUse] = (0, react_wallet_1.useWallet)({ wallet });
         const [module, moduleError] = (0, useModule_1.useModule)(nameOrAddress !== null && nameOrAddress !== void 0 ? nameOrAddress : {
             query: [wrapperObject.requiredQueries],
-        }, account, logger);
+        }, walletToUse, logger);
         const [wrapper, setWrapper] = (0, react_1.useState)();
         const [error, setError] = (0, react_1.useState)();
+        /*
+        useEffect(() => {
+          if (!walletToUse) {
+            const error = Error('Module hooks require either an Account context or account parameter')
+            //console.error(error.message)
+            setError(error)
+          }
+        }, [walletToUse])
+        */
         (0, react_1.useEffect)(() => {
-            if (!accountToUse) {
-                const error = Error('Module hooks require either an Account context or account parameter');
-                //console.error(error.message)
-                setError(error);
-            }
-        }, [accountToUse]);
-        (0, react_1.useEffect)(() => {
-            if (module && accountToUse) {
+            if (module && walletToUse) {
                 try {
-                    const wrapper = wrapperObject.wrap(module, accountToUse);
+                    const wrapper = wrapperObject.wrap(module, walletToUse);
                     setWrapper(wrapper);
                     setError(undefined);
                 }
@@ -37,7 +39,7 @@ const WrappedModuleHookFactory = (wrapperObject, name) => {
                 setWrapper(undefined);
                 setError(moduleError);
             }
-        }, [module, account, moduleError, accountToUse]);
+        }, [module, wallet, moduleError, walletToUse]);
         return [wrapper, error];
     };
     return useHook;

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

@@ -1 +1 @@
-{"version":3,"file":"useWrappedModule.js","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":";;;AAEA,gDAA+E;AAC/E,4DAAsD;AACtD,iCAA2C;AAE3C,2CAAuC;AAEhC,MAAM,wBAAwB,GAAG,CACtC,aAAyD,EACzD,IAAa,EACb,EAAE;IACF,MAAM,OAAO,GAAG,CAAC,aAAsB,EAAE,OAAyB,EAAE,MAAe,EAAmD,EAAE;QACtI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;QAChC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAA,yBAAU,EAAC,EAAE,OAAO,EAAE,CAAC,CAAA;QAC9C,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,qBAAS,EACrC,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI;YACf,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;SACvC,EACD,OAAO,EACP,MAAM,CACP,CAAA;QAED,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAkB,CAAA;QACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;QAE3C,IAAA,iBAAS,EAAC,GAAG,EAAE;YACb,IAAI,CAAC,YAAY,EAAE;gBACjB,MAAM,KAAK,GAAG,KAAK,CAAC,qEAAqE,CAAC,CAAA;gBAC1F,8BAA8B;gBAC9B,QAAQ,CAAC,KAAK,CAAC,CAAA;aAChB;QACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;QAElB,IAAA,iBAAS,EAAC,GAAG,EAAE;YACb,IAAI,MAAM,IAAI,YAAY,EAAE;gBAC1B,IAAI;oBACF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;oBACxD,UAAU,CAAC,OAAO,CAAC,CAAA;oBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;iBACpB;gBAAC,OAAO,EAAE,EAAE;oBACX,UAAU,CAAC,SAAS,CAAC,CAAA;oBACrB,QAAQ,CAAC,EAAW,CAAC,CAAA;iBACtB;aACF;iBAAM;gBACL,UAAU,CAAC,SAAS,CAAC,CAAA;gBACrB,QAAQ,CAAC,WAAW,CAAC,CAAA;aACtB;QACH,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAA;QAEhD,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACzB,CAAC,CAAA;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AA7CY,QAAA,wBAAwB,4BA6CpC;AAEY,QAAA,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,sBAAa,EAAE,kBAAkB,CAAC,CAAA"}
+{"version":3,"file":"useWrappedModule.js","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":";;;AACA,gDAA+E;AAC/E,4DAAqD;AAErD,iCAA2C;AAE3C,2CAAuC;AAEhC,MAAM,wBAAwB,GAAG,CACtC,aAAyD,EACzD,IAAa,EACb,EAAE;IACF,MAAM,OAAO,GAAG,CAAC,aAAsB,EAAE,MAAuB,EAAE,MAAe,EAAmD,EAAE;QACpI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;QAChC,MAAM,CAAC,WAAW,CAAC,GAAG,IAAA,wBAAS,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QAC3C,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,qBAAS,EACrC,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI;YACf,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;SACvC,EACD,WAAW,EACX,MAAM,CACP,CAAA;QAED,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAkB,CAAA;QACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;QAE3C;;;;;;;;UAQE;QAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;YACb,IAAI,MAAM,IAAI,WAAW,EAAE;gBACzB,IAAI;oBACF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;oBACvD,UAAU,CAAC,OAAO,CAAC,CAAA;oBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;iBACpB;gBAAC,OAAO,EAAE,EAAE;oBACX,UAAU,CAAC,SAAS,CAAC,CAAA;oBACrB,QAAQ,CAAC,EAAW,CAAC,CAAA;iBACtB;aACF;iBAAM;gBACL,UAAU,CAAC,SAAS,CAAC,CAAA;gBACrB,QAAQ,CAAC,WAAW,CAAC,CAAA;aACtB;QACH,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAA;QAE9C,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACzB,CAAC,CAAA;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AA/CY,QAAA,wBAAwB,4BA+CpC;AAEY,QAAA,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,sBAAa,EAAE,kBAAkB,CAAC,CAAA"}

package/dist/docs.json

@@ -558,7 +558,7 @@
 					"fileName": "packages/modules/packages/node/src/components/NodeDrawer.tsx",
 					"line": 10,
 					"character": 17,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/components/NodeDrawer.tsx#L10"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/components/NodeDrawer.tsx#L10"
 				}
 			],
 			"extendedTypes": [
@@ -1512,7 +1512,7 @@
 					"fileName": "packages/modules/packages/node/src/components/Node.tsx",
 					"line": 8,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/components/Node.tsx#L8"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/components/Node.tsx#L8"
 				}
 			],
 			"signatures": [
@@ -1603,7 +1603,7 @@
 					"fileName": "packages/modules/packages/node/src/components/NodeDrawer.tsx",
 					"line": 12,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/components/NodeDrawer.tsx#L12"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/components/NodeDrawer.tsx#L12"
 				}
 			],
 			"signatures": [
@@ -1876,7 +1876,7 @@
 					"fileName": "packages/modules/packages/node/src/hooks/useWrappedModule.tsx",
 					"line": 9,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useWrappedModule.tsx#L9"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useWrappedModule.tsx#L9"
 				}
 			],
 			"signatures": [
@@ -1891,7 +1891,7 @@
 							"fileName": "packages/modules/packages/node/src/hooks/useWrappedModule.tsx",
 							"line": 9,
 							"character": 40,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useWrappedModule.tsx#L9"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useWrappedModule.tsx#L9"
 						}
 					],
 					"typeParameter": [
@@ -2158,7 +2158,7 @@
 									"fileName": "packages/modules/packages/node/src/hooks/useWrappedModule.tsx",
 									"line": 13,
 									"character": 18,
-									"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useWrappedModule.tsx#L13"
+									"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useWrappedModule.tsx#L13"
 								}
 							],
 							"signatures": [
@@ -2173,7 +2173,7 @@
 											"fileName": "packages/modules/packages/node/src/hooks/useWrappedModule.tsx",
 											"line": 13,
 											"character": 18,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useWrappedModule.tsx#L13"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useWrappedModule.tsx#L13"
 										}
 									],
 									"parameters": [
@@ -2192,7 +2192,7 @@
 										},
 										{
 											"id": 80,
-											"name": "account",
+											"name": "wallet",
 											"variant": "param",
 											"kind": 32768,
 											"flags": {
@@ -2201,11 +2201,11 @@
 											"type": {
 												"type": "reference",
 												"target": {
-													"sourceFileName": "../../../../node_modules/@xyo-network/account-model/src/Account.ts",
-													"qualifiedName": "AccountInstance"
+													"sourceFileName": "../../../../node_modules/@xyo-network/wallet-model/src/Wallet.ts",
+													"qualifiedName": "WalletInstance"
 												},
-												"name": "AccountInstance",
-												"package": "@xyo-network/account-model"
+												"name": "WalletInstance",
+												"package": "@xyo-network/wallet-model"
 											}
 										},
 										{
@@ -2283,7 +2283,7 @@
 					"fileName": "packages/modules/packages/node/src/hooks/useWrappedModules.tsx",
 					"line": 10,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useWrappedModules.tsx#L10"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useWrappedModules.tsx#L10"
 				}
 			],
 			"signatures": [
@@ -2298,7 +2298,7 @@
 							"fileName": "packages/modules/packages/node/src/hooks/useWrappedModules.tsx",
 							"line": 10,
 							"character": 41,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useWrappedModules.tsx#L10"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useWrappedModules.tsx#L10"
 						}
 					],
 					"typeParameter": [
@@ -2563,7 +2563,7 @@
 									"fileName": "packages/modules/packages/node/src/hooks/useWrappedModules.tsx",
 									"line": 17,
 									"character": 18,
-									"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useWrappedModules.tsx#L17"
+									"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useWrappedModules.tsx#L17"
 								}
 							],
 							"signatures": [
@@ -2578,7 +2578,7 @@
 											"fileName": "packages/modules/packages/node/src/hooks/useWrappedModules.tsx",
 											"line": 17,
 											"character": 18,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useWrappedModules.tsx#L17"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useWrappedModules.tsx#L17"
 										}
 									],
 									"parameters": [
@@ -2678,7 +2678,7 @@
 					"fileName": "packages/modules/packages/node/src/hooks/useModule.tsx",
 					"line": 11,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useModule.tsx#L11"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useModule.tsx#L11"
 				}
 			],
 			"signatures": [
@@ -2693,7 +2693,7 @@
 							"fileName": "packages/modules/packages/node/src/hooks/useModule.tsx",
 							"line": 11,
 							"character": 25,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useModule.tsx#L11"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useModule.tsx#L11"
 						}
 					],
 					"typeParameter": [
@@ -3129,7 +3129,7 @@
 						},
 						{
 							"id": 20,
-							"name": "account",
+							"name": "wallet",
 							"variant": "param",
 							"kind": 32768,
 							"flags": {
@@ -3138,11 +3138,11 @@
 							"type": {
 								"type": "reference",
 								"target": {
-									"sourceFileName": "../../../../node_modules/@xyo-network/account-model/src/Account.ts",
-									"qualifiedName": "AccountInstance"
+									"sourceFileName": "../../../../node_modules/@xyo-network/wallet-model/src/Wallet.ts",
+									"qualifiedName": "WalletInstance"
 								},
-								"name": "AccountInstance",
-								"package": "@xyo-network/account-model"
+								"name": "WalletInstance",
+								"package": "@xyo-network/wallet-model"
 							}
 						},
 						{
@@ -3296,7 +3296,7 @@
 					"fileName": "packages/modules/packages/node/src/hooks/useModules.ts",
 					"line": 9,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useModules.ts#L9"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useModules.ts#L9"
 				}
 			],
 			"signatures": [
@@ -3311,7 +3311,7 @@
 							"fileName": "packages/modules/packages/node/src/hooks/useModules.ts",
 							"line": 9,
 							"character": 26,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useModules.ts#L9"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useModules.ts#L9"
 						}
 					],
 					"typeParameter": [
@@ -3810,7 +3810,7 @@
 					"fileName": "packages/modules/packages/node/src/hooks/useNode.tsx",
 					"line": 25,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useNode.tsx#L25"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useNode.tsx#L25"
 				}
 			],
 			"signatures": [
@@ -3825,7 +3825,7 @@
 							"fileName": "packages/modules/packages/node/src/hooks/useNode.tsx",
 							"line": 25,
 							"character": 23,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useNode.tsx#L25"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useNode.tsx#L25"
 						}
 					],
 					"parameters": [
@@ -4239,7 +4239,7 @@
 					"fileName": "packages/modules/packages/node/src/hooks/useProvidedNode.tsx",
 					"line": 7,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useProvidedNode.tsx#L7"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useProvidedNode.tsx#L7"
 				}
 			],
 			"signatures": [
@@ -4254,7 +4254,7 @@
 							"fileName": "packages/modules/packages/node/src/hooks/useProvidedNode.tsx",
 							"line": 7,
 							"character": 31,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useProvidedNode.tsx#L7"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useProvidedNode.tsx#L7"
 						}
 					],
 					"type": {
@@ -4508,7 +4508,7 @@
 					"fileName": "packages/modules/packages/node/src/hooks/useProvidedNodeAttachedAddresses.ts",
 					"line": 7,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useProvidedNodeAttachedAddresses.ts#L7"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useProvidedNodeAttachedAddresses.ts#L7"
 				}
 			],
 			"signatures": [
@@ -4523,7 +4523,7 @@
 							"fileName": "packages/modules/packages/node/src/hooks/useProvidedNodeAttachedAddresses.ts",
 							"line": 7,
 							"character": 48,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useProvidedNodeAttachedAddresses.ts#L7"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useProvidedNodeAttachedAddresses.ts#L7"
 						}
 					],
 					"parameters": [
@@ -4793,7 +4793,7 @@
 					"fileName": "packages/modules/packages/node/src/hooks/useProvidedNodeRegisteredAddresses.ts",
 					"line": 7,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useProvidedNodeRegisteredAddresses.ts#L7"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useProvidedNodeRegisteredAddresses.ts#L7"
 				}
 			],
 			"signatures": [
@@ -4808,7 +4808,7 @@
 							"fileName": "packages/modules/packages/node/src/hooks/useProvidedNodeRegisteredAddresses.ts",
 							"line": 7,
 							"character": 50,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useProvidedNodeRegisteredAddresses.ts#L7"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useProvidedNodeRegisteredAddresses.ts#L7"
 						}
 					],
 					"parameters": [
@@ -5078,7 +5078,7 @@
 					"fileName": "packages/modules/packages/node/src/hooks/useProvidedNode.tsx",
 					"line": 13,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useProvidedNode.tsx#L13"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useProvidedNode.tsx#L13"
 				}
 			],
 			"signatures": [
@@ -5093,13 +5093,13 @@
 							"fileName": "packages/modules/packages/node/src/hooks/useProvidedNode.tsx",
 							"line": 13,
 							"character": 38,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useProvidedNode.tsx#L13"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useProvidedNode.tsx#L13"
 						}
 					],
 					"parameters": [
 						{
 							"id": 50,
-							"name": "account",
+							"name": "wallet",
 							"variant": "param",
 							"kind": 32768,
 							"flags": {
@@ -5108,11 +5108,11 @@
 							"type": {
 								"type": "reference",
 								"target": {
-									"sourceFileName": "../../../../node_modules/@xyo-network/account-model/src/Account.ts",
-									"qualifiedName": "AccountInstance"
+									"sourceFileName": "../../../../node_modules/@xyo-network/wallet-model/src/Wallet.ts",
+									"qualifiedName": "WalletInstance"
 								},
-								"name": "AccountInstance",
-								"package": "@xyo-network/account-model"
+								"name": "WalletInstance",
+								"package": "@xyo-network/wallet-model"
 							}
 						}
 					],
@@ -5394,9 +5394,9 @@
 			"sources": [
 				{
 					"fileName": "packages/modules/packages/node/src/hooks/useWrappedModule.tsx",
-					"line": 56,
+					"line": 58,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useWrappedModule.tsx#L56"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useWrappedModule.tsx#L58"
 				}
 			],
 			"signatures": [
@@ -5411,7 +5411,7 @@
 							"fileName": "packages/modules/packages/node/src/hooks/useWrappedModule.tsx",
 							"line": 13,
 							"character": 18,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useWrappedModule.tsx#L13"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useWrappedModule.tsx#L13"
 						}
 					],
 					"parameters": [
@@ -5430,7 +5430,7 @@
 						},
 						{
 							"id": 85,
-							"name": "account",
+							"name": "wallet",
 							"variant": "param",
 							"kind": 32768,
 							"flags": {
@@ -5439,11 +5439,11 @@
 							"type": {
 								"type": "reference",
 								"target": {
-									"sourceFileName": "../../../../node_modules/@xyo-network/account-model/src/Account.ts",
-									"qualifiedName": "AccountInstance"
+									"sourceFileName": "../../../../node_modules/@xyo-network/wallet-model/src/Wallet.ts",
+									"qualifiedName": "WalletInstance"
 								},
-								"name": "AccountInstance",
-								"package": "@xyo-network/account-model"
+								"name": "WalletInstance",
+								"package": "@xyo-network/wallet-model"
 							}
 						},
 						{
@@ -5708,7 +5708,7 @@
 					"fileName": "packages/modules/packages/node/src/hooks/useWrappedModules.tsx",
 					"line": 64,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useWrappedModules.tsx#L64"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useWrappedModules.tsx#L64"
 				}
 			],
 			"signatures": [
@@ -5723,7 +5723,7 @@
 							"fileName": "packages/modules/packages/node/src/hooks/useWrappedModules.tsx",
 							"line": 17,
 							"character": 18,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3cc21458f960/packages/modules/packages/node/src/hooks/useWrappedModules.tsx#L17"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/86355abc9c24/packages/modules/packages/node/src/hooks/useWrappedModules.tsx#L17"
 						}
 					],
 					"parameters": [
@@ -6143,7 +6143,7 @@
 		},
 		"20": {
 			"sourceFileName": "src/hooks/useModule.tsx",
-			"qualifiedName": "account"
+			"qualifiedName": "wallet"
 		},
 		"21": {
 			"sourceFileName": "src/hooks/useModule.tsx",
@@ -6263,7 +6263,7 @@
 		},
 		"50": {
 			"sourceFileName": "src/hooks/useProvidedNode.tsx",
-			"qualifiedName": "account"
+			"qualifiedName": "wallet"
 		},
 		"51": {
 			"sourceFileName": "../../../../node_modules/@xyo-network/module-model/src/Config.ts",
@@ -6383,7 +6383,7 @@
 		},
 		"80": {
 			"sourceFileName": "src/hooks/useWrappedModule.tsx",
-			"qualifiedName": "account"
+			"qualifiedName": "wallet"
 		},
 		"81": {
 			"sourceFileName": "src/hooks/useWrappedModule.tsx",
@@ -6403,7 +6403,7 @@
 		},
 		"85": {
 			"sourceFileName": "src/hooks/useWrappedModule.tsx",
-			"qualifiedName": "account"
+			"qualifiedName": "wallet"
 		},
 		"86": {
 			"sourceFileName": "src/hooks/useWrappedModule.tsx",