Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ logFilters:

nmHoistingLimits: none

nodeLinker: pnpm
nodeLinker: node-modules

packageExtensions:
"@uniswap/swap-router-contracts@*":
Expand Down
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"type": "module",
"exports": {
".": {
"types": "./dist/node/index.d.ts",
"browser": {
"types": "./dist/browser/index.d.ts",
"default": "./dist/browser/index.mjs"
Expand All @@ -29,7 +30,6 @@
"types": "./dist/node/index.d.ts",
"default": "./dist/node/index.mjs"
},
"types": "./dist/node/index.d.ts",
"default": "./dist/node/index.mjs"
},
"./package.json": "./package.json",
Expand Down Expand Up @@ -75,38 +75,38 @@
"devDependencies": {
"@ethersproject/bignumber": "~5.8.0",
"@types/supertest": "~6.0.3",
"@typescript-eslint/eslint-plugin": "~8.48.1",
"@typescript-eslint/parser": "~8.48.1",
"@typescript-eslint/types": "~8.48.1",
"@vitest/coverage-v8": "~4.0.15",
"@xylabs/base": "~5.0.50",
"@xylabs/eslint-config-flat": "~7.2.8",
"@xylabs/object": "~5.0.50",
"@xylabs/ts-scripts-yarn3": "~7.2.8",
"@xylabs/tsconfig": "~7.2.8",
"@xylabs/vitest-extended": "~5.0.50",
"@xyo-network/account": "~5.2.16",
"@xyo-network/node-memory": "~5.2.16",
"@xyo-network/payload-builder": "~5.2.16",
"@xyo-network/payload-validator": "~5.2.16",
"@xyo-network/schema-name-validator": "~5.2.16",
"@xyo-network/wallet": "~5.2.16",
"@typescript-eslint/eslint-plugin": "~8.53.0",
"@typescript-eslint/parser": "~8.53.0",
"@typescript-eslint/types": "~8.53.0",
"@vitest/coverage-v8": "~4.0.17",
"@xylabs/base": "~5.0.61",
"@xylabs/eslint-config-flat": "~7.2.32",
"@xylabs/object": "~5.0.61",
"@xylabs/ts-scripts-yarn3": "~7.2.32",
"@xylabs/tsconfig": "~7.2.32",
"@xylabs/vitest-extended": "~5.0.61",
"@xyo-network/account": "~5.2.22",
"@xyo-network/node-memory": "~5.2.22",
"@xyo-network/payload-builder": "~5.2.22",
"@xyo-network/payload-validator": "~5.2.22",
"@xyo-network/schema-name-validator": "~5.2.22",
"@xyo-network/wallet": "~5.2.22",
"chalk": "~5.6.2",
"dotenv": "~17.2.3",
"eslint": "~9.39.1",
"eslint": "~9.39.2",
"eslint-import-resolver-typescript": "~4.4.4",
"eslint-plugin-sonarjs": "~3.0.5",
"glob": "~13.0.0",
"jsbi": "~4.3.2",
"knip": "~5.71.0",
"lodash.merge": "~4.6.2",
"mongodb-memory-server": "~10.4.0",
"mongodb-memory-server": "~10.4.3",
"nodemon": "~3.1.11",
"reflect-metadata": "~0.2.2",
"supertest": "~7.1.4",
"typedoc": "~0.28.15",
"typedoc": "~0.28.16",
"typescript": "~5.9.3",
"vitest": "~4.0.15"
"vitest": "~4.0.17"
},
"packageManager": "yarn@4.11.0",
"volta": {
Expand Down
59 changes: 29 additions & 30 deletions packages/automation-witness-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,43 +27,42 @@
"!**/*.test.*"
],
"dependencies": {
"@xylabs/assert": "~5.0.50",
"@xylabs/crypto": "~5.0.50",
"@xylabs/express": "~5.0.50",
"@xylabs/typeof": "~5.0.50",
"@xyo-network/account-model": "~5.2.16",
"@xylabs/assert": "~5.0.61",
"@xylabs/crypto": "~5.0.61",
"@xylabs/express": "~5.0.61",
"@xylabs/typeof": "~5.0.61",
"@xyo-network/account-model": "~5.2.22",
"@xyo-network/api-call-witness": "~5.2.4",
"@xyo-network/api-models": "~5.2.16",
"@xyo-network/archivist-model": "~5.2.16",
"@xyo-network/api-models": "~5.2.22",
"@xyo-network/archivist-model": "~5.2.22",
"@xyo-network/blocknative-ethereum-gas-plugin": "~5.2.4",
"@xyo-network/bridge-http": "~5.2.16",
"@xyo-network/bridge-http": "~5.2.22",
"@xyo-network/coingecko-crypto-market-plugin": "~5.2.4",
"@xyo-network/crypto-asset-payload-plugin": "~5.2.4",
"@xyo-network/crypto-asset-plugin": "~5.2.4",
"@xyo-network/diviner-model": "~5.2.16",
"@xyo-network/diviner-model": "~5.2.22",
"@xyo-network/etherchain-ethereum-gas-v2-plugin": "~5.2.4",
"@xyo-network/ethers-ethereum-gas-plugin": "~5.2.4",
"@xyo-network/etherscan-ethereum-gas-plugin": "~5.2.4",
"@xyo-network/gas-price-payload-plugin": "~5.2.4",
"@xyo-network/gas-price-plugin": "~5.2.4",
"@xyo-network/manifest": "~5.2.16",
"@xyo-network/module-factory-locator": "~5.2.16",
"@xyo-network/module-model": "~5.2.16",
"@xyo-network/manifest": "~5.2.22",
"@xyo-network/module-factory-locator": "~5.2.22",
"@xyo-network/module-model": "~5.2.22",
"@xyo-network/node-core-model": "workspace:^",
"@xyo-network/node-memory": "~5.2.16",
"@xyo-network/payload-model": "~5.2.16",
"@xyo-network/sentinel-memory": "~5.2.16",
"@xyo-network/sentinel-model": "~5.2.16",
"@xyo-network/shared": "~5.2.16",
"@xyo-network/node-memory": "~5.2.22",
"@xyo-network/payload-model": "~5.2.22",
"@xyo-network/sentinel-memory": "~5.2.22",
"@xyo-network/sentinel-model": "~5.2.22",
"@xyo-network/shared": "~5.2.22",
"@xyo-network/tzero-stock-market-plugin": "~5.2.4",
"@xyo-network/uniswap-crypto-market-payload-plugin": "~5.2.4",
"@xyo-network/uniswap-v4-crypto-market-plugin": "~5.2.4",
"@xyo-network/wallet": "~5.2.16",
"@xyo-network/wallet-model": "~5.2.16",
"@xyo-network/witness-adhoc": "~5.2.16",
"@xyo-network/witness-model": "~5.2.16",
"@xyo-network/xl1-protocol-sdk": "~1.17.1",
"@xyo-network/xl1-rpc": "~1.17.1",
"@xyo-network/wallet": "~5.2.22",
"@xyo-network/wallet-model": "~5.2.22",
"@xyo-network/witness-adhoc": "~5.2.22",
"@xyo-network/witness-model": "~5.2.22",
"@xyo-network/xl1-sdk": "~1.18.2",
"agenda": "~5.0.0",
"compression": "~1.8.1",
"cors": "~2.8.5",
Expand All @@ -76,15 +75,15 @@
"@types/compression": "~1.8.1",
"@types/cors": "~2.8.19",
"@types/express": "~5.0.6",
"@xylabs/delay": "~5.0.50",
"@xylabs/ts-scripts-yarn3": "~7.2.8",
"@xylabs/tsconfig": "~7.2.8",
"@xylabs/vitest-extended": "~5.0.50",
"@xyo-network/node-model": "~5.2.16",
"@xyo-network/payload-builder": "~5.2.16",
"@xylabs/delay": "~5.0.61",
"@xylabs/ts-scripts-yarn3": "~7.2.32",
"@xylabs/tsconfig": "~7.2.32",
"@xylabs/vitest-extended": "~5.0.61",
"@xyo-network/node-model": "~5.2.22",
"@xyo-network/payload-builder": "~5.2.22",
"@xyo-network/tzero-stock-market-payload-plugin": "~5.2.4",
"typescript": "~5.9.3",
"vitest": "~4.0.15",
"vitest": "~4.0.17",
"vitest-mock-extended": "~3.1.0"
},
"packageManager": "yarn@4.2.2",
Expand Down
37 changes: 18 additions & 19 deletions packages/automation-witness-server/src/Chain/sendTransaction.ts
Original file line number Diff line number Diff line change
@@ -1,38 +1,37 @@
import { assertEx } from '@xylabs/assert'
import { isUndefined } from '@xylabs/typeof'
import type { AccountInstance } from '@xyo-network/account-model'
import { HDWallet } from '@xyo-network/wallet'
import type { XyoGatewayRunner } from '@xyo-network/xl1-protocol-sdk'
import { SimpleXyoGatewayRunner, SimpleXyoSigner } from '@xyo-network/xl1-protocol-sdk'
import type { RpcTransport } from '@xyo-network/xl1-rpc'
import type {
RpcSchemaMap, TransportFactory, XyoConnection, XyoGatewayRunner,
} from '@xyo-network/xl1-sdk'
import {
HttpRpcTransport, HttpRpcXyoConnection, XyoRunnerRpcSchemas, XyoViewerRpcSchemas,
} from '@xyo-network/xl1-rpc'

const accountPath = "m/44'/60'/0'/0/0" as const
ADDRESS_INDEX, buildJsonRpcProviderLocator, generateXyoBaseWalletFromPhrase, HttpRpcTransport, SimpleXyoGatewayRunner, SimpleXyoSigner, XyoConnectionMoniker,
XyoSignerMoniker,
} from '@xyo-network/xl1-sdk'

const getAccount = async (): Promise<AccountInstance | undefined> => {
const phrase = process.env.XYO_WALLET_MNEMONIC
if (isUndefined(phrase)) return
const account = await HDWallet.fromPhrase(phrase, accountPath)
const wallet = await generateXyoBaseWalletFromPhrase(phrase)
const account = await wallet.derivePath(ADDRESS_INDEX.XYO)
return account
}

const getRpcTransport = (): RpcTransport<typeof XyoRunnerRpcSchemas & typeof XyoViewerRpcSchemas> | undefined => {
const getRpcTransportFactory = (): TransportFactory | undefined => {
const rpcUrl = process.env.XYO_CHAIN_RPC_URL
if (isUndefined(rpcUrl)) return
const transport = new HttpRpcTransport(rpcUrl, { ...XyoRunnerRpcSchemas, ...XyoViewerRpcSchemas })
return transport
const transportFactory: TransportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(rpcUrl, schemas)
return transportFactory
}

export const getGateway = async (): Promise<XyoGatewayRunner | undefined> => {
const transportFactory = getRpcTransportFactory()
if (isUndefined(transportFactory)) return
const account = await getAccount()
if (!account) return
const signer = new SimpleXyoSigner(account)
const endpoint = assertEx(process.env.XYO_CHAIN_RPC_URL, () => 'XYO_CHAIN_RPC_URL must be set')
const transport = getRpcTransport()
if (!transport) return
const connection = new HttpRpcXyoConnection({ endpoint })
if (isUndefined(account)) return
const locator = await buildJsonRpcProviderLocator({ transportFactory })
locator.register(SimpleXyoSigner.factory<SimpleXyoSigner>(SimpleXyoSigner.dependencies, { account }))
const connection = await locator.getInstance<XyoConnection>(XyoConnectionMoniker)
const signer = await locator.getInstance<SimpleXyoSigner>(XyoSignerMoniker)
const gateway = new SimpleXyoGatewayRunner(connection, signer)
return gateway
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ export const getTask = (): Job['task'] => {
await reportDivinerResult(answer)
logger.log('Reported Aggregated Crypto Prices')
logger.log('Submit Transaction of Aggregated Crypto Prices')
// TODO: Create hash payload instead of non-elevated until validation passes for non-elevated
// const hash = await PayloadBuilder.hash(answer)
// const hashPayload = new PayloadBuilder<HashPayload>({ schema: HashSchema }).fields({ hash }).build()
const tx = (await getGateway())?.addPayloadsToChain?.([], [answer])
const gateway = await getGateway()
const tx = await gateway?.addPayloadsToChain?.([], [answer])
logger.log('Submitted Transaction of Aggregated Crypto Prices', tx)
} catch (error) {
logger.error(error)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ export const getTask = () => {
const result = await reportStockPrice('XYLB')
logger.log('Reported TZero Stock Prices')
logger.log('Submit Transaction of TZero Stock Prices')
const tx = (await getGateway())?.addPayloadsToChain?.([], [...result])
const gateway = await getGateway()
const tx = await gateway?.addPayloadsToChain?.([], [...result])
logger.log('Submitted Transaction of TZero Stock Prices', tx)
} catch (error) {
logger.error(error)
Expand Down
Empty file modified packages/cli/cli.mjs
100644 → 100755
Empty file.
44 changes: 22 additions & 22 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
"type": "module",
"exports": {
".": {
"types": "./dist/node/index.d.ts",
"node": {
"types": "./dist/node/index.d.ts",
"default": "./dist/node/index.mjs"
},
"types": "./dist/node/index.d.ts",
"default": "./dist/node/index.mjs"
},
"./package.json": "./package.json"
Expand All @@ -43,38 +43,38 @@
],
"dependencies": {
"@scure/bip39": "~2.0.1",
"@xylabs/assert": "~5.0.50",
"@xylabs/delay": "~5.0.50",
"@xylabs/exists": "~5.0.50",
"@xylabs/forget": "~5.0.50",
"@xylabs/hex": "~5.0.50",
"@xylabs/object": "~5.0.50",
"@xyo-network/account-model": "~5.2.16",
"@xyo-network/archivist-model": "~5.2.16",
"@xyo-network/bridge-http": "~5.2.16",
"@xyo-network/diviner-model": "~5.2.16",
"@xyo-network/module-model": "~5.2.16",
"@xyo-network/network": "~5.2.16",
"@xylabs/assert": "~5.0.61",
"@xylabs/delay": "~5.0.61",
"@xylabs/exists": "~5.0.61",
"@xylabs/forget": "~5.0.61",
"@xylabs/hex": "~5.0.61",
"@xylabs/object": "~5.0.61",
"@xyo-network/account-model": "~5.2.22",
"@xyo-network/archivist-model": "~5.2.22",
"@xyo-network/bridge-http": "~5.2.22",
"@xyo-network/diviner-model": "~5.2.22",
"@xyo-network/module-model": "~5.2.22",
"@xyo-network/network": "~5.2.22",
"@xyo-network/node-app": "workspace:^",
"@xyo-network/node-model": "~5.2.16",
"@xyo-network/payload-model": "~5.2.16",
"@xyo-network/query-payload-plugin": "~5.2.16",
"@xyo-network/wallet": "~5.2.16",
"@xyo-network/node-model": "~5.2.22",
"@xyo-network/payload-model": "~5.2.22",
"@xyo-network/query-payload-plugin": "~5.2.22",
"@xyo-network/wallet": "~5.2.22",
"dotenv": "~17.2.3",
"tail": "~2.2.6",
"terminal-kit": "~3.1.2",
"yargs": "~18.0.0"
},
"devDependencies": {
"@types/node": "~24.10.1",
"@types/node": "~25.0.9",
"@types/tail": "~2.2.3",
"@types/terminal-kit": "~2.5.7",
"@types/yargs": "~17.0.35",
"@xylabs/ts-scripts-yarn3": "~7.2.8",
"@xylabs/tsconfig": "~7.2.8",
"@xyo-network/wallet-model": "~5.2.16",
"@xylabs/ts-scripts-yarn3": "~7.2.32",
"@xylabs/tsconfig": "~7.2.32",
"@xyo-network/wallet-model": "~5.2.22",
"typescript": "~5.9.3",
"vitest": "~4.0.15"
"vitest": "~4.0.17"
},
"publishConfig": {
"access": "public"
Expand Down
34 changes: 17 additions & 17 deletions packages/modules-mongo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"type": "module",
"exports": {
".": {
"types": "./dist/node/index.d.ts",
"browser": {
"types": "./dist/browser/index.d.ts",
"default": "./dist/browser/index.mjs"
Expand All @@ -17,7 +18,6 @@
"types": "./dist/node/index.d.ts",
"default": "./dist/node/index.mjs"
},
"types": "./dist/node/index.d.ts",
"default": "./dist/node/index.mjs"
},
"./package.json": "./package.json"
Expand All @@ -31,32 +31,32 @@
"!**/*.test.*"
],
"dependencies": {
"@xylabs/assert": "~5.0.50",
"@xylabs/hex": "~5.0.50",
"@xylabs/mongo": "~5.0.50",
"@xyo-network/account": "~5.2.16",
"@xyo-network/archivist-mongodb": "~5.2.16",
"@xylabs/assert": "~5.0.61",
"@xylabs/hex": "~5.0.61",
"@xylabs/mongo": "~5.0.61",
"@xyo-network/account": "~5.2.22",
"@xyo-network/archivist-mongodb": "~5.2.22",
"@xyo-network/diviner-mongodb": "workspace:^",
"@xyo-network/module-abstract-mongodb": "~5.2.16",
"@xyo-network/module-model": "~5.2.16",
"@xyo-network/module-abstract-mongodb": "~5.2.22",
"@xyo-network/module-model": "~5.2.22",
"@xyo-network/node-core-types": "workspace:^",
"@xyo-network/previous-hash-store-model": "~5.2.16",
"@xyo-network/shared": "~5.2.16",
"@xyo-network/previous-hash-store-model": "~5.2.22",
"@xyo-network/shared": "~5.2.22",
"agenda": "~5.0.0",
"inversify": "~5.1.1",
"mongodb": "^6.21.0",
"uuid": "~13.0.0"
},
"devDependencies": {
"@xylabs/exists": "~5.0.50",
"@xylabs/ts-scripts-yarn3": "~7.2.8",
"@xylabs/tsconfig": "~7.2.8",
"@xylabs/vitest-extended": "~5.0.50",
"@xyo-network/module-factory-locator": "~5.2.16",
"@xyo-network/module-model-mongodb": "~5.2.16",
"@xylabs/exists": "~5.0.61",
"@xylabs/ts-scripts-yarn3": "~7.2.32",
"@xylabs/tsconfig": "~7.2.32",
"@xylabs/vitest-extended": "~5.0.61",
"@xyo-network/module-factory-locator": "~5.2.22",
"@xyo-network/module-model-mongodb": "~5.2.22",
"reflect-metadata": "~0.2.2",
"typescript": "~5.9.3",
"vitest": "~4.0.15",
"vitest": "~4.0.17",
"vitest-mock-extended": "~3.1.0"
},
"publishConfig": {
Expand Down
Loading
Loading