@xyo-network/react-node 2.45.0-rc.17 → 2.45.0-rc.19

package/dist/cjs/hooks/index.js

@@ -1,19 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./useArchiveArchivists"), exports);
-tslib_1.__exportStar(require("./useArchivistModule"), exports);
-tslib_1.__exportStar(require("./useArchivistModules"), exports);
-tslib_1.__exportStar(require("./useDivinerModule"), exports);
-tslib_1.__exportStar(require("./useDivinerModules"), exports);
 tslib_1.__exportStar(require("./useMemoryNodeUpdates"), exports);
 tslib_1.__exportStar(require("./useModule"), exports);
-tslib_1.__exportStar(require("./useModuleAddresses"), exports);
 tslib_1.__exportStar(require("./useModules"), exports);
 tslib_1.__exportStar(require("./useNode"), exports);
-tslib_1.__exportStar(require("./useNodeQueryDiviner"), exports);
+tslib_1.__exportStar(require("./useNodeAttachedAddresses"), exports);
 tslib_1.__exportStar(require("./useProvidedNode"), exports);
-tslib_1.__exportStar(require("./useWitnessModule"), exports);
-tslib_1.__exportStar(require("./useWitnessModules"), exports);
 tslib_1.__exportStar(require("./useWrappedModule"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":";;;AAAA,iEAAsC;AACtC,+DAAoC;AACpC,gEAAqC;AACrC,6DAAkC;AAClC,8DAAmC;AACnC,iEAAsC;AACtC,sDAA2B;AAC3B,+DAAoC;AACpC,uDAA4B;AAC5B,oDAAyB;AACzB,gEAAqC;AACrC,4DAAiC;AACjC,6DAAkC;AAClC,8DAAmC;AACnC,6DAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":";;;AAAA,iEAAsC;AACtC,sDAA2B;AAC3B,uDAA4B;AAC5B,oDAAyB;AACzB,qEAA0C;AAC1C,4DAAiC;AACjC,6DAAkC"}

package/dist/cjs/hooks/useMemoryNodeUpdates.js

@@ -8,7 +8,7 @@ const useMemoryNodeUpdates = (refreshAddresses) => {
     const [module, setModule] = (0, react_1.useState)();
     (0, react_1.useEffect)(() => {
         if (node) {
-            const onFunc = node.on;
+            const onFunc = node.module.on;
             onFunc('moduleAttached', (args) => {
                 if (refreshAddresses) {
                     if (refreshAddresses.some((address) => address === (args === null || args === void 0 ? void 0 : args.module.address)))

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

@@ -1 +1 @@
-{"version":3,"file":"useMemoryNodeUpdates.js","sourceRoot":"","sources":["../../../src/hooks/useMemoryNodeUpdates.tsx"],"names":[],"mappings":";;;AAEA,iCAA2C;AAE3C,uCAAmC;AAQ5B,MAAM,oBAAoB,GAAG,CAAC,gBAA2B,EAAwB,EAAE;IACxF,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iBAAO,GAAE,CAAA;IACxB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAA2B,CAAA;IAE/D,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,MAAM,MAAM,GAAG,IAAI,CAAC,EAAsC,CAAA;YAC1D,MAAM,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,gBAAgB,EAAE;oBACpB,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,MAAK,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,OAAO,CAAA,CAAC;wBAAE,SAAS,CAAC,IAAI,CAAC,CAAA;iBAC1F;qBAAM;oBACL,SAAS,CAAC,IAAI,CAAC,CAAA;iBAChB;YACH,CAAC,CAAC,CAAA;SACH;IACH,CAAC,EAAE,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAA;IAE5B,OAAO;QACL,MAAM;KACP,CAAA;AACH,CAAC,CAAA;AApBY,QAAA,oBAAoB,wBAoBhC"}
+{"version":3,"file":"useMemoryNodeUpdates.js","sourceRoot":"","sources":["../../../src/hooks/useMemoryNodeUpdates.tsx"],"names":[],"mappings":";;;AAEA,iCAA2C;AAE3C,uCAAmC;AAQ5B,MAAM,oBAAoB,GAAG,CAAC,gBAA2B,EAAwB,EAAE;IACxF,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iBAAO,GAAE,CAAA;IACxB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAA2B,CAAA;IAE/D,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,EAAsC,CAAA;YACjE,MAAM,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,gBAAgB,EAAE;oBACpB,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,MAAK,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,OAAO,CAAA,CAAC;wBAAE,SAAS,CAAC,IAAI,CAAC,CAAA;iBAC1F;qBAAM;oBACL,SAAS,CAAC,IAAI,CAAC,CAAA;iBAChB;YACH,CAAC,CAAC,CAAA;SACH;IACH,CAAC,EAAE,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAA;IAE5B,OAAO;QACL,MAAM;KACP,CAAA;AACH,CAAC,CAAA;AApBY,QAAA,oBAAoB,wBAoBhC"}

package/dist/cjs/hooks/useModule.js

@@ -3,33 +3,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useModule = void 0;
 const tslib_1 = require("tslib");
 const react_shared_1 = require("@xylabs/react-shared");
-const node_1 = require("@xyo-network/node");
 const react_1 = require("react");
 const useProvidedNode_1 = require("./useProvidedNode");
 const useModule = (nameOrAddress) => {
-    const [node, nodeError] = (0, useProvidedNode_1.useProvidedNode)();
+    const [node, nodeError] = (0, useProvidedNode_1.useProvidedWrappedNode)();
     const [module, setModule] = (0, react_1.useState)();
     const [error, setError] = (0, react_1.useState)();
+    const address = module === null || module === void 0 ? void 0 : module.address;
     (0, react_shared_1.useAsyncEffect)(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        const detachHandler = (args) => {
+            const eventModule = args.module;
+            if (eventModule.address === address && mounted()) {
+                setModule(undefined);
+                setError(undefined);
+            }
+        };
         try {
             if (nodeError) {
-                console.log(`Setting NodeError [${nodeError.message}]`);
                 setError(nodeError);
                 setModule(undefined);
             }
             else {
-                const wrappedNode = node_1.NodeWrapper.tryWrap(node);
-                if (wrappedNode) {
-                    const module = nameOrAddress
-                        ? yield (wrappedNode === null || wrappedNode === void 0 ? void 0 : wrappedNode.resolve(nameOrAddress))
-                        : (yield wrappedNode.resolve()).pop();
+                if (node) {
+                    const emitter = node.module;
+                    const module = nameOrAddress ? yield node.resolve(nameOrAddress) : (yield node.resolve()).pop();
                     if (mounted()) {
-                        console.log(`Setting Module [${module === null || module === void 0 ? void 0 : module.address}]`);
+                        emitter.on('moduleDetached', detachHandler);
                         setModule(module);
                         setError(undefined);
                     }
+                    return () => {
+                        //remove the event handler on unmount
+                        emitter.on('moduleDetached', detachHandler, true);
+                    };
                 }
                 else {
                     console.log('Setting All to undefined');
@@ -46,7 +54,7 @@ const useModule = (nameOrAddress) => {
                 setModule(undefined);
             }
         }
-    }), [nameOrAddress, node, nodeError]);
+    }), [nameOrAddress, node, nodeError, address]);
     return [module, error];
 };
 exports.useModule = useModule;

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

@@ -1 +1 @@
-{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,4CAA+C;AAC/C,iCAAgC;AAEhC,uDAAmD;AAE5C,MAAM,SAAS,GAAG,CAAkC,aAAsB,EAA4C,EAAE;IAC7H,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAA,iCAAe,GAAE,CAAA;IAC3C,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAAW,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAC3C,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,sBAAsB,SAAS,CAAC,OAAO,GAAG,CAAC,CAAA;gBACvD,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;iBAAM;gBACL,MAAM,WAAW,GAAG,kBAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAC7C,IAAI,WAAW,EAAE;oBACf,MAAM,MAAM,GAAwB,aAAa;wBAC/C,CAAC,CAAC,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAU,aAAa,CAAC,CAAA;wBACpD,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,OAAO,EAAW,CAAC,CAAC,GAAG,EAAE,CAAA;oBAChD,IAAI,OAAO,EAAE,EAAE;wBACb,OAAO,CAAC,GAAG,CAAC,mBAAmB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,GAAG,CAAC,CAAA;wBAClD,SAAS,CAAC,MAAM,CAAC,CAAA;wBACjB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;iBACF;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;oBACvC,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,OAAO,EAAE,EAAE;gBACb,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC/C,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACf,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;SACF;IACH,CAAC,CAAA,EACD,CAAC,aAAa,EAAE,IAAI,EAAE,SAAS,CAAC,CACjC,CAAA;IAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA;AA1CY,QAAA,SAAS,aA0CrB"}
+{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAGrD,iCAAgC;AAEhC,uDAA0D;AAEnD,MAAM,SAAS,GAAG,CAAkC,aAAsB,EAA4C,EAAE;IAC7H,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAA,wCAAsB,GAAE,CAAA;IAClD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAAW,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAC3C,MAAM,OAAO,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAA;IAC/B,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,MAAM,aAAa,GAAG,CAAC,IAA6B,EAAE,EAAE;YACtD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAA;YAC/B,IAAI,WAAW,CAAC,OAAO,KAAK,OAAO,IAAI,OAAO,EAAE,EAAE;gBAChD,SAAS,CAAC,SAAS,CAAC,CAAA;gBACpB,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;QACH,CAAC,CAAA;QACD,IAAI;YACF,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;iBAAM;gBACL,IAAI,IAAI,EAAE;oBACR,MAAM,OAAO,GAAG,IAAI,CAAC,MAAoC,CAAA;oBACzD,MAAM,MAAM,GAAwB,aAAa,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAU,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,EAAW,CAAC,CAAC,GAAG,EAAE,CAAA;oBACtI,IAAI,OAAO,EAAE,EAAE;wBACb,OAAO,CAAC,EAAE,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA;wBAC3C,SAAS,CAAC,MAAM,CAAC,CAAA;wBACjB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;oBACD,OAAO,GAAG,EAAE;wBACV,qCAAqC;wBACrC,OAAO,CAAC,EAAE,CAAC,gBAAgB,EAAE,aAAa,EAAE,IAAI,CAAC,CAAA;oBACnD,CAAC,CAAA;iBACF;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;oBACvC,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,OAAO,EAAE,EAAE;gBACb,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC/C,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACf,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;SACF;IACH,CAAC,CAAA,EACD,CAAC,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAC1C,CAAA;IAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA;AAnDY,QAAA,SAAS,aAmDrB"}

package/dist/cjs/hooks/useModules.js

@@ -6,17 +6,42 @@ const react_shared_1 = require("@xylabs/react-shared");
 const react_1 = require("react");
 const useProvidedNode_1 = require("./useProvidedNode");
 const useModules = (filter) => {
-    const [node] = (0, useProvidedNode_1.useProvidedNode)(true);
+    const [node, nodeError] = (0, useProvidedNode_1.useProvidedWrappedNode)();
     const [modules, setModules] = (0, react_1.useState)();
+    const [error, setError] = (0, react_1.useState)();
     (0, react_shared_1.useAsyncEffect)(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        const modules = yield (node === null || node === void 0 ? void 0 : node.resolve(filter));
-        if (mounted()) {
-            setModules(modules);
+        try {
+            if (nodeError) {
+                setError(nodeError);
+                setModules(undefined);
+            }
+            else {
+                if (node) {
+                    const modules = yield node.resolve(filter);
+                    if (mounted()) {
+                        setModules(modules);
+                        setError(undefined);
+                    }
+                }
+                else {
+                    console.log('Setting All to undefined');
+                    setError(undefined);
+                    setModules(undefined);
+                }
+            }
         }
-    }), [filter, node]);
-    return modules;
+        catch (ex) {
+            if (mounted()) {
+                const error = ex;
+                console.log(`Setting Error [${error.message}]`);
+                setError(error);
+                setModules(undefined);
+            }
+        }
+    }), [filter, node, nodeError]);
+    return [modules, error];
 };
 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":";;;;AAAA,uDAAqD;AAErD,iCAAgC;AAEhC,uDAAmD;AAE5C,MAAM,UAAU,GAAG,CAA4B,MAAqB,EAAE,EAAE;IAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iCAAe,EAAC,IAAI,CAAC,CAAA;IACpC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAO,CAAA;IAE7C,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,MAAM,OAAO,GAAG,MAAM,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAI,MAAM,CAAC,CAAA,CAAA;QAC9C,IAAI,OAAO,EAAE,EAAE;YACb,UAAU,CAAC,OAAO,CAAC,CAAA;SACpB;IACH,CAAC,CAAA,EACD,CAAC,MAAM,EAAE,IAAI,CAAC,CACf,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAhBY,QAAA,UAAU,cAgBtB"}
+{"version":3,"file":"useModules.js","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,iCAAgC;AAEhC,uDAA0D;AAEnD,MAAM,UAAU,GAAG,CAAkC,MAAqB,EAA8C,EAAE;IAC/H,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAA,wCAAsB,GAAE,CAAA;IAClD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAa,CAAA;IACnD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAE3C,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,UAAU,CAAC,SAAS,CAAC,CAAA;aACtB;iBAAM;gBACL,IAAI,IAAI,EAAE;oBACR,MAAM,OAAO,GAA0B,MAAM,IAAI,CAAC,OAAO,CAAU,MAAM,CAAC,CAAA;oBAC1E,IAAI,OAAO,EAAE,EAAE;wBACb,UAAU,CAAC,OAAO,CAAC,CAAA;wBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;iBACF;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;oBACvC,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,UAAU,CAAC,SAAS,CAAC,CAAA;iBACtB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,OAAO,EAAE,EAAE;gBACb,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC/C,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACf,UAAU,CAAC,SAAS,CAAC,CAAA;aACtB;SACF;IACH,CAAC,CAAA,EACD,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAC1B,CAAA;IAED,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AACzB,CAAC,CAAA;AAtCY,QAAA,UAAU,cAsCtB"}

package/dist/cjs/hooks/useNode.js

@@ -1,20 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useNode = void 0;
+const node_1 = require("@xyo-network/node");
+const react_1 = require("react");
 const useModule_1 = require("./useModule");
 const useProvidedNode_1 = require("./useProvidedNode");
-const useNode = (nameOrAddress) => {
-    const providedNode = (0, useProvidedNode_1.useProvidedNode)();
-    const node = (0, useModule_1.useModule)(nameOrAddress);
+//AT: intentionally not exported
+const useNodeModule = (nameOrAddress) => {
+    const [providedNode] = (0, useProvidedNode_1.useProvidedNode)();
+    const [node, nodeError] = (0, useModule_1.useModule)(nameOrAddress);
     if (nameOrAddress) {
-        if (providedNode && node) {
-            return node;
+        if (providedNode) {
+            return [node, nodeError];
+        }
+        else {
+            return [providedNode, undefined];
         }
     }
     else {
-        return providedNode;
+        return [providedNode, undefined];
     }
-    return [undefined, undefined];
+};
+const useNode = (nameOrAddress, account) => {
+    const [node, nodeError] = useNodeModule();
+    const [wrapper, setWrapper] = (0, react_1.useState)();
+    const [error, setError] = (0, react_1.useState)();
+    (0, react_1.useEffect)(() => {
+        if (node) {
+            if (nodeError) {
+                setError(nodeError);
+                setWrapper(undefined);
+            }
+            else {
+                try {
+                    const wrapper = node_1.NodeWrapper.wrap(node, account);
+                    setWrapper(wrapper);
+                    setError(undefined);
+                }
+                catch (ex) {
+                    setWrapper(undefined);
+                    setError(ex);
+                }
+            }
+        }
+        else {
+            setWrapper(undefined);
+            setError(undefined);
+        }
+    }, [node, account, nodeError]);
+    return [wrapper, error];
 };
 exports.useNode = useNode;
 //# sourceMappingURL=useNode.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useNode.js","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":";;;AAEA,2CAAuC;AACvC,uDAAmD;AAE5C,MAAM,OAAO,GAAG,CAAC,aAAsB,EAA+C,EAAE;IAC7F,MAAM,YAAY,GAAG,IAAA,iCAAe,GAAE,CAAA;IACtC,MAAM,IAAI,GAAG,IAAA,qBAAS,EAAa,aAAa,CAAC,CAAA;IAEjD,IAAI,aAAa,EAAE;QACjB,IAAI,YAAY,IAAI,IAAI,EAAE;YACxB,OAAO,IAAI,CAAA;SACZ;KACF;SAAM;QACL,OAAO,YAAY,CAAA;KACpB;IACD,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;AAC/B,CAAC,CAAA;AAZY,QAAA,OAAO,WAYnB"}
+{"version":3,"file":"useNode.js","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":";;;AACA,4CAA2D;AAC3D,iCAA2C;AAE3C,2CAAuC;AACvC,uDAAmD;AAEnD,gCAAgC;AAChC,MAAM,aAAa,GAAG,CAAC,aAAsB,EAA+C,EAAE;IAC5F,MAAM,CAAC,YAAY,CAAC,GAAG,IAAA,iCAAe,GAAE,CAAA;IACxC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAA,qBAAS,EAAC,aAAa,CAAC,CAAA;IAElD,IAAI,aAAa,EAAE;QACjB,IAAI,YAAY,EAAE;YAChB,OAAO,CAAC,IAAkB,EAAE,SAAS,CAAC,CAAA;SACvC;aAAM;YACL,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;SACjC;KACF;SAAM;QACL,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;KACjC;AACH,CAAC,CAAA;AAEM,MAAM,OAAO,GAAG,CAAC,aAAsB,EAAE,OAAyB,EAAgD,EAAE;IACzH,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,aAAa,EAAE,CAAA;IACzC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAe,CAAA;IACrD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAE3C,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,UAAU,CAAC,SAAS,CAAC,CAAA;aACtB;iBAAM;gBACL,IAAI;oBACF,MAAM,OAAO,GAAG,kBAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;oBAC/C,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;SACF;aAAM;YACL,UAAU,CAAC,SAAS,CAAC,CAAA;YACrB,QAAQ,CAAC,SAAS,CAAC,CAAA;SACpB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAA;IAE9B,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AACzB,CAAC,CAAA;AA3BY,QAAA,OAAO,WA2BnB"}

package/dist/cjs/hooks/{useModuleAddresses.js → useNodeAttachedAddresses.js}

@@ -1,22 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useModuleAddresses = void 0;
+exports.useNodeAttachedAddresses = void 0;
 const tslib_1 = require("tslib");
 const react_shared_1 = require("@xylabs/react-shared");
 const react_1 = require("react");
-const useProvidedNode_1 = require("./useProvidedNode");
-const useModuleAddresses = () => {
-    const [node] = (0, useProvidedNode_1.useProvidedNode)();
-    const [attachedAddresses, setAttachedAddresses] = (0, react_1.useState)();
+const useNode_1 = require("./useNode");
+const useNodeAttachedAddresses = () => {
+    const [node] = (0, useNode_1.useNode)();
+    const [addresses, setAddresses] = (0, react_1.useState)();
     (0, react_shared_1.useAsyncEffect)(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         const attached = yield (node === null || node === void 0 ? void 0 : node.attached());
         if (mounted()) {
-            setAttachedAddresses(attached);
+            setAddresses(attached);
         }
     }), [node]);
-    return [attachedAddresses, node === null || node === void 0 ? void 0 : node.registered()];
+    return [addresses, node === null || node === void 0 ? void 0 : node.registered()];
 };
-exports.useModuleAddresses = useModuleAddresses;
-//# sourceMappingURL=useModuleAddresses.js.map
+exports.useNodeAttachedAddresses = useNodeAttachedAddresses;
+//# sourceMappingURL=useNodeAttachedAddresses.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useNodeAttachedAddresses.js","sourceRoot":"","sources":["../../../src/hooks/useNodeAttachedAddresses.ts"],"names":[],"mappings":";;;;AAAA,uDAAqD;AACrD,iCAAgC;AAEhC,uCAAmC;AAE5B,MAAM,wBAAwB,GAAG,GAAG,EAAE;IAC3C,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iBAAO,GAAE,CAAA;IACxB,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,GAAY,CAAA;IAEtD,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,MAAM,QAAQ,GAAG,MAAM,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,EAAE,CAAA,CAAA;QACvC,IAAI,OAAO,EAAE,EAAE;YACb,YAAY,CAAC,QAAQ,CAAC,CAAA;SACvB;IACH,CAAC,CAAA,EACD,CAAC,IAAI,CAAC,CACP,CAAA;IAED,OAAO,CAAC,SAAS,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,EAAE,CAAC,CAAA;AACxC,CAAC,CAAA;AAhBY,QAAA,wBAAwB,4BAgBpC"}

package/dist/cjs/hooks/useProvidedNode.js

@@ -1,27 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useProvidedNode = void 0;
+exports.useProvidedWrappedNode = exports.useProvidedNode = void 0;
 const node_1 = require("@xyo-network/node");
 const react_1 = require("react");
 const contexts_1 = require("../contexts");
-function useProvidedNodeFunc(wrap) {
+const useProvidedNode = () => {
     const { node } = (0, react_1.useContext)(contexts_1.NodeContext);
+    return [node];
+};
+exports.useProvidedNode = useProvidedNode;
+const useProvidedWrappedNode = (account) => {
+    const [node] = (0, exports.useProvidedNode)();
     const [wrappedNode, setWrappedNode] = (0, react_1.useState)();
     const [error, setError] = (0, react_1.useState)();
     (0, react_1.useEffect)(() => {
         try {
             if (node) {
-                const account = typeof wrap === 'boolean' ? undefined : wrap;
-                const wrappedNode = wrap ? node_1.NodeWrapper.wrap(node, account) : undefined;
-                setWrappedNode(wrappedNode);
+                setWrappedNode(node_1.NodeWrapper.wrap(node, account));
                 setError(undefined);
             }
         }
         catch (ex) {
+            setWrappedNode(undefined);
             setError(ex);
         }
-    }, [node, wrap]);
-    return [wrap ? wrappedNode : wrappedNode === null || wrappedNode === void 0 ? void 0 : wrappedNode.module, error];
-}
-exports.useProvidedNode = useProvidedNodeFunc;
+    }, [node, account]);
+    return [wrappedNode, error];
+};
+exports.useProvidedWrappedNode = useProvidedWrappedNode;
 //# sourceMappingURL=useProvidedNode.js.map

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,iCAAuD;AAEvD,0CAAyC;AAKzC,SAAS,mBAAmB,CAAC,IAAmC;IAC9D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,kBAAU,EAAC,sBAAW,CAAC,CAAA;IACxC,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,EAAE;gBACR,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAA;gBAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,kBAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;gBACtE,cAAc,CAAC,WAAW,CAAC,CAAA;gBAC3B,QAAQ,CAAC,SAAS,CAAC,CAAA;aACpB;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IAEhB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AAC1D,CAAC;AAEY,QAAA,eAAe,GAAG,mBAAmB,CAAA"}
+{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":";;;AACA,4CAA2D;AAC3D,iCAAuD;AAEvD,0CAAyC;AAElC,MAAM,eAAe,GAAG,GAA6B,EAAE;IAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,kBAAU,EAAC,sBAAW,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,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,EAAE;gBACR,cAAc,CAAC,kBAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;gBAC/C,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,OAAO,CAAC,CAAC,CAAA;IAEnB,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;AAC7B,CAAC,CAAA;AAlBY,QAAA,sBAAsB,0BAkBlC"}