Auto stash before merge of "main" and "origin/main"

evm witness update
XYOracleNetwork · Dec 23, 2023 · 8e5aece · 8e5aece
1 parent 6f7fe7a
commit 8e5aece
Show file tree

Hide file tree

Showing 217 changed files with 2,502 additions and 2,373 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -1,5 +1,5 @@
 const finalConfig = {
-  "extends": ["@xylabs", "@xylabs/react"],
+  "extends": ["@xylabs", "@xylabs/react", 'plugin:unicorn/recommended'],
   parser: '@typescript-eslint/parser',
   parserOptions: { ecmaVersion: 'latest', project: null, tsconfigRootDir: __dirname, extraFileExtensions: ['json'] },
   "root": true,
@@ -18,6 +18,19 @@ const finalConfig = {
     ".*"
   ],
   "rules": {
+    "unicorn/filename-case": ["off"],
+    "unicorn/no-nested-ternary": ["off"],
+    "unicorn/no-array-callback-reference": ["off"],
+    "unicorn/prevent-abbreviations": ["off"],
+    "unicorn/no-null": ["off"],
+    "unicorn/number-literal-case": ["off"],
+    "unicorn/no-await-expression-member": ["off"],
+    "unicorn/new-for-builtins": ["off"],
+    "unicorn/catch-error-name": ["off"],
+    "unicorn/prefer-top-level-await": ["off"],
+    "unicorn/consistent-function-scoping": ["off"],
+    "unicorn/prefer-module": ["off"],
+    "import/no-default-export": ["off"],
     "@typescript-eslint/explicit-member-accessibility": ["warn", { "accessibility": "no-public" }],
     "no-restricted-imports": [
       "warn",

diff --git a/package.json b/package.json
@@ -75,6 +75,7 @@
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-deprecation": "^2.0.0",
     "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-unicorn": "^50.0.1",
     "jest": "^29.7.0",
     "jest-extended": "^4.0.2",
     "react": "^18.2.0",

diff --git a/packages/modules/packages/archivist/package.json b/packages/modules/packages/archivist/package.json
@@ -13,12 +13,12 @@
     "@xylabs/react-button": "^3.0.35",
     "@xylabs/react-flexbox": "^3.0.35",
     "@xylabs/react-promise": "^3.0.35",
-    "@xyo-network/archivist-model": "^2.85.0",
-    "@xyo-network/boundwitness-model": "^2.85.0",
-    "@xyo-network/boundwitness-wrapper": "^2.85.0",
-    "@xyo-network/module-events": "^2.85.0",
-    "@xyo-network/module-model": "^2.85.0",
-    "@xyo-network/module-wrapper": "^2.85.0",
+    "@xyo-network/archivist-model": "^2.85.4",
+    "@xyo-network/boundwitness-model": "^2.85.4",
+    "@xyo-network/boundwitness-wrapper": "^2.85.4",
+    "@xyo-network/module-events": "^2.85.4",
+    "@xyo-network/module-model": "^2.85.4",
+    "@xyo-network/module-wrapper": "^2.85.4",
     "@xyo-network/react-module": "workspace:~",
     "@xyo-network/react-node": "workspace:~",
     "@xyo-network/react-wallet": "workspace:~",
@@ -37,11 +37,11 @@
     "@xylabs/react-async-effect": "^3.0.35",
     "@xylabs/ts-scripts-yarn3": "^3.2.25",
     "@xylabs/tsconfig-react": "^3.2.25",
-    "@xyo-network/account": "^2.85.0",
-    "@xyo-network/archivist": "^2.85.0",
-    "@xyo-network/boundwitness-builder": "^2.85.0",
-    "@xyo-network/node-memory": "^2.85.0",
-    "@xyo-network/payload-model": "^2.85.0",
+    "@xyo-network/account": "^2.85.4",
+    "@xyo-network/archivist": "^2.85.4",
+    "@xyo-network/boundwitness-builder": "^2.85.4",
+    "@xyo-network/node-memory": "^2.85.4",
+    "@xyo-network/payload-model": "^2.85.4",
     "typescript": "^5.3.3"
   },
   "docs": "dist/docs.json",

diff --git a/packages/modules/packages/archivist/src/components/Card/CardHeader.tsx b/packages/modules/packages/archivist/src/components/Card/CardHeader.tsx
@@ -7,10 +7,12 @@ import { MemoryArchivistsStats } from './components'
 
 const ArchivistStats = (archivist?: ArchivistInstance) => {
   switch (archivist?.config.schema) {
-    case MemoryArchivistConfigSchema:
+    case MemoryArchivistConfigSchema: {
       return <MemoryArchivistsStats archivist={archivist} />
-    default:
+    }
+    default: {
       return <></>
+    }
   }
 }
 

diff --git a/packages/modules/packages/archivist/src/components/Card/components/Stats/ArchivistStats.tsx b/packages/modules/packages/archivist/src/components/Card/components/Stats/ArchivistStats.tsx
@@ -30,14 +30,14 @@ export const ArchivistStats: React.FC<ArchivistStatsProps> = ({ addresses = {},
           </Badge>
         </Tooltip>
       ) : null}
-      {Object.entries(schemas).length ? (
+      {Object.entries(schemas).length > 0 ? (
         <Tooltip title="Schemas">
           <Badge badgeContent={Object.entries(schemas).length} color="primary">
             <BsFileEarmarkCode size={20} />
           </Badge>
         </Tooltip>
       ) : null}
-      {Object.entries(addresses).length ? (
+      {Object.entries(addresses).length > 0 ? (
         <Tooltip title="Addresses">
           <Badge badgeContent={Object.entries(addresses).length} color="primary">
             <VscOrganization size={20} />

diff --git a/.../modules/packages/archivist/src/components/Card/components/Stats/MemoryArchivistStats.tsx b/.../modules/packages/archivist/src/components/Card/components/Stats/MemoryArchivistStats.tsx
@@ -35,7 +35,9 @@ export const MemoryArchivistsStats: React.FC<MemoryArchivistStatsProps> = ({ arc
       listeners.push(clearListener)
     }
 
-    return () => listeners.forEach((listener) => listener?.())
+    return () => {
+      for (const listener of listeners) listener?.()
+    }
   }, [archivist, getAll])
 
   useAsyncEffect(
@@ -57,9 +59,10 @@ export const MemoryArchivistsStats: React.FC<MemoryArchivistStatsProps> = ({ arc
       all?.reduce(
         (prev, payload) => {
           const w = BoundWitnessWrapper.tryParse(payload) as BoundWitnessWrapper | undefined
-          w?.addresses?.forEach((address) => {
-            prev[address] = (prev[address] ?? 0) + 1
-          })
+          if (w?.addresses)
+            for (const address of w?.addresses ?? []) {
+              prev[address] = (prev[address] ?? 0) + 1
+            }
           return prev
         },
         {} as Record<string, number>,

diff --git a/packages/modules/packages/archivist/src/hooks/node/useArchivistsFromNode.tsx b/packages/modules/packages/archivist/src/hooks/node/useArchivistsFromNode.tsx
@@ -10,17 +10,16 @@ export const useArchivistsFromNode = (
   if (error) {
     return [null, error]
   }
-  if (modules) {
-    return [
-      modules.reduce<ArchivistInstance[]>((prev, module) => {
-        if (isArchivistInstance(module)) {
-          prev.push(module)
-        }
-        return prev
-      }, []),
-      undefined,
-    ]
-  } else {
-    return [modules, error]
-  }
+  return modules
+    ? [
+        // eslint-disable-next-line unicorn/no-array-reduce
+        modules.reduce<ArchivistInstance[]>((prev, module) => {
+          if (isArchivistInstance(module)) {
+            prev.push(module)
+          }
+          return prev
+        }, []),
+        undefined,
+      ]
+    : [modules, error]
 }
diff --git a/packages/modules/packages/diviner/package.json b/packages/modules/packages/diviner/package.json
@@ -10,8 +10,8 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/issues"
   },
   "dependencies": {
-    "@xyo-network/diviner": "^2.85.0",
-    "@xyo-network/module-model": "^2.85.0",
+    "@xyo-network/diviner": "^2.85.4",
+    "@xyo-network/module-model": "^2.85.4",
     "@xyo-network/react-node": "workspace:~"
   },
   "peerDependencies": {

diff --git a/packages/modules/packages/diviner/src/hooks/node/useDivinersFromNode.tsx b/packages/modules/packages/diviner/src/hooks/node/useDivinersFromNode.tsx
@@ -10,17 +10,16 @@ export const useDivinersFromNode = (
   if (error) {
     return [null, error]
   }
-  if (modules) {
-    return [
-      modules.reduce<DivinerInstance[]>((prev, module) => {
-        if (isDivinerInstance(module)) {
-          prev.push(module)
-        }
-        return prev
-      }, []),
-      undefined,
-    ]
-  } else {
-    return [modules, error]
-  }
+  return modules
+    ? [
+        // eslint-disable-next-line unicorn/no-array-reduce
+        modules.reduce<DivinerInstance[]>((prev, module) => {
+          if (isDivinerInstance(module)) {
+            prev.push(module)
+          }
+          return prev
+        }, []),
+        undefined,
+      ]
+    : [modules, error]
 }
diff --git a/packages/modules/packages/module/package.json b/packages/modules/packages/module/package.json
@@ -10,24 +10,24 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/issues"
   },
   "dependencies": {
-    "@xylabs/eth-address": "^2.13.20",
+    "@xylabs/eth-address": "^2.13.22",
     "@xylabs/react-button": "^3.0.35",
     "@xylabs/react-crypto": "^3.0.35",
     "@xylabs/react-flexbox": "^3.0.35",
     "@xylabs/react-promise": "^3.0.35",
-    "@xyo-network/diviner": "^2.85.0",
-    "@xyo-network/module-model": "^2.85.0",
+    "@xyo-network/diviner": "^2.85.4",
+    "@xyo-network/module-model": "^2.85.4",
     "@xyo-network/react-shared": "workspace:~"
   },
   "devDependencies": {
     "@storybook/react": "^7.6.6",
     "@xylabs/react-async-effect": "^3.0.35",
     "@xylabs/ts-scripts-yarn3": "^3.2.25",
     "@xylabs/tsconfig-react": "^3.2.25",
-    "@xyo-network/archivist": "^2.85.0",
-    "@xyo-network/crypto-asset-plugin": "^2.85.0",
-    "@xyo-network/diviner-address-history": "^2.85.0",
-    "@xyo-network/node-memory": "^2.85.0",
+    "@xyo-network/archivist": "^2.85.4",
+    "@xyo-network/crypto-asset-plugin": "^2.85.1",
+    "@xyo-network/diviner-address-history": "^2.85.4",
+    "@xyo-network/node-memory": "^2.85.4",
     "typescript": "^5.3.3"
   },
   "peerDependencies": {

diff --git a/packages/modules/packages/node/package.json b/packages/modules/packages/node/package.json
@@ -14,23 +14,23 @@
     "@emotion/styled": "^11.11.0",
     "@mui/system": "^5.15.1",
     "@mui/x-tree-view": "^6.17.0",
-    "@xylabs/logger": "^2.13.20",
+    "@xylabs/logger": "^2.13.22",
     "@xylabs/react-async-effect": "^3.0.35",
     "@xylabs/react-flexbox": "^3.0.35",
     "@xylabs/react-promise": "^3.0.35",
     "@xylabs/react-shared": "^3.0.35",
-    "@xyo-network/module-abstract": "^2.85.0",
-    "@xyo-network/module-model": "^2.85.0",
-    "@xyo-network/node-model": "^2.85.0",
+    "@xyo-network/module-abstract": "^2.85.4",
+    "@xyo-network/module-model": "^2.85.4",
+    "@xyo-network/node-model": "^2.85.4",
     "@xyo-network/react-node-context": "workspace:~",
     "@xyo-network/react-node-provider": "workspace:~"
   },
   "devDependencies": {
     "@storybook/react": "^7.6.6",
     "@xylabs/ts-scripts-yarn3": "^3.2.25",
     "@xylabs/tsconfig-react": "^3.2.25",
-    "@xyo-network/node-memory": "^2.85.0",
-    "@xyo-network/payload-model": "^2.85.0",
+    "@xyo-network/node-memory": "^2.85.4",
+    "@xyo-network/payload-model": "^2.85.4",
     "@xyo-network/react-storybook": "workspace:~",
     "@xyo-network/react-wallet": "workspace:~",
     "typescript": "^5.3.3"

diff --git a/packages/modules/packages/node/packages/context/package.json b/packages/modules/packages/node/packages/context/package.json
@@ -10,8 +10,8 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/issues"
   },
   "dependencies": {
-    "@xyo-network/module-model": "^2.85.0",
-    "@xyo-network/node-model": "^2.85.0",
+    "@xyo-network/module-model": "^2.85.4",
+    "@xyo-network/node-model": "^2.85.4",
     "@xyo-network/react-shared": "workspace:~"
   },
   "devDependencies": {

diff --git a/packages/modules/packages/node/packages/provider/package.json b/packages/modules/packages/node/packages/provider/package.json
@@ -12,9 +12,9 @@
   "dependencies": {
     "@xylabs/react-async-effect": "^3.0.35",
     "@xylabs/react-shared": "^3.0.35",
-    "@xyo-network/module-model": "^2.85.0",
-    "@xyo-network/node-memory": "^2.85.0",
-    "@xyo-network/node-model": "^2.85.0",
+    "@xyo-network/module-model": "^2.85.4",
+    "@xyo-network/node-memory": "^2.85.4",
+    "@xyo-network/node-model": "^2.85.4",
     "@xyo-network/react-node-context": "workspace:~",
     "@xyo-network/react-shared": "workspace:~"
   },

diff --git a/packages/modules/packages/node/packages/provider/src/ModuleRepository/Provider.tsx b/packages/modules/packages/node/packages/provider/src/ModuleRepository/Provider.tsx
@@ -29,9 +29,9 @@ export const ModuleRepositoryProvider: React.FC<ModuleRepositoryProviderProps> =
     if (names?.length) {
       setResolvers((resolvers) => {
         if (resolvers) {
-          names.forEach((name) => {
+          for (const name of names) {
             delete resolvers[name]
-          })
+          }
           return { ...resolvers }
         }
       })

diff --git a/packages/modules/packages/node/src/components/Node.tsx b/packages/modules/packages/node/src/components/Node.tsx
@@ -10,8 +10,10 @@ export interface NodeBoxProps extends FlexBoxProps {
 
 export const NodeBox: React.FC<NodeBoxProps> = ({ variant, ...props }) => {
   switch (variant) {
+    // eslint-disable-next-line unicorn/no-useless-switch-case
     case 'description':
-    default:
+    default: {
       return <NodeDescriptionBox {...props} />
+    }
   }
 }
diff --git a/packages/modules/packages/node/src/hooks/useModuleFromNode.ts b/packages/modules/packages/node/src/hooks/useModuleFromNode.ts
@@ -39,7 +39,7 @@ export const useModuleFromNode = (
       return result
     }
     logger?.debug('Result: No Node')
-    return undefined
+    return
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [node, nameOrAddressOrInstance])
   return [result, nodeError ?? error]

diff --git a/packages/modules/packages/node/src/hooks/useModulesFromNode.ts b/packages/modules/packages/node/src/hooks/useModulesFromNode.ts
@@ -30,7 +30,7 @@ export const useModulesFromNode = (filter?: ModuleFilter, config?: ModuleFromNod
       return moduleInstances
     }
     console.log('Result: No Node')
-    return undefined
+    return
   }, [node, filter])
   return [result, nodeError ?? error]
 }
diff --git a/packages/modules/packages/node/src/hooks/useNodesFromNode.tsx b/packages/modules/packages/node/src/hooks/useNodesFromNode.tsx
@@ -9,17 +9,16 @@ export const useNodesFromNode = (filter?: ModuleFilter, config?: ModuleFromNodeC
   if (error) {
     return [null, error]
   }
-  if (modules) {
-    return [
-      modules.reduce<NodeInstance[]>((prev, module) => {
-        if (isNodeInstance(module)) {
-          prev.push(module)
-        }
-        return prev
-      }, []),
-      undefined,
-    ]
-  } else {
-    return [modules, error]
-  }
+  return modules
+    ? [
+        // eslint-disable-next-line unicorn/no-array-reduce
+        modules.reduce<NodeInstance[]>((prev, module) => {
+          if (isNodeInstance(module)) {
+            prev.push(module)
+          }
+          return prev
+        }, []),
+        undefined,
+      ]
+    : [modules, error]
 }
diff --git a/packages/modules/packages/sentinal/package.json b/packages/modules/packages/sentinal/package.json
@@ -15,28 +15,28 @@
     "@xylabs/react-flexbox": "^3.0.35",
     "@xylabs/react-promise": "^3.0.35",
     "@xylabs/react-shared": "^3.0.35",
-    "@xyo-network/account-model": "^2.85.0",
-    "@xyo-network/archivist": "^2.85.0",
-    "@xyo-network/boundwitness-model": "^2.85.0",
-    "@xyo-network/module-model": "^2.85.0",
-    "@xyo-network/payload-model": "^2.85.0",
+    "@xyo-network/account-model": "^2.85.4",
+    "@xyo-network/archivist": "^2.85.4",
+    "@xyo-network/boundwitness-model": "^2.85.4",
+    "@xyo-network/module-model": "^2.85.4",
+    "@xyo-network/payload-model": "^2.85.4",
     "@xyo-network/react-module": "workspace:^",
     "@xyo-network/react-node": "workspace:~",
     "@xyo-network/react-shared": "workspace:~",
     "@xyo-network/react-witness": "workspace:~",
-    "@xyo-network/sentinel": "^2.85.0",
-    "@xyo-network/sentinel-model": "^2.85.0",
-    "@xyo-network/witness-model": "^2.85.0",
+    "@xyo-network/sentinel": "^2.85.4",
+    "@xyo-network/sentinel-model": "^2.85.4",
+    "@xyo-network/witness-model": "^2.85.4",
     "react-json-view": "^1.21.3"
   },
   "devDependencies": {
     "@storybook/react": "^7.6.6",
     "@xylabs/ts-scripts-yarn3": "^3.2.25",
     "@xylabs/tsconfig-react": "^3.2.25",
-    "@xyo-network/account": "^2.85.0",
-    "@xyo-network/crypto-contract-function-read-payload-plugin": "^2.85.0",
-    "@xyo-network/crypto-contract-function-read-plugin": "^2.85.0",
-    "@xyo-network/manifest": "^2.85.0",
+    "@xyo-network/account": "^2.85.4",
+    "@xyo-network/crypto-contract-function-read-payload-plugin": "^2.85.1",
+    "@xyo-network/crypto-contract-function-read-plugin": "^2.85.1",
+    "@xyo-network/manifest": "^2.85.4",
     "ethers": "^6.9.1",
     "typescript": "^5.3.3"
   },