@xyo-network/react-archivist 2.45.0-rc.3 → 2.45.0-rc.31

package/dist/cjs/hooks/useArchivist.js

@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useArchivist = void 0;
 const archivist_1 = require("@xyo-network/archivist");
 const react_node_1 = require("@xyo-network/react-node");
-exports.useArchivist = (0, react_node_1.createUseModuleHook)(archivist_1.ArchivistWrapper.wrap, react_node_1.useNode);
+exports.useArchivist = (0, react_node_1.WrappedModuleHookFactory)(archivist_1.ArchivistWrapper, 'useArchivist');
 //# sourceMappingURL=useArchivist.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivist.js","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":";;;AAAA,sDAA0E;AAC1E,wDAAsE;AAEzD,QAAA,YAAY,GAAG,IAAA,gCAAmB,EAAoC,4BAAgB,CAAC,IAAI,EAAE,oBAAO,CAAC,CAAA"}
+{"version":3,"file":"useArchivist.js","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":";;;AAAA,sDAAyD;AACzD,wDAAkE;AAErD,QAAA,YAAY,GAAG,IAAA,qCAAwB,EAAC,4BAAgB,EAAE,cAAc,CAAC,CAAA"}

package/dist/cjs/hooks/useArchivistGet.js

@@ -3,19 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useArchivistGet = void 0;
 const tslib_1 = require("tslib");
 const react_shared_1 = require("@xylabs/react-shared");
-const react_shared_2 = require("@xyo-network/react-shared");
-const useArchivistStates_1 = require("./useArchivistStates");
-const useArchivistGet = (hashes) => {
-    const [savedHashes, setSavedHashes] = (0, react_shared_2.useDataState)(hashes);
-    setSavedHashes(hashes);
-    const { archivist, error, payloads, refresh, setError, setPayloads, refreshCount } = (0, useArchivistStates_1.useArchivistStates)();
+const react_1 = require("react");
+const useArchivist_1 = require("./useArchivist");
+const useArchivistGet = (hashes, archivist) => {
+    const requestedArchivistNameOrAddress = typeof archivist === 'string' ? archivist : undefined;
+    const passedArchivist = typeof archivist === 'object' ? archivist : undefined;
+    const [payloads, setPayloads] = (0, react_1.useState)();
+    const [foundArchivist, foundArchivistError] = (0, useArchivist_1.useArchivist)(requestedArchivistNameOrAddress);
+    const [error, setError] = (0, react_1.useState)();
+    const [refresh, setRefresh] = (0, react_1.useState)(0);
+    const onRefresh = (0, react_1.useCallback)(() => {
+        setRefresh(refresh + 1);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     (0, react_shared_1.useAsyncEffect)(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         var _a;
         try {
-            if (archivist && savedHashes) {
-                const result = (_a = (yield archivist.get(savedHashes !== null && savedHashes !== void 0 ? savedHashes : []))) !== null && _a !== void 0 ? _a : [];
+            const archivistToUse = passedArchivist !== null && passedArchivist !== void 0 ? passedArchivist : foundArchivist;
+            if (archivistToUse && hashes) {
+                const result = (_a = (yield archivistToUse.get(hashes !== null && hashes !== void 0 ? hashes : []))) !== null && _a !== void 0 ? _a : [];
                 if (mounted()) {
                     setError(undefined);
                     setPayloads(result);
@@ -25,8 +33,8 @@ const useArchivistGet = (hashes) => {
         catch (ex) {
             setError(ex);
         }
-    }), [archivist, savedHashes, refreshCount, setError, setPayloads]);
-    return [payloads, error, refresh];
+    }), [passedArchivist, foundArchivist, hashes, refresh, setError, setPayloads]);
+    return [payloads, error !== null && error !== void 0 ? error : foundArchivistError, onRefresh];
 };
 exports.useArchivistGet = useArchivistGet;
 //# sourceMappingURL=useArchivistGet.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,4DAAwD;AAExD,6DAA0E;AAEnE,MAAM,eAAe,GAAG,CAAoC,MAAiB,EAAoC,EAAE;IACxH,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,2BAAY,EAAC,MAAM,CAAC,CAAA;IAC1D,cAAc,CAAC,MAAM,CAAC,CAAA;IAEtB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,IAAA,uCAAkB,GAAK,CAAA;IAE5G,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;;QAChB,IAAI;YACF,IAAI,SAAS,IAAI,WAAW,EAAE;gBAC5B,MAAM,MAAM,GAAG,MAAA,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAA;gBAC7D,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAa,CAAC,CAAA;iBAC3B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,CAAA,EACD,CAAC,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC9D,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA;AAxBY,QAAA,eAAe,mBAwB3B"}
+{"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAGrD,iCAA6C;AAE7C,iDAA6C;AAGtC,MAAM,eAAe,GAAG,CAC7B,MAAiB,EACjB,SAA8B,EACI,EAAE;IACpC,MAAM,+BAA+B,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7F,MAAM,eAAe,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7E,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,GAAO,CAAA;IAC/C,MAAM,CAAC,cAAc,EAAE,mBAAmB,CAAC,GAAG,IAAA,2BAAY,EAAC,+BAA+B,CAAC,CAAA;IAC3F,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAC3C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAA;IAEzC,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACjC,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;QACvB,uDAAuD;IACzD,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;;QAChB,IAAI;YACF,MAAM,cAAc,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAA;YACxD,IAAI,cAAc,IAAI,MAAM,EAAE;gBAC5B,MAAM,MAAM,GAAG,MAAC,CAAC,MAAM,cAAc,CAAC,GAAG,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,CAAS,mCAAI,EAAE,CAAA;gBACtE,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAa,CAAC,CAAA;iBAC3B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,CAAA,EACD,CAAC,eAAe,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC1E,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,mBAAmB,EAAE,SAAS,CAAC,CAAA;AAC5D,CAAC,CAAA;AAnCY,QAAA,eAAe,mBAmC3B"}

package/dist/docs.json

@@ -26,7 +26,7 @@
 							"fileName": "packages/modules/packages/archivist/src/components/Details/Details.tsx",
 							"line": 20,
 							"character": 2,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/components/Details/Details.tsx#L20"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/components/Details/Details.tsx#L20"
 						}
 					],
 					"type": {
@@ -18396,13 +18396,13 @@
 					"fileName": "packages/modules/packages/archivist/src/components/Details/Details.tsx",
 					"line": 19,
 					"character": 17,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/components/Details/Details.tsx#L19"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/components/Details/Details.tsx#L19"
 				},
 				{
 					"fileName": "packages/modules/packages/archivist/src/components/Details/Details.tsx",
 					"line": 23,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/components/Details/Details.tsx#L23"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/components/Details/Details.tsx#L23"
 				}
 			],
 			"extendedTypes": [
@@ -18415,7 +18415,7 @@
 			]
 		},
 		{
-			"id": 422,
+			"id": 421,
 			"name": "RefreshCallback",
 			"kind": 4194304,
 			"kindString": "Type alias",
@@ -18425,13 +18425,13 @@
 					"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 					"line": 7,
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L7"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L7"
 				}
 			],
 			"type": {
 				"type": "reflection",
 				"declaration": {
-					"id": 423,
+					"id": 422,
 					"name": "__type",
 					"kind": 65536,
 					"kindString": "Type literal",
@@ -18441,12 +18441,12 @@
 							"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 							"line": 7,
 							"character": 30,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L7"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L7"
 						}
 					],
 					"signatures": [
 						{
-							"id": 424,
+							"id": 423,
 							"name": "__type",
 							"kind": 4096,
 							"kindString": "Call signature",
@@ -18471,7 +18471,7 @@
 					"fileName": "packages/modules/packages/archivist/src/components/Card/Card.tsx",
 					"line": 8,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/components/Card/Card.tsx#L8"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/components/Card/Card.tsx#L8"
 				}
 			],
 			"signatures": [
@@ -19749,7 +19749,7 @@
 					"fileName": "packages/modules/packages/archivist/src/components/Card/CardContent.tsx",
 					"line": 10,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/components/Card/CardContent.tsx#L10"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/components/Card/CardContent.tsx#L10"
 				}
 			],
 			"signatures": [
@@ -19953,7 +19953,7 @@
 					"fileName": "packages/modules/packages/archivist/src/components/Card/CardHeader.tsx",
 					"line": 5,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/components/Card/CardHeader.tsx#L5"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/components/Card/CardHeader.tsx#L5"
 				}
 			],
 			"signatures": [
@@ -20181,13 +20181,13 @@
 					"fileName": "packages/modules/packages/archivist/src/components/Details/Details.tsx",
 					"line": 19,
 					"character": 17,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/components/Details/Details.tsx#L19"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/components/Details/Details.tsx#L19"
 				},
 				{
 					"fileName": "packages/modules/packages/archivist/src/components/Details/Details.tsx",
 					"line": 23,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/components/Details/Details.tsx#L23"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/components/Details/Details.tsx#L23"
 				}
 			],
 			"signatures": [
@@ -20263,7 +20263,7 @@
 					"fileName": "packages/modules/packages/archivist/src/hooks/useArchivist.tsx",
 					"line": 4,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivist.tsx#L4"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivist.tsx#L4"
 				}
 			],
 			"signatures": [
@@ -20276,7 +20276,7 @@
 					"parameters": [
 						{
 							"id": 402,
-							"name": "name",
+							"name": "nameOrAddress",
 							"kind": 32768,
 							"kindString": "Parameter",
 							"flags": {
@@ -20286,223 +20286,33 @@
 								"type": "intrinsic",
 								"name": "string"
 							}
-						}
-					],
-					"type": {
-						"type": "tuple",
-						"elements": [
-							{
-								"type": "union",
-								"types": [
-									{
-										"type": "intrinsic",
-										"name": "undefined"
-									},
-									{
-										"type": "reference",
-										"name": "ArchivistModule",
-										"qualifiedName": "ArchivistModule",
-										"package": "@xyo-network/archivist-interface"
-									}
-								]
-							},
-							{
-								"type": "union",
-								"types": [
-									{
-										"type": "intrinsic",
-										"name": "undefined"
-									},
-									{
-										"type": "reference",
-										"name": "Error",
-										"qualifiedName": "Error",
-										"package": "typescript"
-									}
-								]
-							}
-						]
-					}
-				},
-				{
-					"id": 403,
-					"name": "useArchivist",
-					"kind": 4096,
-					"kindString": "Call signature",
-					"flags": {},
-					"parameters": [
-						{
-							"id": 404,
-							"name": "name",
-							"kind": 32768,
-							"kindString": "Parameter",
-							"flags": {},
-							"type": {
-								"type": "union",
-								"types": [
-									{
-										"type": "intrinsic",
-										"name": "undefined"
-									},
-									{
-										"type": "intrinsic",
-										"name": "string"
-									}
-								]
-							}
 						},
 						{
-							"id": 405,
-							"name": "wrap",
-							"kind": 32768,
-							"kindString": "Parameter",
-							"flags": {},
-							"type": {
-								"type": "union",
-								"types": [
-									{
-										"type": "literal",
-										"value": true
-									},
-									{
-										"type": "reference",
-										"name": "Account",
-										"qualifiedName": "Account",
-										"package": "@xyo-network/account"
-									}
-								]
-							}
-						}
-					],
-					"type": {
-						"type": "tuple",
-						"elements": [
-							{
-								"type": "union",
-								"types": [
-									{
-										"type": "intrinsic",
-										"name": "undefined"
-									},
-									{
-										"type": "reference",
-										"name": "ArchivistWrapper",
-										"qualifiedName": "ArchivistWrapper",
-										"package": "@xyo-network/archivist-wrapper"
-									}
-								]
-							},
-							{
-								"type": "union",
-								"types": [
-									{
-										"type": "intrinsic",
-										"name": "undefined"
-									},
-									{
-										"type": "reference",
-										"name": "Error",
-										"qualifiedName": "Error",
-										"package": "typescript"
-									}
-								]
-							}
-						]
-					}
-				},
-				{
-					"id": 406,
-					"name": "useArchivist",
-					"kind": 4096,
-					"kindString": "Call signature",
-					"flags": {},
-					"parameters": [
-						{
-							"id": 407,
-							"name": "address",
+							"id": 403,
+							"name": "account",
 							"kind": 32768,
 							"kindString": "Parameter",
-							"flags": {},
-							"type": {
-								"type": "intrinsic",
-								"name": "string"
-							}
-						}
-					],
-					"type": {
-						"type": "tuple",
-						"elements": [
-							{
-								"type": "union",
-								"types": [
-									{
-										"type": "intrinsic",
-										"name": "undefined"
-									},
-									{
-										"type": "reference",
-										"name": "ArchivistModule",
-										"qualifiedName": "ArchivistModule",
-										"package": "@xyo-network/archivist-interface"
-									}
-								]
+							"flags": {
+								"isOptional": true
 							},
-							{
-								"type": "union",
-								"types": [
-									{
-										"type": "intrinsic",
-										"name": "undefined"
-									},
-									{
-										"type": "reference",
-										"name": "Error",
-										"qualifiedName": "Error",
-										"package": "typescript"
-									}
-								]
-							}
-						]
-					}
-				},
-				{
-					"id": 408,
-					"name": "useArchivist",
-					"kind": 4096,
-					"kindString": "Call signature",
-					"flags": {},
-					"parameters": [
-						{
-							"id": 409,
-							"name": "address",
-							"kind": 32768,
-							"kindString": "Parameter",
-							"flags": {},
 							"type": {
-								"type": "intrinsic",
-								"name": "string"
+								"type": "reference",
+								"name": "AccountInstance",
+								"qualifiedName": "AccountInstance",
+								"package": "@xyo-network/account-model"
 							}
 						},
 						{
-							"id": 410,
-							"name": "wrap",
+							"id": 404,
+							"name": "spinCheck",
 							"kind": 32768,
 							"kindString": "Parameter",
-							"flags": {},
+							"flags": {
+								"isOptional": true
+							},
 							"type": {
-								"type": "union",
-								"types": [
-									{
-										"type": "literal",
-										"value": true
-									},
-									{
-										"type": "reference",
-										"name": "Account",
-										"qualifiedName": "Account",
-										"package": "@xyo-network/account"
-									}
-								]
+								"type": "intrinsic",
+								"name": "boolean"
 							}
 						}
 					],
@@ -20545,7 +20355,7 @@
 			]
 		},
 		{
-			"id": 411,
+			"id": 405,
 			"name": "useArchivistAll",
 			"kind": 64,
 			"kindString": "Function",
@@ -20555,12 +20365,12 @@
 					"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistAll.tsx",
 					"line": 6,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistAll.tsx#L6"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistAll.tsx#L6"
 				}
 			],
 			"signatures": [
 				{
-					"id": 412,
+					"id": 406,
 					"name": "useArchivistAll",
 					"kind": 4096,
 					"kindString": "Call signature",
@@ -20594,7 +20404,7 @@
 											{
 												"type": "reflection",
 												"declaration": {
-													"id": 413,
+													"id": 407,
 													"name": "__type",
 													"kind": 65536,
 													"kindString": "Type literal",
@@ -20620,7 +20430,7 @@
 								{
 									"type": "reflection",
 									"declaration": {
-										"id": 414,
+										"id": 408,
 										"name": "__type",
 										"kind": 65536,
 										"kindString": "Type literal",
@@ -20630,12 +20440,12 @@
 												"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 												"line": 14,
 												"character": 26,
-												"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L14"
+												"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L14"
 											}
 										],
 										"signatures": [
 											{
-												"id": 415,
+												"id": 409,
 												"name": "__type",
 												"kind": 4096,
 												"kindString": "Call signature",
@@ -20655,7 +20465,7 @@
 			]
 		},
 		{
-			"id": 416,
+			"id": 410,
 			"name": "useArchivistGet",
 			"kind": 64,
 			"kindString": "Function",
@@ -20663,21 +20473,21 @@
 			"sources": [
 				{
 					"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistGet.tsx",
-					"line": 7,
+					"line": 9,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistGet.tsx#L7"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistGet.tsx#L9"
 				}
 			],
 			"signatures": [
 				{
-					"id": 417,
+					"id": 411,
 					"name": "useArchivistGet",
 					"kind": 4096,
 					"kindString": "Call signature",
 					"flags": {},
 					"typeParameter": [
 						{
-							"id": 420,
+							"id": 414,
 							"name": "T",
 							"kind": 131072,
 							"kindString": "Type parameter",
@@ -20700,7 +20510,7 @@
 									{
 										"type": "reflection",
 										"declaration": {
-											"id": 418,
+											"id": 412,
 											"name": "__type",
 											"kind": 65536,
 											"kindString": "Type literal",
@@ -20734,7 +20544,7 @@
 									{
 										"type": "reflection",
 										"declaration": {
-											"id": 419,
+											"id": 413,
 											"name": "__type",
 											"kind": 65536,
 											"kindString": "Type literal",
@@ -20754,7 +20564,7 @@
 					],
 					"parameters": [
 						{
-							"id": 421,
+							"id": 415,
 							"name": "hashes",
 							"kind": 32768,
 							"kindString": "Parameter",
@@ -20768,6 +20578,184 @@
 									"name": "string"
 								}
 							}
+						},
+						{
+							"id": 416,
+							"name": "archivist",
+							"kind": 32768,
+							"kindString": "Parameter",
+							"flags": {
+								"isOptional": true
+							},
+							"type": {
+								"type": "union",
+								"types": [
+									{
+										"type": "intrinsic",
+										"name": "string"
+									},
+									{
+										"type": "reference",
+										"typeArguments": [
+											{
+												"type": "intersection",
+												"types": [
+													{
+														"type": "reference",
+														"name": "SchemaFields",
+														"qualifiedName": "SchemaFields",
+														"package": "@xyo-network/payload-model"
+													},
+													{
+														"type": "reference",
+														"name": "PayloadFields",
+														"qualifiedName": "PayloadFields",
+														"package": "@xyo-network/payload-model"
+													},
+													{
+														"type": "reflection",
+														"declaration": {
+															"id": 417,
+															"name": "__type",
+															"kind": 65536,
+															"kindString": "Type literal",
+															"flags": {},
+															"sources": [
+																{
+																	"fileName": "node_modules/@xyo-network/payload-model/dist/types/XyoPayload.d.ts",
+																	"line": 18,
+																	"character": 17
+																}
+															]
+														}
+													}
+												]
+											},
+											{
+												"type": "intersection",
+												"types": [
+													{
+														"type": "reference",
+														"name": "SchemaFields",
+														"qualifiedName": "SchemaFields",
+														"package": "@xyo-network/payload-model"
+													},
+													{
+														"type": "reference",
+														"name": "PayloadFields",
+														"qualifiedName": "PayloadFields",
+														"package": "@xyo-network/payload-model"
+													},
+													{
+														"type": "reference",
+														"name": "XyoBoundWitnessFields",
+														"qualifiedName": "XyoBoundWitnessFields",
+														"package": "@xyo-network/boundwitness-model"
+													},
+													{
+														"type": "reflection",
+														"declaration": {
+															"id": 418,
+															"name": "__type",
+															"kind": 65536,
+															"kindString": "Type literal",
+															"flags": {},
+															"sources": [
+																{
+																	"fileName": "node_modules/@xyo-network/payload-model/dist/types/XyoPayload.d.ts",
+																	"line": 16,
+																	"character": 221
+																}
+															]
+														}
+													}
+												]
+											},
+											{
+												"type": "intersection",
+												"types": [
+													{
+														"type": "reference",
+														"name": "SchemaFields",
+														"qualifiedName": "SchemaFields",
+														"package": "@xyo-network/payload-model"
+													},
+													{
+														"type": "reference",
+														"name": "PayloadFields",
+														"qualifiedName": "PayloadFields",
+														"package": "@xyo-network/payload-model"
+													},
+													{
+														"type": "reflection",
+														"declaration": {
+															"id": 419,
+															"name": "__type",
+															"kind": 65536,
+															"kindString": "Type literal",
+															"flags": {},
+															"sources": [
+																{
+																	"fileName": "node_modules/@xyo-network/payload-model/dist/types/XyoPayload.d.ts",
+																	"line": 18,
+																	"character": 17
+																}
+															]
+														}
+													}
+												]
+											},
+											{
+												"type": "intersection",
+												"types": [
+													{
+														"type": "reference",
+														"name": "SchemaFields",
+														"qualifiedName": "SchemaFields",
+														"package": "@xyo-network/payload-model"
+													},
+													{
+														"type": "reference",
+														"name": "PayloadFields",
+														"qualifiedName": "PayloadFields",
+														"package": "@xyo-network/payload-model"
+													},
+													{
+														"type": "reflection",
+														"declaration": {
+															"id": 420,
+															"name": "__type",
+															"kind": 65536,
+															"kindString": "Type literal",
+															"flags": {},
+															"sources": [
+																{
+																	"fileName": "node_modules/@xyo-network/payload-model/dist/types/XyoPayload.d.ts",
+																	"line": 18,
+																	"character": 17
+																}
+															]
+														}
+													}
+												]
+											},
+											{
+												"type": "reference",
+												"name": "PayloadFindFilter",
+												"qualifiedName": "PayloadFindFilter",
+												"package": "@xyo-network/payload-model"
+											},
+											{
+												"type": "intrinsic",
+												"name": "string"
+											}
+										],
+										"name": "Archivist",
+										"qualifiedName": "Archivist",
+										"package": "@xyo-network/archivist-interface"
+									}
+								]
+							}
 						}
 					],
 					"type": {
@@ -20779,7 +20767,7 @@
 									"type": "array",
 									"elementType": {
 										"type": "reference",
-										"id": 420,
+										"id": 414,
 										"name": "T"
 									}
 								}
@@ -20797,7 +20785,7 @@
 								"type": "optional",
 								"elementType": {
 									"type": "reference",
-									"id": 422,
+									"id": 421,
 									"name": "RefreshCallback"
 								}
 							}
@@ -20807,7 +20795,7 @@
 			]
 		},
 		{
-			"id": 425,
+			"id": 424,
 			"name": "useArchivistStates",
 			"kind": 64,
 			"kindString": "Function",
@@ -20817,19 +20805,19 @@
 					"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 					"line": 9,
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L9"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L9"
 				}
 			],
 			"signatures": [
 				{
-					"id": 426,
+					"id": 425,
 					"name": "useArchivistStates",
 					"kind": 4096,
 					"kindString": "Call signature",
 					"flags": {},
 					"typeParameter": [
 						{
-							"id": 429,
+							"id": 428,
 							"name": "T",
 							"kind": 131072,
 							"kindString": "Type parameter",
@@ -20852,7 +20840,7 @@
 									{
 										"type": "reflection",
 										"declaration": {
-											"id": 427,
+											"id": 426,
 											"name": "__type",
 											"kind": 65536,
 											"kindString": "Type literal",
@@ -20886,7 +20874,7 @@
 									{
 										"type": "reflection",
 										"declaration": {
-											"id": 428,
+											"id": 427,
 											"name": "__type",
 											"kind": 65536,
 											"kindString": "Type literal",
@@ -20907,14 +20895,14 @@
 					"type": {
 						"type": "reflection",
 						"declaration": {
-							"id": 430,
+							"id": 429,
 							"name": "__type",
 							"kind": 65536,
 							"kindString": "Type literal",
 							"flags": {},
 							"children": [
 								{
-									"id": 431,
+									"id": 430,
 									"name": "archivist",
 									"kind": 1024,
 									"kindString": "Property",
@@ -20924,7 +20912,7 @@
 											"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 											"line": 24,
 											"character": 11,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
 										}
 									],
 									"type": {
@@ -20944,7 +20932,7 @@
 									}
 								},
 								{
-									"id": 432,
+									"id": 431,
 									"name": "error",
 									"kind": 1024,
 									"kindString": "Property",
@@ -20954,7 +20942,7 @@
 											"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 											"line": 24,
 											"character": 22,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
 										}
 									],
 									"type": {
@@ -20974,7 +20962,7 @@
 									}
 								},
 								{
-									"id": 433,
+									"id": 432,
 									"name": "payloads",
 									"kind": 1024,
 									"kindString": "Property",
@@ -20984,7 +20972,7 @@
 											"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 											"line": 24,
 											"character": 29,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
 										}
 									],
 									"type": {
@@ -20998,7 +20986,7 @@
 												"type": "array",
 												"elementType": {
 													"type": "reference",
-													"id": 429,
+													"id": 428,
 													"name": "T"
 												}
 											}
@@ -21006,7 +20994,7 @@
 									}
 								},
 								{
-									"id": 434,
+									"id": 433,
 									"name": "refresh",
 									"kind": 1024,
 									"kindString": "Property",
@@ -21016,13 +21004,13 @@
 											"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 											"line": 24,
 											"character": 39,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
 										}
 									],
 									"type": {
 										"type": "reflection",
 										"declaration": {
-											"id": 435,
+											"id": 434,
 											"name": "__type",
 											"kind": 65536,
 											"kindString": "Type literal",
@@ -21032,12 +21020,12 @@
 													"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 													"line": 14,
 													"character": 26,
-													"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L14"
+													"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L14"
 												}
 											],
 											"signatures": [
 												{
-													"id": 436,
+													"id": 435,
 													"name": "__type",
 													"kind": 4096,
 													"kindString": "Call signature",
@@ -21053,7 +21041,7 @@
 									"defaultValue": "refreshPayloads"
 								},
 								{
-									"id": 437,
+									"id": 436,
 									"name": "refreshCount",
 									"kind": 1024,
 									"kindString": "Property",
@@ -21063,7 +21051,7 @@
 											"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 											"line": 24,
 											"character": 65,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
 										}
 									],
 									"type": {
@@ -21072,7 +21060,7 @@
 									}
 								},
 								{
-									"id": 438,
+									"id": 437,
 									"name": "setError",
 									"kind": 1024,
 									"kindString": "Property",
@@ -21082,7 +21070,7 @@
 											"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 											"line": 24,
 											"character": 79,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
 										}
 									],
 									"type": {
@@ -21118,7 +21106,7 @@
 									}
 								},
 								{
-									"id": 439,
+									"id": 438,
 									"name": "setPayloads",
 									"kind": 1024,
 									"kindString": "Property",
@@ -21128,7 +21116,7 @@
 											"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 											"line": 24,
 											"character": 89,
-											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
+											"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
 										}
 									],
 									"type": {
@@ -21148,7 +21136,7 @@
 																"type": "array",
 																"elementType": {
 																	"type": "reference",
-																	"id": 429,
+																	"id": 428,
 																	"name": "T"
 																}
 															}
@@ -21170,13 +21158,13 @@
 								{
 									"title": "Properties",
 									"children": [
+										430,
 										431,
 										432,
 										433,
-										434,
+										436,
 										437,
-										438,
-										439
+										438
 									]
 								}
 							],
@@ -21185,7 +21173,7 @@
 									"fileName": "packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx",
 									"line": 24,
 									"character": 9,
-									"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
+									"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/hooks/useArchivistStates.tsx#L24"
 								}
 							]
 						}
@@ -21204,7 +21192,7 @@
 		{
 			"title": "Type Aliases",
 			"children": [
-				422
+				421
 			]
 		},
 		{
@@ -21215,9 +21203,9 @@
 				14,
 				20,
 				400,
-				411,
-				416,
-				425
+				405,
+				410,
+				424
 			]
 		}
 	],
@@ -21226,7 +21214,7 @@
 			"fileName": "packages/modules/packages/archivist/src/index.ts",
 			"line": 1,
 			"character": 0,
-			"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/bc01938dfbf/packages/modules/packages/archivist/src/index.ts#L1"
+			"url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/f3152d8417a/packages/modules/packages/archivist/src/index.ts#L1"
 		}
 	]
 }

package/dist/esm/hooks/useArchivist.js

@@ -1,4 +1,4 @@
 import { ArchivistWrapper } from '@xyo-network/archivist';
-import { createUseModuleHook, useNode } from '@xyo-network/react-node';
-export const useArchivist = createUseModuleHook(ArchivistWrapper.wrap, useNode);
+import { WrappedModuleHookFactory } from '@xyo-network/react-node';
+export const useArchivist = WrappedModuleHookFactory(ArchivistWrapper, 'useArchivist');
 //# sourceMappingURL=useArchivist.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivist.js","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAmB,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC1E,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AAEtE,MAAM,CAAC,MAAM,YAAY,GAAG,mBAAmB,CAAoC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA"}
+{"version":3,"file":"useArchivist.js","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAElE,MAAM,CAAC,MAAM,YAAY,GAAG,wBAAwB,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAA"}

package/dist/esm/hooks/useArchivistGet.js

@@ -1,16 +1,24 @@
 import { useAsyncEffect } from '@xylabs/react-shared';
-import { useDataState } from '@xyo-network/react-shared';
-import { useArchivistStates } from './useArchivistStates';
-export const useArchivistGet = (hashes) => {
-    const [savedHashes, setSavedHashes] = useDataState(hashes);
-    setSavedHashes(hashes);
-    const { archivist, error, payloads, refresh, setError, setPayloads, refreshCount } = useArchivistStates();
+import { useCallback, useState } from 'react';
+import { useArchivist } from './useArchivist';
+export const useArchivistGet = (hashes, archivist) => {
+    const requestedArchivistNameOrAddress = typeof archivist === 'string' ? archivist : undefined;
+    const passedArchivist = typeof archivist === 'object' ? archivist : undefined;
+    const [payloads, setPayloads] = useState();
+    const [foundArchivist, foundArchivistError] = useArchivist(requestedArchivistNameOrAddress);
+    const [error, setError] = useState();
+    const [refresh, setRefresh] = useState(0);
+    const onRefresh = useCallback(() => {
+        setRefresh(refresh + 1);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
         try {
-            if (archivist && savedHashes) {
-                const result = (await archivist.get(savedHashes ?? [])) ?? [];
+            const archivistToUse = passedArchivist ?? foundArchivist;
+            if (archivistToUse && hashes) {
+                const result = (await archivistToUse.get(hashes ?? [])) ?? [];
                 if (mounted()) {
                     setError(undefined);
                     setPayloads(result);
@@ -20,7 +28,7 @@ export const useArchivistGet = (hashes) => {
         catch (ex) {
             setError(ex);
         }
-    }, [archivist, savedHashes, refreshCount, setError, setPayloads]);
-    return [payloads, error, refresh];
+    }, [passedArchivist, foundArchivist, hashes, refresh, setError, setPayloads]);
+    return [payloads, error ?? foundArchivistError, onRefresh];
 };
 //# sourceMappingURL=useArchivistGet.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAmB,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAE1E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAoC,MAAiB,EAAoC,EAAE;IACxH,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAA;IAC1D,cAAc,CAAC,MAAM,CAAC,CAAA;IAEtB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,kBAAkB,EAAK,CAAA;IAE5G,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,IAAI,WAAW,EAAE;gBAC5B,MAAM,MAAM,GAAG,CAAC,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;gBAC7D,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAa,CAAC,CAAA;iBAC3B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC9D,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AACnC,CAAC,CAAA"}
+{"version":3,"file":"useArchivistGet.js","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAG7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAAiB,EACjB,SAA8B,EACI,EAAE;IACpC,MAAM,+BAA+B,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7F,MAAM,eAAe,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7E,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAO,CAAA;IAC/C,MAAM,CAAC,cAAc,EAAE,mBAAmB,CAAC,GAAG,YAAY,CAAC,+BAA+B,CAAC,CAAA;IAC3F,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAEzC,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;QACjC,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;QACvB,uDAAuD;IACzD,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,MAAM,cAAc,GAAG,eAAe,IAAI,cAAc,CAAA;YACxD,IAAI,cAAc,IAAI,MAAM,EAAE;gBAC5B,MAAM,MAAM,GAAI,CAAC,MAAM,cAAc,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAS,IAAI,EAAE,CAAA;gBACtE,IAAI,OAAO,EAAE,EAAE;oBACb,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,WAAW,CAAC,MAAa,CAAC,CAAA;iBAC3B;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EACD,CAAC,eAAe,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAC1E,CAAA;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAI,mBAAmB,EAAE,SAAS,CAAC,CAAA;AAC5D,CAAC,CAAA"}

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

@@ -1,8 +1,3 @@
-import { ArchivistModule, ArchivistWrapper } from '@xyo-network/archivist';
-export declare const useArchivist: {
-    (name?: string | undefined): [ArchivistModule | undefined, Error | undefined];
-    (name: string | undefined, wrap: true | import("@xyo-network/account").Account): [ArchivistWrapper | undefined, Error | undefined];
-    (address: string): [ArchivistModule | undefined, Error | undefined];
-    (address: string, wrap: true | import("@xyo-network/account").Account): [ArchivistWrapper | undefined, Error | undefined];
-};
+import { ArchivistWrapper } from '@xyo-network/archivist';
+export declare const useArchivist: (nameOrAddress?: string | undefined, account?: import("@xyo-network/account-model").AccountInstance | undefined, spinCheck?: boolean | undefined) => [ArchivistWrapper | undefined, Error | undefined];
 //# sourceMappingURL=useArchivist.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivist.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAG1E,eAAO,MAAM,YAAY;;;;;CAAyF,CAAA"}
+{"version":3,"file":"useArchivist.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivist.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,eAAO,MAAM,YAAY,wMAA6D,CAAA"}

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

@@ -1,7 +1,8 @@
+import { Archivist } from '@xyo-network/archivist';
 import { RefreshCallback } from './useArchivistStates';
 export declare const useArchivistGet: <T extends import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     schema: string;
 } = import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
     schema: string;
-}>(hashes?: string[]) => [(T[] | undefined)?, (Error | undefined)?, (RefreshCallback | undefined)?];
+}>(hashes?: string[], archivist?: Archivist | string) => [(T[] | undefined)?, (Error | undefined)?, (RefreshCallback | undefined)?];
 //# sourceMappingURL=useArchivistGet.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useArchivistGet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAsB,MAAM,sBAAsB,CAAA;AAE1E,eAAO,MAAM,eAAe;;;;YAAgD,MAAM,EAAE,+EAwBnF,CAAA"}
+{"version":3,"file":"useArchivistGet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useArchivistGet.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAKlD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,eAAO,MAAM,eAAe;;;;YACjB,MAAM,EAAE,cACL,SAAS,GAAG,MAAM,+EAiC/B,CAAA"}

package/package.json

@@ -10,14 +10,14 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/issues"
   },
   "dependencies": {
-    "@xylabs/react-button": "^2.16.8",
-    "@xylabs/react-flexbox": "^2.16.8",
-    "@xylabs/react-shared": "^2.16.8",
-    "@xyo-network/node": "^2.51.1",
-    "@xyo-network/react-module": "^2.45.0-rc.3",
-    "@xyo-network/react-node": "^2.45.0-rc.3",
-    "@xyo-network/react-shared": "^2.45.0-rc.3",
-    "lodash": "^4.17.21"
+    "@xylabs/eth-address": "^2.7.4",
+    "@xylabs/react-button": "^2.16.11",
+    "@xylabs/react-crypto": "^2.16.11",
+    "@xylabs/react-flexbox": "^2.16.11",
+    "@xylabs/react-shared": "^2.16.11",
+    "@xyo-network/react-module": "^2.45.0-rc.31",
+    "@xyo-network/react-node": "^2.45.0-rc.31",
+    "@xyo-network/react-shared": "^2.45.0-rc.31"
   },
   "peerDependencies": {
     "@mui/icons-material": "^5",
@@ -32,14 +32,13 @@
   "description": "Common React library for all XYO projects that use React",
   "devDependencies": {
     "@storybook/react": "^6.5.16",
-    "@types/lodash": "^4.14.191",
-    "@xylabs/ts-scripts-yarn3": "^2.16.0",
-    "@xylabs/tsconfig-react": "^2.16.0",
-    "@xyo-network/archivist": "^2.51.1",
-    "@xyo-network/archivist-wrapper": "^2.51.1",
-    "@xyo-network/module": "^2.51.1",
-    "@xyo-network/payload-model": "^2.51.1",
-    "@xyo-network/react-storybook": "^2.45.0-rc.3",
+    "@xylabs/ts-scripts-yarn3": "^2.16.1",
+    "@xylabs/tsconfig-react": "^2.16.1",
+    "@xyo-network/archivist": "^2.51.7",
+    "@xyo-network/archivist-wrapper": "^2.51.7",
+    "@xyo-network/module": "^2.51.7",
+    "@xyo-network/payload-model": "^2.51.7",
+    "@xyo-network/react-storybook": "^2.45.0-rc.31",
     "require-from-string": "^2.0.2",
     "typescript": "^4.9.5"
   },
@@ -85,6 +84,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.45.0-rc.3",
+  "version": "2.45.0-rc.31",
   "stableVersion": "2.44.1"
 }

package/src/hooks/useArchivist.tsx

@@ -1,4 +1,4 @@
-import { ArchivistModule, ArchivistWrapper } from '@xyo-network/archivist'
-import { createUseModuleHook, useNode } from '@xyo-network/react-node'
+import { ArchivistWrapper } from '@xyo-network/archivist'
+import { WrappedModuleHookFactory } from '@xyo-network/react-node'
 
-export const useArchivist = createUseModuleHook<ArchivistModule, ArchivistWrapper>(ArchivistWrapper.wrap, useNode)
+export const useArchivist = WrappedModuleHookFactory(ArchivistWrapper, 'useArchivist')

package/src/hooks/useArchivistGet.tsx

@@ -1,21 +1,34 @@
 import { useAsyncEffect } from '@xylabs/react-shared'
+import { Archivist } from '@xyo-network/archivist'
 import { XyoPayload } from '@xyo-network/payload-model'
-import { useDataState } from '@xyo-network/react-shared'
+import { useCallback, useState } from 'react'
 
-import { RefreshCallback, useArchivistStates } from './useArchivistStates'
+import { useArchivist } from './useArchivist'
+import { RefreshCallback } from './useArchivistStates'
 
-export const useArchivistGet = <T extends XyoPayload = XyoPayload>(hashes?: string[]): [T[]?, Error?, RefreshCallback?] => {
-  const [savedHashes, setSavedHashes] = useDataState(hashes)
-  setSavedHashes(hashes)
+export const useArchivistGet = <T extends XyoPayload = XyoPayload>(
+  hashes?: string[],
+  archivist?: Archivist | string,
+): [T[]?, Error?, RefreshCallback?] => {
+  const requestedArchivistNameOrAddress = typeof archivist === 'string' ? archivist : undefined
+  const passedArchivist = typeof archivist === 'object' ? archivist : undefined
+  const [payloads, setPayloads] = useState<T[]>()
+  const [foundArchivist, foundArchivistError] = useArchivist(requestedArchivistNameOrAddress)
+  const [error, setError] = useState<Error>()
+  const [refresh, setRefresh] = useState(0)
 
-  const { archivist, error, payloads, refresh, setError, setPayloads, refreshCount } = useArchivistStates<T>()
+  const onRefresh = useCallback(() => {
+    setRefresh(refresh + 1)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
 
   useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
       try {
-        if (archivist && savedHashes) {
-          const result = (await archivist.get(savedHashes ?? [])) ?? []
+        const archivistToUse = passedArchivist ?? foundArchivist
+        if (archivistToUse && hashes) {
+          const result = ((await archivistToUse.get(hashes ?? [])) as T[]) ?? []
           if (mounted()) {
             setError(undefined)
             setPayloads(result as T[])
@@ -25,7 +38,7 @@ export const useArchivistGet = <T extends XyoPayload = XyoPayload>(hashes?: stri
         setError(ex as Error)
       }
     },
-    [archivist, savedHashes, refreshCount, setError, setPayloads],
+    [passedArchivist, foundArchivist, hashes, refresh, setError, setPayloads],
   )
-  return [payloads, error, refresh]
+  return [payloads, error ?? foundArchivistError, onRefresh]
 }