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

updo

.vscode/settings.json

@@ -73,7 +73,6 @@
     "edns",
     "Ellipsize",
     "Etherchain",
-    "ethersproject",
     "filepond",
     "flexbox",
     "geotiff",

.yarnrc.yml

@@ -7,6 +7,8 @@ changesetIgnorePatterns:
   - "**/.*"
   - .**/*
 
+compressionLevel: mixed
+
 enableGlobalCache: true
 
 enableInlineBuilds: true
@@ -44,13 +46,7 @@ packageExtensions:
       "@babel/plugin-transform-react-jsx": "*"
 
 plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
-    spec: "@yarnpkg/plugin-version"
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
     spec: "https://mskelton.dev/yarn-outdated/v3"
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-3.6.1.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs

package.json

@@ -57,19 +57,17 @@
     "@storybook/react-webpack5": "^7.5.3",
     "@storybook/testing-library": "^0.2.2",
     "@storybook/theming": "^7.5.3",
-    "@typescript-eslint/eslint-plugin": "^6.11.0",
-    "@typescript-eslint/parser": "^6.11.0",
-    "@xylabs/eslint-config": "^3.2.2",
-    "@xylabs/eslint-config-react": "^3.2.2",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
+    "@xylabs/eslint-config": "^3.2.8",
+    "@xylabs/eslint-config-react": "^3.2.8",
     "@xylabs/pixel": "^1.4.14",
     "@xylabs/react-button": "^3.0.21",
     "@xylabs/react-flexbox": "^3.0.21",
     "@xylabs/react-pixel": "^3.0.21",
     "@xylabs/react-shared": "^3.0.21",
-    "@xylabs/ts-scripts-yarn3": "^3.2.2",
-    "@xylabs/tsconfig-react": "^3.2.2",
-    "@xyo-network/react-app-settings": "workspace:~",
-    "@xyo-network/react-theme": "workspace:~",
+    "@xylabs/ts-scripts-yarn3": "^3.2.8",
+    "@xylabs/tsconfig-react": "^3.2.8",
     "chromatic": "^7.6.0",
     "eslint": "^8.54.0",
     "eslint-import-resolver-typescript": "^3.6.1",
@@ -149,6 +147,6 @@
   "sideEffects": false,
   "types": "dist/browser/index.d.ts",
   "version": "2.65.7",
-  "packageManager": "yarn@3.6.1",
+  "packageManager": "yarn@4.0.2",
   "type": "module"
 }

packages/modules/package.json

@@ -18,49 +18,20 @@
     "@xyo-network/react-witness": "workspace:~"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^3.2.2",
-    "@xylabs/tsconfig-react": "^3.2.2",
+    "@xylabs/ts-scripts-yarn3": "^3.2.8",
+    "@xylabs/tsconfig-react": "^3.2.8",
     "typescript": "^5.2.2"
   },
   "peerDependencies": {
     "@mui/icons-material": "^5",
     "@mui/material": "^5",
     "@mui/styles": "^5",
-    "@uniswap/sdk": "^3",
-    "@uniswap/sdk-core": "^3",
-    "@uniswap/v3-sdk": "^3",
     "geojson": "^0.5",
     "mapbox-gl": "^2",
     "react": "^18",
     "react-dom": "^18",
     "react-icons": "^4"
   },
-  "peerDependenciesMeta": {
-    "@uniswap/sdk": {
-      "optional": true
-    },
-    "@uniswap/sdk-core": {
-      "optional": true
-    },
-    "@uniswap/v3-sdk": {
-      "optional": true
-    },
-    "@xyo-network/coingecko-crypto-market-payload-plugin": {
-      "optional": true
-    },
-    "@xyo-network/crypto-asset-payload-plugin": {
-      "optional": true
-    },
-    "@xyo-network/typechain": {
-      "optional": true
-    },
-    "@xyo-network/uniswap-crypto-market-payload-plugin": {
-      "optional": true
-    },
-    "@xyo-network/uniswap-typechain": {
-      "optional": true
-    }
-  },
   "description": "Common React library for all XYO projects that use React",
   "docs": "dist/docs.json",
   "exports": {

packages/modules/packages/archivist/package.json

@@ -10,14 +10,13 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/issues"
   },
   "dependencies": {
-    "@xylabs/crypto": "^2.13.9",
     "@xylabs/react-button": "^3.0.21",
     "@xylabs/react-flexbox": "^3.0.21",
     "@xylabs/react-promise": "^3.0.21",
-    "@xyo-network/archivist-model": "^2.80.0",
-    "@xyo-network/boundwitness-model": "^2.80.0",
-    "@xyo-network/boundwitness-wrapper": "^2.80.0",
-    "@xyo-network/module-model": "^2.80.0",
+    "@xyo-network/archivist-model": "^2.81.6",
+    "@xyo-network/boundwitness-model": "^2.81.6",
+    "@xyo-network/boundwitness-wrapper": "^2.81.6",
+    "@xyo-network/module-model": "^2.81.6",
     "@xyo-network/react-module": "workspace:~",
     "@xyo-network/react-node": "workspace:~",
     "@xyo-network/react-wallet": "workspace:~",
@@ -34,15 +33,14 @@
   "devDependencies": {
     "@storybook/react": "^7.5.3",
     "@xylabs/react-async-effect": "^3.0.21",
-    "@xylabs/ts-scripts-yarn3": "^3.2.2",
-    "@xylabs/tsconfig-react": "^3.2.2",
-    "@xyo-network/account": "^2.80.0",
-    "@xyo-network/archivist": "^2.80.0",
-    "@xyo-network/boundwitness-builder": "^2.80.0",
-    "@xyo-network/module": "^2.80.0",
-    "@xyo-network/node-memory": "^2.80.0",
-    "@xyo-network/payload-model": "^2.80.0",
-    "@xyo-network/react-storybook": "workspace:~",
+    "@xylabs/ts-scripts-yarn3": "^3.2.8",
+    "@xylabs/tsconfig-react": "^3.2.8",
+    "@xyo-network/account": "^2.81.6",
+    "@xyo-network/archivist": "^2.81.6",
+    "@xyo-network/boundwitness-builder": "^2.81.6",
+    "@xyo-network/module": "^2.81.6",
+    "@xyo-network/node-memory": "^2.81.6",
+    "@xyo-network/payload-model": "^2.81.6",
     "typescript": "^5.2.2"
   },
   "docs": "dist/docs.json",

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.80.0",
-    "@xyo-network/module-model": "^2.80.0",
+    "@xyo-network/diviner": "^2.81.6",
+    "@xyo-network/module-model": "^2.81.6",
     "@xyo-network/react-node": "workspace:~"
   },
   "peerDependencies": {
@@ -23,8 +23,8 @@
   },
   "description": "Common React library for all XYO projects that use React",
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^3.2.2",
-    "@xylabs/tsconfig-react": "^3.2.2",
+    "@xylabs/ts-scripts-yarn3": "^3.2.8",
+    "@xylabs/tsconfig-react": "^3.2.8",
     "typescript": "^5.2.2"
   },
   "docs": "dist/docs.json",

packages/modules/packages/module/package.json

@@ -15,27 +15,19 @@
     "@xylabs/react-crypto": "^3.0.21",
     "@xylabs/react-flexbox": "^3.0.21",
     "@xylabs/react-promise": "^3.0.21",
-    "@xyo-network/diviner": "^2.80.0",
-    "@xyo-network/module": "^2.80.0",
+    "@xyo-network/diviner": "^2.81.6",
+    "@xyo-network/module": "^2.81.6",
     "@xyo-network/react-shared": "workspace:~"
   },
   "devDependencies": {
-    "@ethersproject/address": "^5.7.0",
-    "@ethersproject/contracts": "^5.7.0",
-    "@ethersproject/networks": "^5.7.1",
-    "@ethersproject/providers": "^5.7.2",
-    "@ethersproject/solidity": "^5.7.0",
     "@storybook/react": "^7.5.3",
-    "@uniswap/sdk": "^3.0.3",
-    "@uniswap/sdk-core": "^4.0.9",
-    "@uniswap/v3-sdk": "^3.10.0",
     "@xylabs/react-async-effect": "^3.0.21",
-    "@xylabs/ts-scripts-yarn3": "^3.2.2",
-    "@xylabs/tsconfig-react": "^3.2.2",
-    "@xyo-network/archivist": "^2.80.0",
-    "@xyo-network/crypto-asset-plugin": "^2.80.5",
-    "@xyo-network/diviner-address-history": "^2.80.0",
-    "@xyo-network/node-memory": "^2.80.0",
+    "@xylabs/ts-scripts-yarn3": "^3.2.8",
+    "@xylabs/tsconfig-react": "^3.2.8",
+    "@xyo-network/archivist": "^2.81.6",
+    "@xyo-network/crypto-asset-plugin": "^2.81.7",
+    "@xyo-network/diviner-address-history": "^2.81.6",
+    "@xyo-network/node-memory": "^2.81.6",
     "typescript": "^5.2.2"
   },
   "peerDependencies": {

packages/modules/packages/node/package.json

@@ -14,24 +14,23 @@
     "@emotion/styled": "^11.11.0",
     "@mui/system": "^5.14.18",
     "@mui/x-tree-view": "^6.17.0",
+    "@xylabs/logger": "^2.13.9",
     "@xylabs/react-async-effect": "^3.0.21",
     "@xylabs/react-flexbox": "^3.0.21",
     "@xylabs/react-promise": "^3.0.21",
     "@xylabs/react-shared": "^3.0.21",
-    "@xyo-network/logger": "^2.80.0",
-    "@xyo-network/module": "^2.80.0",
-    "@xyo-network/module-model": "^2.80.0",
-    "@xyo-network/node-model": "^2.80.0",
+    "@xyo-network/module": "^2.81.6",
+    "@xyo-network/module-model": "^2.81.6",
+    "@xyo-network/node-model": "^2.81.6",
     "@xyo-network/react-node-context": "workspace:~",
     "@xyo-network/react-node-provider": "workspace:~"
   },
   "devDependencies": {
     "@storybook/react": "^7.5.3",
-    "@xylabs/ts-scripts-yarn3": "^3.2.2",
-    "@xylabs/tsconfig-react": "^3.2.2",
-    "@xyo-network/node-memory": "^2.80.0",
-    "@xyo-network/payload-model": "^2.80.0",
-    "@xyo-network/react-storybook": "workspace:~",
+    "@xylabs/ts-scripts-yarn3": "^3.2.8",
+    "@xylabs/tsconfig-react": "^3.2.8",
+    "@xyo-network/node-memory": "^2.81.6",
+    "@xyo-network/payload-model": "^2.81.6",
     "@xyo-network/react-wallet": "workspace:~",
     "typescript": "^5.2.2"
   },

packages/modules/packages/node/packages/context/package.json

@@ -10,13 +10,13 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/issues"
   },
   "dependencies": {
-    "@xyo-network/module-model": "^2.80.0",
-    "@xyo-network/node-model": "^2.80.0",
+    "@xyo-network/module-model": "^2.81.6",
+    "@xyo-network/node-model": "^2.81.6",
     "@xyo-network/react-shared": "workspace:~"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^3.2.2",
-    "@xylabs/tsconfig-react": "^3.2.2",
+    "@xylabs/ts-scripts-yarn3": "^3.2.8",
+    "@xylabs/tsconfig-react": "^3.2.8",
     "typescript": "^5.2.2"
   },
   "peerDependencies": {

packages/modules/packages/node/packages/provider/package.json

@@ -12,15 +12,15 @@
   "dependencies": {
     "@xylabs/react-async-effect": "^3.0.21",
     "@xylabs/react-shared": "^3.0.21",
-    "@xyo-network/module": "^2.80.0",
-    "@xyo-network/node-memory": "^2.80.0",
-    "@xyo-network/node-model": "^2.80.0",
+    "@xyo-network/module": "^2.81.6",
+    "@xyo-network/node-memory": "^2.81.6",
+    "@xyo-network/node-model": "^2.81.6",
     "@xyo-network/react-node-context": "workspace:~",
     "@xyo-network/react-shared": "workspace:~"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^3.2.2",
-    "@xylabs/tsconfig-react": "^3.2.2",
+    "@xylabs/ts-scripts-yarn3": "^3.2.8",
+    "@xylabs/tsconfig-react": "^3.2.8",
     "typescript": "^5.2.2"
   },
   "peerDependencies": {

packages/modules/packages/node/src/hooks/ModuleFromNodeConfig.ts

@@ -1,4 +1,4 @@
-import { Logger } from '@xyo-network/logger'
+import { Logger } from '@xylabs/logger'
 import { ModuleFilterOptions } from '@xyo-network/module-model'
 import { NodeInstance } from '@xyo-network/node-model'
 

packages/modules/packages/sentinal/package.json

@@ -15,30 +15,30 @@
     "@xylabs/react-flexbox": "^3.0.21",
     "@xylabs/react-promise": "^3.0.21",
     "@xylabs/react-shared": "^3.0.21",
-    "@xyo-network/account-model": "^2.80.0",
-    "@xyo-network/archivist": "^2.80.0",
-    "@xyo-network/boundwitness-model": "^2.80.0",
-    "@xyo-network/module": "^2.80.0",
-    "@xyo-network/module-model": "^2.80.0",
-    "@xyo-network/payload-model": "^2.80.0",
+    "@xyo-network/account-model": "^2.81.6",
+    "@xyo-network/archivist": "^2.81.6",
+    "@xyo-network/boundwitness-model": "^2.81.6",
+    "@xyo-network/module": "^2.81.6",
+    "@xyo-network/module-model": "^2.81.6",
+    "@xyo-network/payload-model": "^2.81.6",
     "@xyo-network/react-module": "workspace:^",
     "@xyo-network/react-node": "workspace:~",
     "@xyo-network/react-shared": "workspace:~",
     "@xyo-network/react-witness": "workspace:~",
-    "@xyo-network/sentinel": "^2.80.0",
-    "@xyo-network/sentinel-model": "^2.80.0",
-    "@xyo-network/witness": "^2.80.0",
+    "@xyo-network/sentinel": "^2.81.6",
+    "@xyo-network/sentinel-model": "^2.81.6",
+    "@xyo-network/witness": "^2.81.6",
     "react-json-view": "^1.21.3"
   },
   "devDependencies": {
-    "@ethersproject/providers": "^5.7.2",
     "@storybook/react": "^7.5.3",
-    "@xylabs/ts-scripts-yarn3": "^3.2.2",
-    "@xylabs/tsconfig-react": "^3.2.2",
-    "@xyo-network/account": "^2.80.0",
-    "@xyo-network/crypto-contract-function-read-payload-plugin": "^2.80.5",
-    "@xyo-network/crypto-contract-function-read-plugin": "^2.80.5",
-    "@xyo-network/manifest": "^2.80.0",
+    "@xylabs/ts-scripts-yarn3": "^3.2.8",
+    "@xylabs/tsconfig-react": "^3.2.8",
+    "@xyo-network/account": "^2.81.6",
+    "@xyo-network/crypto-contract-function-read-payload-plugin": "^2.81.7",
+    "@xyo-network/crypto-contract-function-read-plugin": "^2.81.7",
+    "@xyo-network/manifest": "^2.81.6",
+    "ethers": "^6.8.1",
     "typescript": "^5.2.2"
   },
   "peerDependencies": {

packages/modules/packages/sentinal/src/components/Card/Card.stories.tsx

@@ -1,4 +1,3 @@
-import { InfuraProvider } from '@ethersproject/providers'
 import { Meta, StoryFn } from '@storybook/react'
 import { FlexCol } from '@xylabs/react-flexbox'
 import { usePromise } from '@xylabs/react-promise'
@@ -8,17 +7,15 @@ import { CryptoContractDiviner, CryptoContractFunctionReadWitness } from '@xyo-n
 import { ManifestWrapper, PackageManifestPayload } from '@xyo-network/manifest'
 import { ModuleFactory, ModuleFactoryLocator } from '@xyo-network/module-model'
 import { asSentinelInstance, ReportEndEventArgs } from '@xyo-network/sentinel'
+import { InfuraProvider } from 'ethers'
 
 import { SentinelCard } from './Card'
 import NftSentinelManifest from './NftSentinel.json'
 
 const loadFromManifest = async () => {
   const mnemonic = 'later puppy sound rebuild rebuild noise ozone amazing hope broccoli crystal grief'
-  const wallet = await HDWallet.fromMnemonic(mnemonic)
-  const provider = new InfuraProvider('homestead', {
-    projectId: process.env.STORYBOOK_INFURA_PROJECT_ID,
-    projectSecret: process.env.STORYBOOK_INFURA_PROJECT_SECRET,
-  })
+  const wallet = await HDWallet.fromPhrase(mnemonic)
+  const provider = new InfuraProvider('homestead', process.env.STORYBOOK_INFURA_PROJECT_ID)
 
   const locator = new ModuleFactoryLocator()
   locator.register(CryptoContractDiviner)