Skip to content

Commit

Permalink
updo
Browse files Browse the repository at this point in the history
  • Loading branch information
arietrouw committed May 13, 2024
1 parent 044a158 commit eabad8d
Show file tree
Hide file tree
Showing 45 changed files with 4,971 additions and 4,268 deletions.
593 changes: 297 additions & 296 deletions .yarn/releases/yarn-4.1.1.cjs → .yarn/releases/yarn-4.2.2.cjs

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions .yarn/versions/6947a3e9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
releases:
"@xyo-network/archivist-model-mongodb": patch
"@xyo-network/archivist-mongodb": patch
"@xyo-network/automation-witness-server": patch
"@xyo-network/cli": patch
"@xyo-network/clients": patch
"@xyo-network/diviner-mongodb": patch
"@xyo-network/express-node": patch
"@xyo-network/express-node-dependencies": patch
"@xyo-network/express-node-lib": patch
"@xyo-network/express-node-middleware": patch
"@xyo-network/express-node-routes": patch
"@xyo-network/express-node-server": patch
"@xyo-network/express-node-test": patch
"@xyo-network/module-abstract-mongodb": patch
"@xyo-network/module-model-mongodb": patch
"@xyo-network/module-mongodb": patch
"@xyo-network/node-app": patch
"@xyo-network/node-core-lib": patch
"@xyo-network/node-core-model": patch
"@xyo-network/node-core-modules-mongo": patch
"@xyo-network/node-core-types": patch
"@xyo-network/payload-mongodb": patch
"@xyo-network/sdk-xyo-mongo-js": patch
2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
spec: "https://mskelton.dev/yarn-outdated/v3"

yarnPath: .yarn/releases/yarn-4.1.1.cjs
yarnPath: .yarn/releases/yarn-4.2.2.cjs
2 changes: 1 addition & 1 deletion jest.config.no-mongo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const generateJestConfig = ({ esModules }: { esModules: string[] }) => {
preset: 'ts-jest/presets/default-esm',
setupFiles: ['dotenv/config'],
setupFilesAfterEnv: ['jest-sorted', 'jest-extended/all', './packages/node/packages/express/packages/test/src/setupFiles.ts'],
testRegex: '(/__tests__/.*|(\\.|/)((!perf\\.)test|spec))\\.tsx?$',
testRegex: String.raw`(/__tests__/.*|(\.|/)((!perf\.)test|spec))\.tsx?$`,
testTimeout: 200_000,
transform: {
[`(${esModulesList}).+\\.js$`]: 'babel-jest',
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
},
"description": "Primary SDK for using XYO Protocol 2.0",
"devDependencies": {
"@babel/core": "^7.24.4",
"@babel/preset-env": "^7.24.4",
"@babel/core": "^7.24.5",
"@babel/preset-env": "^7.24.5",
"@babel/preset-typescript": "^7.24.1",
"@types/jest": "^29.5.12",
"@types/supertest": "^6.0.2",
"@xylabs/eslint-config": "^3.9.1",
"@xylabs/eslint-config-base": "^3.9.1",
"@xylabs/ts-scripts-yarn3": "^3.9.1",
"@xylabs/tsconfig": "^3.9.1",
"@xylabs/tsconfig-dom-jest": "^3.9.1",
"@xylabs/tsconfig-jest": "^3.9.1",
"@xylabs/eslint-config": "^3.10.4",
"@xylabs/eslint-config-base": "^3.10.4",
"@xylabs/ts-scripts-yarn3": "^3.10.4",
"@xylabs/tsconfig": "^3.10.4",
"@xylabs/tsconfig-dom-jest": "^3.10.4",
"@xylabs/tsconfig-jest": "^3.10.4",
"babel-jest": "^29.7.0",
"dotenv": "^16.4.5",
"eslint": "^8.57.0",
Expand Down Expand Up @@ -124,7 +124,7 @@
},
"sideEffects": false,
"version": "2.88.0",
"packageManager": "yarn@4.1.1",
"packageManager": "yarn@4.2.2",
"volta": {
"node": "20.10.0",
"yarn": "1.22.19"
Expand Down
68 changes: 34 additions & 34 deletions packages/automation-witness-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,41 +41,41 @@
"author": "Arie Trouw",
"license": "LGPL-3.0-only",
"dependencies": {
"@aws-sdk/client-secrets-manager": "^3.556.0",
"@xylabs/assert": "^3.1.11",
"@xylabs/crypto": "^3.1.11",
"@aws-sdk/client-secrets-manager": "^3.574.0",
"@xylabs/assert": "^3.3.2",
"@xylabs/crypto": "^3.3.2",
"@xylabs/sdk-api-express-ecs": "^1.4.0",
"@xyo-network/account": "^2.99.0",
"@xyo-network/account-model": "^2.99.0",
"@xyo-network/api-models": "^2.99.0",
"@xyo-network/archivist-model": "^2.99.0",
"@xyo-network/blocknative-ethereum-gas-plugin": "^2.94.0",
"@xyo-network/coingecko-crypto-market-plugin": "^2.94.0",
"@xyo-network/crypto-asset-payload-plugin": "^2.94.0",
"@xyo-network/crypto-asset-plugin": "^2.94.0",
"@xyo-network/diviner-model": "^2.99.0",
"@xyo-network/etherchain-ethereum-gas-v2-plugin": "^2.94.0",
"@xyo-network/ethers-ethereum-gas-plugin": "^2.94.0",
"@xyo-network/etherscan-ethereum-gas-plugin": "^2.94.0",
"@xyo-network/gas-price-payload-plugin": "^2.94.0",
"@xyo-network/gas-price-plugin": "^2.94.0",
"@xyo-network/http-bridge": "^2.99.0",
"@xyo-network/module-model": "^2.99.0",
"@xyo-network/account": "^2.100.9",
"@xyo-network/account-model": "^2.100.9",
"@xyo-network/api-models": "^2.100.9",
"@xyo-network/archivist-model": "^2.100.9",
"@xyo-network/blocknative-ethereum-gas-plugin": "^2.94.7",
"@xyo-network/coingecko-crypto-market-plugin": "^2.94.7",
"@xyo-network/crypto-asset-payload-plugin": "^2.94.7",
"@xyo-network/crypto-asset-plugin": "^2.94.7",
"@xyo-network/diviner-model": "^2.100.9",
"@xyo-network/etherchain-ethereum-gas-v2-plugin": "^2.94.7",
"@xyo-network/ethers-ethereum-gas-plugin": "^2.94.7",
"@xyo-network/etherscan-ethereum-gas-plugin": "^2.94.7",
"@xyo-network/gas-price-payload-plugin": "^2.94.7",
"@xyo-network/gas-price-plugin": "^2.94.7",
"@xyo-network/http-bridge": "^2.100.9",
"@xyo-network/module-model": "^2.100.9",
"@xyo-network/node-core-model": "^2.88.0",
"@xyo-network/node-memory": "^2.99.0",
"@xyo-network/payload-model": "^2.99.0",
"@xyo-network/sentinel": "^2.99.0",
"@xyo-network/shared": "^2.99.0",
"@xyo-network/uniswap-crypto-market-payload-plugin": "^2.94.0",
"@xyo-network/uniswap-crypto-market-plugin": "^2.94.0",
"@xyo-network/witness-adhoc": "^2.99.0",
"@xyo-network/witness-model": "^2.99.0",
"@xyo-network/node-memory": "^2.100.9",
"@xyo-network/payload-model": "^2.100.9",
"@xyo-network/sentinel": "^2.100.9",
"@xyo-network/shared": "^2.100.9",
"@xyo-network/uniswap-crypto-market-payload-plugin": "^2.94.7",
"@xyo-network/uniswap-crypto-market-plugin": "^2.94.7",
"@xyo-network/witness-adhoc": "^2.100.9",
"@xyo-network/witness-model": "^2.100.9",
"agenda": "^5.0.0",
"body-parser": "^1.20.2",
"compression": "^1.7.4",
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"ethers": "^6.12.0",
"ethers": "^6.12.1",
"express": "^4.19.2",
"express-mung": "^0.5.1",
"http-status-codes": "^2.3.0",
Expand All @@ -88,13 +88,13 @@
"@types/compression": "^1.7.5",
"@types/cors": "^2.8.17",
"@types/express": "4.17.21",
"@xylabs/jest-helpers": "^3.1.11",
"@xylabs/ts-scripts-yarn3": "^3.9.1",
"@xylabs/tsconfig": "^3.9.1",
"@xylabs/tsconfig-jest": "^3.9.1",
"@xyo-network/payload-builder": "^2.99.0",
"@xylabs/jest-helpers": "^3.3.2",
"@xylabs/ts-scripts-yarn3": "^3.10.4",
"@xylabs/tsconfig": "^3.10.4",
"@xylabs/tsconfig-jest": "^3.10.4",
"@xyo-network/payload-builder": "^2.100.9",
"jest": "^29.7.0",
"jest-mock-extended": "^3.0.6",
"jest-mock-extended": "^3.0.7",
"typescript": "^5.4.5"
},
"types": "dist/node/index.d.ts",
Expand Down
40 changes: 20 additions & 20 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@
},
"dependencies": {
"@scure/bip39": "^1.3.0",
"@xylabs/assert": "^3.1.11",
"@xylabs/delay": "^3.1.11",
"@xylabs/forget": "^3.1.11",
"@xylabs/hex": "^3.1.11",
"@xylabs/lodash": "^3.1.11",
"@xylabs/object": "^3.1.11",
"@xyo-network/account": "^2.99.0",
"@xyo-network/account-model": "^2.99.0",
"@xyo-network/archivist-model": "^2.99.0",
"@xyo-network/diviner-model": "^2.99.0",
"@xyo-network/http-bridge": "^2.99.0",
"@xyo-network/module-model": "^2.99.0",
"@xyo-network/network": "^2.99.0",
"@xylabs/assert": "^3.3.2",
"@xylabs/delay": "^3.3.2",
"@xylabs/forget": "^3.3.2",
"@xylabs/hex": "^3.3.2",
"@xylabs/lodash": "^3.3.2",
"@xylabs/object": "^3.3.2",
"@xyo-network/account": "^2.100.9",
"@xyo-network/account-model": "^2.100.9",
"@xyo-network/archivist-model": "^2.100.9",
"@xyo-network/diviner-model": "^2.100.9",
"@xyo-network/http-bridge": "^2.100.9",
"@xyo-network/module-model": "^2.100.9",
"@xyo-network/network": "^2.100.9",
"@xyo-network/node-app": "workspace:~",
"@xyo-network/node-model": "^2.99.0",
"@xyo-network/payload-model": "^2.99.0",
"@xyo-network/query-payload-plugin": "^2.99.0",
"@xyo-network/node-model": "^2.100.9",
"@xyo-network/payload-model": "^2.100.9",
"@xyo-network/query-payload-plugin": "^2.100.9",
"dotenv": "^16.4.5",
"tail": "^2.2.6",
"terminal-kit": "^3.1.1",
Expand All @@ -37,12 +37,12 @@
"xyo": "dist/index.js"
},
"devDependencies": {
"@types/node": "^20.12.7",
"@types/node": "^20.12.11",
"@types/tail": "^2.2.3",
"@types/terminal-kit": "^2.5.6",
"@xylabs/ts-scripts-yarn3": "^3.9.1",
"@xylabs/tsconfig": "^3.9.1",
"@xylabs/tsconfig-jest": "^3.9.1",
"@xylabs/ts-scripts-yarn3": "^3.10.4",
"@xylabs/tsconfig": "^3.10.4",
"@xylabs/tsconfig-jest": "^3.10.4",
"ts-node": "^10.9.2",
"typescript": "^5.4.5"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/command/commands/account.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { parse } from 'node:path'
import Path from 'node:path'

import { ArgumentsCamelCase, Argv, CommandBuilder, CommandModule } from 'yargs'

Expand All @@ -9,7 +9,7 @@ type Arguments = {}

export const aliases: ReadonlyArray<string> = []
export const builder: CommandBuilder = (yargs: Argv) =>
yargs.usage('Usage: $0 account <command> [Options]').commandDir(parse(__filename).name, opts).demandCommand()
yargs.usage('Usage: $0 account <command> [Options]').commandDir(Path.parse(__filename).name, opts).demandCommand()
export const command = 'account <command> [Options]'
export const deprecated = false
export const describe = 'Create & manage your XYO account'
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/command/commands/archivist.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { parse } from 'node:path'
import Path from 'node:path'

import { EmptyObject } from '@xylabs/object'
import { ArchivistGetQuerySchema, isArchivistInstance } from '@xyo-network/archivist-model'
Expand All @@ -11,7 +11,7 @@ import { getNode } from '../util'

export const aliases: ReadonlyArray<string> = []
export const builder: CommandBuilder = (yargs: Argv) =>
yargs.usage('Usage: $0 archivist <query> <address> [Options]').commandDir(parse(__filename).name, opts)
yargs.usage('Usage: $0 archivist <query> <address> [Options]').commandDir(Path.parse(__filename).name, opts)
export const command = 'archivist'
export const deprecated = false
export const describe = 'Issue queries against an XYO archivist'
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/command/commands/config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { parse } from 'node:path'
import Path from 'node:path'

import { ArgumentsCamelCase, Argv, CommandBuilder, CommandModule } from 'yargs'

Expand All @@ -10,7 +10,7 @@ type Arguments = {}

export const aliases: ReadonlyArray<string> = []
export const builder: CommandBuilder = (yargs: Argv) =>
yargs.usage('Usage: $0 config <command> [Options]').commandDir(parse(__filename).name, opts).demandCommand()
yargs.usage('Usage: $0 config <command> [Options]').commandDir(Path.parse(__filename).name, opts).demandCommand()
export const command = 'config <command> [Options]'
export const deprecated = false
export const describe = 'Get and set CLI/Node config options'
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/command/commands/diviner.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { parse } from 'node:path'
import Path from 'node:path'

import { EmptyObject } from '@xylabs/object'
import { DivinerDivineQuerySchema, isDivinerInstance } from '@xyo-network/diviner-model'
Expand All @@ -11,7 +11,7 @@ import { getNode } from '../util'

export const aliases: ReadonlyArray<string> = []
export const builder: CommandBuilder = (yargs: Argv) =>
yargs.usage('Usage: $0 diviner <query> <address> [Options]').commandDir(parse(__filename).name, opts)
yargs.usage('Usage: $0 diviner <query> <address> [Options]').commandDir(Path.parse(__filename).name, opts)
export const command = 'diviner'
export const deprecated = false
export const describe = 'Issue queries against an XYO diviner'
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/command/commands/module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { parse } from 'node:path'
import Path from 'node:path'

import { EmptyObject } from '@xylabs/object'
import { ArgumentsCamelCase, Argv, CommandBuilder, CommandModule } from 'yargs'
Expand All @@ -10,7 +10,7 @@ import { getModuleFromArgs } from './util'

export const aliases: ReadonlyArray<string> = []
export const builder: CommandBuilder = (yargs: Argv) =>
yargs.usage('Usage: $0 module <query> <address> [Options]').commandDir(parse(__filename).name, opts)
yargs.usage('Usage: $0 module <query> <address> [Options]').commandDir(Path.parse(__filename).name, opts)
export const command = 'module <address>'
export const deprecated = false
export const describe = 'Issue queries against an XYO Module'
Expand Down
5 changes: 3 additions & 2 deletions packages/cli/src/command/commands/node.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { parse } from 'node:path'
import Path from 'node:path'

import { EmptyObject } from '@xylabs/object'
import { ArgumentsCamelCase, Argv, CommandBuilder, CommandModule } from 'yargs'
Expand All @@ -9,7 +9,8 @@ import { opts } from '../requireDirectoryOptions'
import { getNode } from '../util'

export const aliases: ReadonlyArray<string> = []
export const builder: CommandBuilder = (yargs: Argv) => yargs.usage('Usage: $0 node <command> [Options]').commandDir(parse(__filename).name, opts)
export const builder: CommandBuilder = (yargs: Argv) =>
yargs.usage('Usage: $0 node <command> [Options]').commandDir(Path.parse(__filename).name, opts)
export const command = 'node'
export const deprecated = false
export const describe = 'Issue queries against an XYO Node'
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/command/commands/node/describe.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { parse } from 'node:path'
import Path from 'node:path'

import { EmptyObject } from '@xylabs/object'
import { Argv, CommandBuilder, CommandModule } from 'yargs'
Expand All @@ -9,7 +9,7 @@ import { opts } from '../../requireDirectoryOptions'
import { getNode } from '../../util'

export const aliases: ReadonlyArray<string> = []
export const builder: CommandBuilder = (yargs: Argv) => yargs.usage('Usage: $0 node describe [command]').commandDir(parse(__filename).name, opts)
export const builder: CommandBuilder = (yargs: Argv) => yargs.usage('Usage: $0 node describe [command]').commandDir(Path.parse(__filename).name, opts)
export const command = 'describe'
export const deprecated = false
export const describe = 'Describe the XYO Node'
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/command/requireDirectoryOptions.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { extname } from 'node:path'
import Path from 'node:path'

import { RequireDirectoryOptions } from 'yargs'

/**
* The extension of this file. Used to detect if running
* via TS or transpiled output.
*/
const thisFileExtension = extname(__filename).replace('.', '')
const thisFileExtension = Path.extname(__filename).replace('.', '')

/**
* Used with array.filter to remove duplicate array elements
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/lib/file/readFileDeep.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { readFileSync } from 'node:fs'
import { resolve } from 'node:path'
import Path from 'node:path'

import { terminal } from 'terminal-kit'

Expand All @@ -15,7 +15,7 @@ export const readFileDeep = (names: string[]) => {
for (let i = 0; i < depth; i++) {
filename = `../${filename}`
}
resolvedPath = resolve(filename)
resolvedPath = Path.resolve(filename)
try {
result = readFileSync(resolvedPath, { encoding: 'utf8' })
} catch (ex) {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/lib/print/printLogo.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { existsSync } from 'node:fs'
import { join } from 'node:path'
import Path from 'node:path'

import { terminal } from 'terminal-kit'

const fileRelativePath = join(__dirname, '..', '..', 'cli-art-simple.png')
const fileRelativePath = Path.join(__dirname, '..', '..', 'cli-art-simple.png')
const projectRelativePath = './packages/cli/src/cli-art-simple.png'

export const printLogo = async () => {
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/src/lib/process/logs/files.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { tmpdir } from 'node:os'
import { join } from 'node:path'
import Path from 'node:path'

/**
* File used for process stdout
*/
export const outFile = join(tmpdir(), 'xyo.stdout.txt')
export const outFile = Path.join(tmpdir(), 'xyo.stdout.txt')

/**
* File used for process stderr
*/
export const errFile = join(tmpdir(), 'xyo.stderr.txt')
export const errFile = Path.join(tmpdir(), 'xyo.stderr.txt')
4 changes: 2 additions & 2 deletions packages/cli/src/lib/process/pid/files.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { tmpdir } from 'node:os'
import { join } from 'node:path'
import Path from 'node:path'

/**
* The file to use to ensure singleton process
*/
export const pidFile = join(tmpdir(), 'xyo.pid')
export const pidFile = Path.join(tmpdir(), 'xyo.pid')

0 comments on commit eabad8d

Please sign in to comment.