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

package/dist/esm/hooks/useArchiveArchivists.js

@@ -2,9 +2,9 @@ import { ArchivistWrapper } from '@xyo-network/archivist';
 import { usePromise } from '@xyo-network/react-shared';
 import { useCallback, useMemo } from 'react';
 import { useMemoryNodeUpdates } from './useMemoryNodeUpdates';
-import { useProvidedNode } from './useProvidedNode';
+import { useProvidedWrappedNode } from './useProvidedNode';
 export const useArchiveArchivistsRaw = (archiveName, refresher) => {
-    const [node] = useProvidedNode(true);
+    const [node] = useProvidedWrappedNode();
     const buildReq = useCallback((type) => (archiveName && node) || refresher
         ? node?.resolveWrapped(ArchivistWrapper, { name: [encodeURIComponent(`${archiveName}[${type}]`)] })
         : undefined, [archiveName, node, refresher]);

package/dist/esm/hooks/useArchiveArchivists.js.map

@@ -1 +1 @@
-{"version":3,"file":"useArchiveArchivists.js","sourceRoot":"","sources":["../../../src/hooks/useArchiveArchivists.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAOnD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,WAAoB,EAAE,SAAmB,EAAoC,EAAE;IACrH,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;IAEpC,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,IAAgC,EAAE,EAAE,CACnC,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,SAAS;QAChC,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,CAAC,kBAAkB,CAAC,GAAG,WAAW,IAAI,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC;QACnG,CAAC,CAAC,SAAS,EACf,CAAC,WAAW,EAAE,IAAI,EAAE,SAAS,CAAC,CAC/B,CAAA;IAED,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC1E,MAAM,wBAAwB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEpF,MAAM,CAAC,qBAAqB,CAAC,GAAG,UAAU,CAAC,mBAAmB,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAA;IACtF,MAAM,CAAC,0BAA0B,CAAC,GAAG,UAAU,CAAC,wBAAwB,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAA;IAErG,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;QAC9B,IAAI,0BAA0B,EAAE,CAAC,CAAC,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC,CAAC,EAAE;YACjE,OAAO;gBACL,0BAA0B,EAAE,0BAA0B,CAAC,CAAC,CAAqB;gBAC7E,qBAAqB,EAAE,qBAAqB,CAAC,CAAC,CAAqB;aACpE,CAAA;SACF;aAAM;YACL,OAAM;SACP;IACH,CAAC,EAAE,CAAC,0BAA0B,EAAE,qBAAqB,CAAC,CAAC,CAAA;IAEvD,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,WAAoB,EAAE,SAAmB,EAAE,gBAA2B,EAAE,EAAE;IAC7G,MAAM,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;IACzD,MAAM,UAAU,GAAG,uBAAuB,CAAC,WAAW,EAAE,SAAS,IAAI,MAAM,CAAC,CAAA;IAE5E,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}
+{"version":3,"file":"useArchiveArchivists.js","sourceRoot":"","sources":["../../../src/hooks/useArchiveArchivists.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAO1D,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,WAAoB,EAAE,SAAmB,EAAoC,EAAE;IACrH,MAAM,CAAC,IAAI,CAAC,GAAG,sBAAsB,EAAE,CAAA;IAEvC,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,IAAgC,EAAE,EAAE,CACnC,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,SAAS;QAChC,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,CAAC,kBAAkB,CAAC,GAAG,WAAW,IAAI,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC;QACnG,CAAC,CAAC,SAAS,EACf,CAAC,WAAW,EAAE,IAAI,EAAE,SAAS,CAAC,CAC/B,CAAA;IAED,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC1E,MAAM,wBAAwB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEpF,MAAM,CAAC,qBAAqB,CAAC,GAAG,UAAU,CAAC,mBAAmB,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAA;IACtF,MAAM,CAAC,0BAA0B,CAAC,GAAG,UAAU,CAAC,wBAAwB,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAA;IAErG,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;QAC9B,IAAI,0BAA0B,EAAE,CAAC,CAAC,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC,CAAC,EAAE;YACjE,OAAO;gBACL,0BAA0B,EAAE,0BAA0B,CAAC,CAAC,CAAqB;gBAC7E,qBAAqB,EAAE,qBAAqB,CAAC,CAAC,CAAqB;aACpE,CAAA;SACF;aAAM;YACL,OAAM;SACP;IACH,CAAC,EAAE,CAAC,0BAA0B,EAAE,qBAAqB,CAAC,CAAC,CAAA;IAEvD,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,WAAoB,EAAE,SAAmB,EAAE,gBAA2B,EAAE,EAAE;IAC7G,MAAM,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;IACzD,MAAM,UAAU,GAAG,uBAAuB,CAAC,WAAW,EAAE,SAAS,IAAI,MAAM,CAAC,CAAA;IAE5E,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}

package/dist/esm/hooks/useModule.js

@@ -1,9 +1,8 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
-import { NodeWrapper } from '@xyo-network/node';
 import { useState } from 'react';
-import { useProvidedNode } from './useProvidedNode';
+import { useProvidedWrappedNode } from './useProvidedNode';
 export const useModule = (nameOrAddress) => {
-    const [node, nodeError] = useProvidedNode();
+    const [node, nodeError] = useProvidedWrappedNode();
     const [module, setModule] = useState();
     const [error, setError] = useState();
     useAsyncEffect(
@@ -16,11 +15,8 @@ export const useModule = (nameOrAddress) => {
                 setModule(undefined);
             }
             else {
-                const wrappedNode = NodeWrapper.tryWrap(node);
-                if (wrappedNode) {
-                    const module = nameOrAddress
-                        ? await wrappedNode?.resolve(nameOrAddress)
-                        : (await wrappedNode.resolve()).pop();
+                if (node) {
+                    const module = nameOrAddress ? await node.resolve(nameOrAddress) : (await node.resolve()).pop();
                     if (mounted()) {
                         console.log(`Setting Module [${module?.address}]`);
                         setModule(module);

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

@@ -1 +1 @@
-{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAkC,aAAsB,EAA4C,EAAE;IAC7H,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,eAAe,EAAE,CAAA;IAC3C,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAW,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,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,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAC7C,IAAI,WAAW,EAAE;oBACf,MAAM,MAAM,GAAwB,aAAa;wBAC/C,CAAC,CAAC,MAAM,WAAW,EAAE,OAAO,CAAU,aAAa,CAAC;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,EAAE,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,EACD,CAAC,aAAa,EAAE,IAAI,EAAE,SAAS,CAAC,CACjC,CAAA;IAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA"}
+{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAkC,aAAsB,EAA4C,EAAE;IAC7H,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,sBAAsB,EAAE,CAAA;IAClD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAW,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,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,IAAI,IAAI,EAAE;oBACR,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,GAAG,CAAC,mBAAmB,MAAM,EAAE,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,EACD,CAAC,aAAa,EAAE,IAAI,EAAE,SAAS,CAAC,CACjC,CAAA;IAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA"}

package/dist/esm/hooks/useModules.js

@@ -1,8 +1,8 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
 import { useState } from 'react';
-import { useProvidedNode } from './useProvidedNode';
+import { useProvidedWrappedNode } from './useProvidedNode';
 export const useModules = (filter) => {
-    const [node] = useProvidedNode(true);
+    const [node] = useProvidedWrappedNode();
     const [modules, setModules] = useState();
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -1 +1 @@
-{"version":3,"file":"useModules.js","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,MAAM,CAAC,MAAM,UAAU,GAAG,CAA4B,MAAqB,EAAE,EAAE;IAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;IACpC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAO,CAAA;IAE7C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,EAAE,OAAO,CAAI,MAAM,CAAC,CAAA;QAC9C,IAAI,OAAO,EAAE,EAAE;YACb,UAAU,CAAC,OAAO,CAAC,CAAA;SACpB;IACH,CAAC,EACD,CAAC,MAAM,EAAE,IAAI,CAAC,CACf,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
+{"version":3,"file":"useModules.js","sourceRoot":"","sources":["../../../src/hooks/useModules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,CAAC,MAAM,UAAU,GAAG,CAA4B,MAAqB,EAAE,EAAE;IAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,sBAAsB,EAAE,CAAA;IACvC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAO,CAAA;IAE7C,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,EAAE,OAAO,CAAI,MAAM,CAAC,CAAA;QAC9C,IAAI,OAAO,EAAE,EAAE;YACb,UAAU,CAAC,OAAO,CAAC,CAAA;SACpB;IACH,CAAC,EACD,CAAC,MAAM,EAAE,IAAI,CAAC,CACf,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}

package/dist/esm/hooks/useNode.js

@@ -1,16 +1,18 @@
 import { useModule } from './useModule';
-import { useProvidedNode } from './useProvidedNode';
+import { useProvidedWrappedNode } from './useProvidedNode';
 export const useNode = (nameOrAddress) => {
-    const providedNode = useProvidedNode();
-    const node = useModule(nameOrAddress);
+    const [providedNode, providedNodeError] = useProvidedWrappedNode();
+    const [node, nodeError] = useModule(nameOrAddress);
     if (nameOrAddress) {
-        if (providedNode && node) {
-            return node;
+        if (providedNode) {
+            return [node, nodeError];
+        }
+        else {
+            return [providedNode, providedNodeError];
         }
     }
     else {
-        return providedNode;
+        return [providedNode, providedNodeError];
     }
-    return [undefined, undefined];
 };
 //# sourceMappingURL=useNode.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useNode.js","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,aAAsB,EAA+C,EAAE;IAC7F,MAAM,YAAY,GAAG,eAAe,EAAE,CAAA;IACtC,MAAM,IAAI,GAAG,SAAS,CAAa,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"}
+{"version":3,"file":"useNode.js","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,aAAsB,EAA+C,EAAE;IAC7F,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC,GAAG,sBAAsB,EAAE,CAAA;IAClE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,SAAS,CAAa,aAAa,CAAC,CAAA;IAE9D,IAAI,aAAa,EAAE;QACjB,IAAI,YAAY,EAAE;YAChB,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;SACzB;aAAM;YACL,OAAO,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAA;SACzC;KACF;SAAM;QACL,OAAO,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAA;KACzC;AACH,CAAC,CAAA"}

package/dist/esm/hooks/useProvidedNode.js

@@ -1,24 +1,26 @@
 import { NodeWrapper } from '@xyo-network/node';
 import { useContext, useEffect, useState } from 'react';
 import { NodeContext } from '../contexts';
-function useProvidedNodeFunc(wrap) {
+export const useProvidedNode = () => {
     const { node } = useContext(NodeContext);
+    return [node];
+};
+export const useProvidedWrappedNode = (account) => {
+    const [node] = useProvidedNode();
     const [wrappedNode, setWrappedNode] = useState();
     const [error, setError] = useState();
     useEffect(() => {
         try {
             if (node) {
-                const account = typeof wrap === 'boolean' ? undefined : wrap;
-                const wrappedNode = wrap ? NodeWrapper.wrap(node, account) : undefined;
-                setWrappedNode(wrappedNode);
+                setWrappedNode(NodeWrapper.wrap(node, account));
                 setError(undefined);
             }
         }
         catch (ex) {
+            setWrappedNode(undefined);
             setError(ex);
         }
-    }, [node, wrap]);
-    return [wrap ? wrappedNode : wrappedNode?.module, error];
-}
-export const useProvidedNode = useProvidedNodeFunc;
+    }, [node, account]);
+    return [wrappedNode, error];
+};
 //# sourceMappingURL=useProvidedNode.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAKzC,SAAS,mBAAmB,CAAC,IAAmC;IAC9D,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IACxC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAe,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAE3C,SAAS,CAAC,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,WAAW,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,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AAC1D,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,CAAA"}
+{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,CAAC,MAAM,eAAe,GAAG,GAA6B,EAAE;IAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IAExC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAyB,EAAgD,EAAE;IAChH,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,EAAE,CAAA;IAChC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAe,CAAA;IAC7D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAE3C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI;YACF,IAAI,IAAI,EAAE;gBACR,cAAc,CAAC,WAAW,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"}

package/dist/types/hooks/useModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAMlD,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;oBAAqD,MAAM,6CA0ChF,CAAA"}
+{"version":3,"file":"useModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAMlD,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;oBAAqD,MAAM,6CAuChF,CAAA"}

package/dist/types/hooks/useNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAK9C,eAAO,MAAM,OAAO,mBAAoB,MAAM,KAAG,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAY1F,CAAA"}
+{"version":3,"file":"useNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAK9C,eAAO,MAAM,OAAO,mBAAoB,MAAM,KAAG,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAa1F,CAAA"}

package/dist/types/hooks/useProvidedNode.d.ts

@@ -1,8 +1,5 @@
-import { Account } from '@xyo-network/account';
+import { AccountInstance } from '@xyo-network/account-model';
 import { NodeModule, NodeWrapper } from '@xyo-network/node';
-declare function useProvidedNodeFunc(wrap?: undefined): [NodeModule | undefined, Error | undefined];
-declare function useProvidedNodeFunc(wrap: false): [NodeModule | undefined, Error | undefined];
-declare function useProvidedNodeFunc(wrap: true | Account): [NodeWrapper | undefined, Error | undefined];
-export declare const useProvidedNode: typeof useProvidedNodeFunc;
-export {};
+export declare const useProvidedNode: () => [NodeModule | undefined];
+export declare const useProvidedWrappedNode: (account?: AccountInstance) => [NodeWrapper | undefined, Error | undefined];
 //# sourceMappingURL=useProvidedNode.d.ts.map

package/dist/types/hooks/useProvidedNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useProvidedNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK3D,iBAAS,mBAAmB,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AAC3F,iBAAS,mBAAmB,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AACtF,iBAAS,mBAAmB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,CAAC,WAAW,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AAsBhG,eAAO,MAAM,eAAe,4BAAsB,CAAA"}
+{"version":3,"file":"useProvidedNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useProvidedNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK3D,eAAO,MAAM,eAAe,QAAO,CAAC,UAAU,GAAG,SAAS,CAIzD,CAAA;AAED,eAAO,MAAM,sBAAsB,aAAc,eAAe,KAAG,CAAC,WAAW,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAkB7G,CAAA"}

package/package.json

@@ -21,7 +21,7 @@
     "@xyo-network/module-model": "^2.51.2",
     "@xyo-network/node": "^2.51.2",
     "@xyo-network/payload-model": "^2.51.2",
-    "@xyo-network/react-shared": "^2.45.0-rc.17",
+    "@xyo-network/react-shared": "^2.45.0-rc.18",
     "@xyo-network/witness": "^2.51.2"
   },
   "devDependencies": {
@@ -83,6 +83,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.45.0-rc.17",
+  "version": "2.45.0-rc.18",
   "stableVersion": "2.44.1"
 }

package/src/components/Node.stories.tsx

@@ -23,7 +23,7 @@ export default {
 } as Meta
 
 const Template: ComponentStory<React.FC> = (props) => {
-  const [node] = useProvidedNode() as [MemoryNode, Error]
+  const [node] = useProvidedNode() as [MemoryNode]
   const [description, setDescription] = useState<string>()
 
   useAsyncEffect(

package/src/hooks/useArchiveArchivists.tsx

@@ -3,7 +3,7 @@ import { usePromise } from '@xyo-network/react-shared'
 import { useCallback, useMemo } from 'react'
 
 import { useMemoryNodeUpdates } from './useMemoryNodeUpdates'
-import { useProvidedNode } from './useProvidedNode'
+import { useProvidedWrappedNode } from './useProvidedNode'
 
 interface UseArchiveArchivists {
   archiveBoundWitnessWrapper: ArchivistWrapper
@@ -11,7 +11,7 @@ interface UseArchiveArchivists {
 }
 
 export const useArchiveArchivistsRaw = (archiveName?: string, refresher?: unknown): UseArchiveArchivists | undefined => {
-  const [node] = useProvidedNode(true)
+  const [node] = useProvidedWrappedNode()
 
   const buildReq = useCallback(
     (type: 'payload' | 'boundwitness') =>

package/src/hooks/useModule.tsx

@@ -1,12 +1,11 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
 import { Module } from '@xyo-network/module-model'
-import { NodeWrapper } from '@xyo-network/node'
 import { useState } from 'react'
 
-import { useProvidedNode } from './useProvidedNode'
+import { useProvidedWrappedNode } from './useProvidedNode'
 
 export const useModule = <TModule extends Module = Module>(nameOrAddress?: string): [TModule | undefined, Error | undefined] => {
-  const [node, nodeError] = useProvidedNode()
+  const [node, nodeError] = useProvidedWrappedNode()
   const [module, setModule] = useState<TModule>()
   const [error, setError] = useState<Error>()
   useAsyncEffect(
@@ -18,11 +17,8 @@ export const useModule = <TModule extends Module = Module>(nameOrAddress?: strin
           setError(nodeError)
           setModule(undefined)
         } else {
-          const wrappedNode = NodeWrapper.tryWrap(node)
-          if (wrappedNode) {
-            const module: TModule | undefined = nameOrAddress
-              ? await wrappedNode?.resolve<TModule>(nameOrAddress)
-              : (await wrappedNode.resolve<TModule>()).pop()
+          if (node) {
+            const module: TModule | undefined = nameOrAddress ? await node.resolve<TModule>(nameOrAddress) : (await node.resolve<TModule>()).pop()
             if (mounted()) {
               console.log(`Setting Module [${module?.address}]`)
               setModule(module)

package/src/hooks/useModules.ts

@@ -2,10 +2,10 @@ import { useAsyncEffect } from '@xylabs/react-shared'
 import { Module, ModuleFilter } from '@xyo-network/module'
 import { useState } from 'react'
 
-import { useProvidedNode } from './useProvidedNode'
+import { useProvidedWrappedNode } from './useProvidedNode'
 
 export const useModules = <T extends Module = Module>(filter?: ModuleFilter) => {
-  const [node] = useProvidedNode(true)
+  const [node] = useProvidedWrappedNode()
   const [modules, setModules] = useState<T[]>()
 
   useAsyncEffect(

package/src/hooks/useNode.tsx

@@ -1,18 +1,19 @@
 import { NodeModule } from '@xyo-network/node'
 
 import { useModule } from './useModule'
-import { useProvidedNode } from './useProvidedNode'
+import { useProvidedWrappedNode } from './useProvidedNode'
 
 export const useNode = (nameOrAddress?: string): [NodeModule | undefined, Error | undefined] => {
-  const providedNode = useProvidedNode()
-  const node = useModule<NodeModule>(nameOrAddress)
+  const [providedNode, providedNodeError] = useProvidedWrappedNode()
+  const [node, nodeError] = useModule<NodeModule>(nameOrAddress)
 
   if (nameOrAddress) {
-    if (providedNode && node) {
-      return node
+    if (providedNode) {
+      return [node, nodeError]
+    } else {
+      return [providedNode, providedNodeError]
     }
   } else {
-    return providedNode
+    return [providedNode, providedNodeError]
   }
-  return [undefined, undefined]
 }

package/src/hooks/useProvidedNode.tsx

@@ -1,31 +1,31 @@
-import { Account } from '@xyo-network/account'
+import { AccountInstance } from '@xyo-network/account-model'
 import { NodeModule, NodeWrapper } from '@xyo-network/node'
 import { useContext, useEffect, useState } from 'react'
 
 import { NodeContext } from '../contexts'
 
-function useProvidedNodeFunc(wrap?: undefined): [NodeModule | undefined, Error | undefined]
-function useProvidedNodeFunc(wrap: false): [NodeModule | undefined, Error | undefined]
-function useProvidedNodeFunc(wrap: true | Account): [NodeWrapper | undefined, Error | undefined]
-function useProvidedNodeFunc(wrap: boolean | Account | undefined): [NodeModule | NodeWrapper | undefined, Error | undefined] {
+export const useProvidedNode = (): [NodeModule | undefined] => {
   const { node } = useContext(NodeContext)
+
+  return [node]
+}
+
+export const useProvidedWrappedNode = (account?: AccountInstance): [NodeWrapper | undefined, Error | undefined] => {
+  const [node] = useProvidedNode()
   const [wrappedNode, setWrappedNode] = useState<NodeWrapper>()
   const [error, setError] = useState<Error>()
 
   useEffect(() => {
     try {
       if (node) {
-        const account = typeof wrap === 'boolean' ? undefined : wrap
-        const wrappedNode = wrap ? NodeWrapper.wrap(node, account) : undefined
-        setWrappedNode(wrappedNode)
+        setWrappedNode(NodeWrapper.wrap(node, account))
         setError(undefined)
       }
     } catch (ex) {
+      setWrappedNode(undefined)
       setError(ex as Error)
     }
-  }, [node, wrap])
+  }, [node, account])
 
-  return [wrap ? wrappedNode : wrappedNode?.module, error]
+  return [wrappedNode, error]
 }
-
-export const useProvidedNode = useProvidedNodeFunc