From 2c63fc6abe0595c481f2c745fabf76ec884bbd1b Mon Sep 17 00:00:00 2001 From: Arie Trouw Date: Mon, 2 Oct 2023 08:32:48 -0700 Subject: [PATCH] reverted typechain version --- .yarn/versions/28215644.yml | 102 ++++++++++++ package.json | 3 +- .../automation-witness-server/package.json | 5 +- packages/cli/package.json | 12 +- packages/modules/package.json | 2 +- packages/node/package.json | 2 +- .../market/packages/uniswap/package.json | 4 +- yarn.lock | 146 +++++++++--------- 8 files changed, 190 insertions(+), 86 deletions(-) create mode 100644 .yarn/versions/28215644.yml diff --git a/.yarn/versions/28215644.yml b/.yarn/versions/28215644.yml new file mode 100644 index 00000000000..e84c2b22f4f --- /dev/null +++ b/.yarn/versions/28215644.yml @@ -0,0 +1,102 @@ +releases: + "@xyo-network/abstract-archivist": patch + "@xyo-network/abstract-bridge": patch + "@xyo-network/abstract-diviner": patch + "@xyo-network/abstract-witness": patch + "@xyo-network/archivist": patch + "@xyo-network/archivist-abstract": patch + "@xyo-network/archivist-indexeddb": patch + "@xyo-network/archivist-model": patch + "@xyo-network/archivist-model-mongodb": patch + "@xyo-network/archivist-mongodb": patch + "@xyo-network/archivist-wrapper": patch + "@xyo-network/automation-witness-server": patch + "@xyo-network/bridge": patch + "@xyo-network/bridge-model": patch + "@xyo-network/bridge-module-resolver": patch + "@xyo-network/bridge-wrapper": patch + "@xyo-network/cli": patch + "@xyo-network/diviner": patch + "@xyo-network/diviner-address-chain": patch + "@xyo-network/diviner-address-chain-abstract": patch + "@xyo-network/diviner-address-chain-memory": patch + "@xyo-network/diviner-address-chain-model": patch + "@xyo-network/diviner-address-history": patch + "@xyo-network/diviner-address-history-model": patch + "@xyo-network/diviner-address-space": patch + "@xyo-network/diviner-address-space-abstract": patch + "@xyo-network/diviner-address-space-memory": patch + "@xyo-network/diviner-address-space-model": patch + "@xyo-network/diviner-boundwitness": patch + "@xyo-network/diviner-boundwitness-abstract": patch + "@xyo-network/diviner-boundwitness-memory": patch + "@xyo-network/diviner-boundwitness-model": patch + "@xyo-network/diviner-boundwitness-stats": patch + "@xyo-network/diviner-boundwitness-stats-abstract": patch + "@xyo-network/diviner-boundwitness-stats-memory": patch + "@xyo-network/diviner-boundwitness-stats-model": patch + "@xyo-network/diviner-coin": patch + "@xyo-network/diviner-coin-user-locations": patch + "@xyo-network/diviner-coin-user-locations-abstract": patch + "@xyo-network/diviner-coin-user-locations-model": patch + "@xyo-network/diviner-forecasting": patch + "@xyo-network/diviner-forecasting-abstract": patch + "@xyo-network/diviner-forecasting-memory": patch + "@xyo-network/diviner-forecasting-model": patch + "@xyo-network/diviner-model": patch + "@xyo-network/diviner-models": patch + "@xyo-network/diviner-mongodb": patch + "@xyo-network/diviner-payload": patch + "@xyo-network/diviner-payload-abstract": patch + "@xyo-network/diviner-payload-memory": patch + "@xyo-network/diviner-payload-model": patch + "@xyo-network/diviner-payload-stats": patch + "@xyo-network/diviner-payload-stats-abstract": patch + "@xyo-network/diviner-payload-stats-memory": patch + "@xyo-network/diviner-payload-stats-model": patch + "@xyo-network/diviner-schema-list": patch + "@xyo-network/diviner-schema-list-abstract": patch + "@xyo-network/diviner-schema-list-memory": patch + "@xyo-network/diviner-schema-list-model": patch + "@xyo-network/diviner-schema-stats": patch + "@xyo-network/diviner-schema-stats-abstract": patch + "@xyo-network/diviner-schema-stats-memory": patch + "@xyo-network/diviner-schema-stats-model": patch + "@xyo-network/diviner-transform": patch + "@xyo-network/diviner-transform-abstract": patch + "@xyo-network/diviner-transform-memory": patch + "@xyo-network/diviner-transform-model": patch + "@xyo-network/diviner-wrapper": patch + "@xyo-network/express-node": patch + "@xyo-network/filesystem-archivist": patch + "@xyo-network/http-bridge": patch + "@xyo-network/manifest": patch + "@xyo-network/manifest-model": patch + "@xyo-network/memory-archivist": patch + "@xyo-network/module": patch + "@xyo-network/module-abstract": patch + "@xyo-network/module-abstract-mongodb": patch + "@xyo-network/module-events": patch + "@xyo-network/module-model": patch + "@xyo-network/module-model-mongodb": patch + "@xyo-network/module-mongodb": patch + "@xyo-network/module-resolver": patch + "@xyo-network/module-wrapper": patch + "@xyo-network/modules": patch + "@xyo-network/node": patch + "@xyo-network/node-abstract": patch + "@xyo-network/node-app": patch + "@xyo-network/node-core-modules-mongo": patch + "@xyo-network/node-memory": patch + "@xyo-network/node-model": patch + "@xyo-network/node-wrapper": patch + "@xyo-network/sdk-xyo-client-js": patch + "@xyo-network/sdk-xyo-mongo-js": patch + "@xyo-network/sentinel": patch + "@xyo-network/sentinel-model": patch + "@xyo-network/witness": patch + "@xyo-network/witness-environment": patch + "@xyo-network/witness-model": patch + "@xyo-network/witness-timestamp": patch + "@xyo-network/witness-wrapper": patch + "@xyo-network/worker-bridge": patch diff --git a/package.json b/package.json index 26d15ec663d..6d17025d6f6 100644 --- a/package.json +++ b/package.json @@ -124,5 +124,6 @@ "volta": { "node": "18.17.1", "yarn": "1.22.19" - } + }, + "type": "module" } diff --git a/packages/automation-witness-server/package.json b/packages/automation-witness-server/package.json index 322b5fc2fa9..6e0e0d52253 100644 --- a/packages/automation-witness-server/package.json +++ b/packages/automation-witness-server/package.json @@ -34,7 +34,7 @@ }, "import": { "types": "./dist/node/index.d.mts", - "default": "./dist/node/index.mjs" + "default": "./dist/node/index.js" } } }, @@ -114,5 +114,6 @@ "volta": { "node": "16.15.1", "yarn": "1.22.19" - } + }, + "type": "module" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 72979afd9c8..2bd336a815c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -35,7 +35,7 @@ "xyo": "dist/index.js" }, "devDependencies": { - "@types/node": "^20.7.2", + "@types/node": "^20.8.0", "@types/tail": "^2.2.1", "@types/terminal-kit": "^2.5.2", "@xylabs/ts-scripts-yarn3": "^3.0.80", @@ -50,12 +50,12 @@ ".": { "node": { "require": { - "types": "./dist/node/index.d.ts", - "default": "./dist/node/index.js" + "types": "./dist/node/index.d.cts", + "default": "./dist/node/index.cjs" }, "import": { "types": "./dist/node/index.d.mts", - "default": "./dist/node/index.mjs" + "default": "./dist/node/index.js" } } }, @@ -64,8 +64,8 @@ }, "./package.json": "./package.json" }, - "main": "dist/node/index.js", - "module": "dist/node/index.mjs", + "main": "dist/node/index.cjs", + "module": "dist/node/index.js", "homepage": "https://xyo.network", "license": "LGPL-3.0", "publishConfig": { diff --git a/packages/modules/package.json b/packages/modules/package.json index b4afe7f13b9..aa100fbf77c 100644 --- a/packages/modules/package.json +++ b/packages/modules/package.json @@ -19,7 +19,7 @@ "@xyo-network/witness": "workspace:~" }, "devDependencies": { - "@swc/core": "^1.3.90", + "@swc/core": "^1.3.91", "@xylabs/ts-scripts-yarn3": "^3.0.80", "@xylabs/tsconfig": "^3.0.80", "typescript": "^5.2.2" diff --git a/packages/node/package.json b/packages/node/package.json index 127109a5cec..1dfb7addc0a 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -54,7 +54,7 @@ "@xyo-network/express-node-server": "workspace:~" }, "devDependencies": { - "@swc/core": "^1.3.90", + "@swc/core": "^1.3.91", "@xylabs/ts-scripts-yarn3": "^3.0.80", "@xylabs/tsconfig": "^3.0.80", "typescript": "^5.2.2" diff --git a/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/uniswap/package.json b/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/uniswap/package.json index d00a88cc6bd..585a8fbe74f 100644 --- a/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/uniswap/package.json +++ b/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/uniswap/package.json @@ -23,9 +23,9 @@ "@xyo-network/module-model": "workspace:~", "@xyo-network/payload-model": "workspace:~", "@xyo-network/payloadset-plugin": "workspace:~", - "@xyo-network/typechain": "^2.2.0", + "@xyo-network/typechain": "^2.2.4", "@xyo-network/uniswap-crypto-market-payload-plugin": "workspace:~", - "@xyo-network/uniswap-typechain": "^2.2.0", + "@xyo-network/uniswap-typechain": "^2.2.4", "@xyo-network/witness": "workspace:~" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index c04d3fb2549..fe445b97a84 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3782,7 +3782,7 @@ __metadata: languageName: node linkType: hard -"@openzeppelin/contracts@npm:^4.9.3": +"@openzeppelin/contracts@npm:^4.8.3": version: 4.9.3 resolution: "@openzeppelin/contracts@npm:4.9.3" checksum: 4932063e733b35fa7669b9fe2053f69b062366c5c208b0c6cfa1ac451712100c78acff98120c3a4b88d94154c802be05d160d71f37e7d74cadbe150964458838 @@ -4598,90 +4598,90 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-arm64@npm:1.3.90": - version: 1.3.90 - resolution: "@swc/core-darwin-arm64@npm:1.3.90" +"@swc/core-darwin-arm64@npm:1.3.91": + version: 1.3.91 + resolution: "@swc/core-darwin-arm64@npm:1.3.91" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@swc/core-darwin-x64@npm:1.3.90": - version: 1.3.90 - resolution: "@swc/core-darwin-x64@npm:1.3.90" +"@swc/core-darwin-x64@npm:1.3.91": + version: 1.3.91 + resolution: "@swc/core-darwin-x64@npm:1.3.91" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@swc/core-linux-arm-gnueabihf@npm:1.3.90": - version: 1.3.90 - resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.90" +"@swc/core-linux-arm-gnueabihf@npm:1.3.91": + version: 1.3.91 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.91" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@swc/core-linux-arm64-gnu@npm:1.3.90": - version: 1.3.90 - resolution: "@swc/core-linux-arm64-gnu@npm:1.3.90" +"@swc/core-linux-arm64-gnu@npm:1.3.91": + version: 1.3.91 + resolution: "@swc/core-linux-arm64-gnu@npm:1.3.91" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-arm64-musl@npm:1.3.90": - version: 1.3.90 - resolution: "@swc/core-linux-arm64-musl@npm:1.3.90" +"@swc/core-linux-arm64-musl@npm:1.3.91": + version: 1.3.91 + resolution: "@swc/core-linux-arm64-musl@npm:1.3.91" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@swc/core-linux-x64-gnu@npm:1.3.90": - version: 1.3.90 - resolution: "@swc/core-linux-x64-gnu@npm:1.3.90" +"@swc/core-linux-x64-gnu@npm:1.3.91": + version: 1.3.91 + resolution: "@swc/core-linux-x64-gnu@npm:1.3.91" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-x64-musl@npm:1.3.90": - version: 1.3.90 - resolution: "@swc/core-linux-x64-musl@npm:1.3.90" +"@swc/core-linux-x64-musl@npm:1.3.91": + version: 1.3.91 + resolution: "@swc/core-linux-x64-musl@npm:1.3.91" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@swc/core-win32-arm64-msvc@npm:1.3.90": - version: 1.3.90 - resolution: "@swc/core-win32-arm64-msvc@npm:1.3.90" +"@swc/core-win32-arm64-msvc@npm:1.3.91": + version: 1.3.91 + resolution: "@swc/core-win32-arm64-msvc@npm:1.3.91" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@swc/core-win32-ia32-msvc@npm:1.3.90": - version: 1.3.90 - resolution: "@swc/core-win32-ia32-msvc@npm:1.3.90" +"@swc/core-win32-ia32-msvc@npm:1.3.91": + version: 1.3.91 + resolution: "@swc/core-win32-ia32-msvc@npm:1.3.91" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@swc/core-win32-x64-msvc@npm:1.3.90": - version: 1.3.90 - resolution: "@swc/core-win32-x64-msvc@npm:1.3.90" +"@swc/core-win32-x64-msvc@npm:1.3.91": + version: 1.3.91 + resolution: "@swc/core-win32-x64-msvc@npm:1.3.91" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@swc/core@npm:^1.3.90": - version: 1.3.90 - resolution: "@swc/core@npm:1.3.90" +"@swc/core@npm:^1.3.91": + version: 1.3.91 + resolution: "@swc/core@npm:1.3.91" dependencies: - "@swc/core-darwin-arm64": 1.3.90 - "@swc/core-darwin-x64": 1.3.90 - "@swc/core-linux-arm-gnueabihf": 1.3.90 - "@swc/core-linux-arm64-gnu": 1.3.90 - "@swc/core-linux-arm64-musl": 1.3.90 - "@swc/core-linux-x64-gnu": 1.3.90 - "@swc/core-linux-x64-musl": 1.3.90 - "@swc/core-win32-arm64-msvc": 1.3.90 - "@swc/core-win32-ia32-msvc": 1.3.90 - "@swc/core-win32-x64-msvc": 1.3.90 + "@swc/core-darwin-arm64": 1.3.91 + "@swc/core-darwin-x64": 1.3.91 + "@swc/core-linux-arm-gnueabihf": 1.3.91 + "@swc/core-linux-arm64-gnu": 1.3.91 + "@swc/core-linux-arm64-musl": 1.3.91 + "@swc/core-linux-x64-gnu": 1.3.91 + "@swc/core-linux-x64-musl": 1.3.91 + "@swc/core-win32-arm64-msvc": 1.3.91 + "@swc/core-win32-ia32-msvc": 1.3.91 + "@swc/core-win32-x64-msvc": 1.3.91 "@swc/counter": ^0.1.1 "@swc/types": ^0.1.5 peerDependencies: @@ -4710,7 +4710,7 @@ __metadata: peerDependenciesMeta: "@swc/helpers": optional: true - checksum: f8ced5187068dc73445c135065c6492f0ac559d0f7720c2482aa9663c87bd015f3d2abef6ee7b2f817280a5e8dd0946c59cce7e1499180644fbc948a9e3823ab + checksum: a5d0a52080709fe7b45f58e27ab5f3b5613294000991546ebdf9944144c90d4a4d79b7c818f5799573728f9ab61d99a0f01f64f76f0efc2ad52feabfce463291 languageName: node linkType: hard @@ -5225,10 +5225,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^20.7.2": - version: 20.7.2 - resolution: "@types/node@npm:20.7.2" - checksum: 5baa09368c8daa50ad1eaa2499b988b2f4c06cacf8b251d1e63f68ad32df97b21d8104f1ac06889481f1d3e84056842732bb848dd1136164d823c1d4a6baf435 +"@types/node@npm:*, @types/node@npm:^20.7.2, @types/node@npm:^20.8.0": + version: 20.8.0 + resolution: "@types/node@npm:20.8.0" + checksum: ebad6342d54238a24bf980d7750117a5d67749c9b72cbb7a974a1e932c39034aa3a810d669e007e8a5071782a253aa069a187b614407a382403c9826e837c849 languageName: node linkType: hard @@ -6780,7 +6780,7 @@ __metadata: version: 0.0.0-use.local resolution: "@xyo-network/cli@workspace:packages/cli" dependencies: - "@types/node": ^20.7.2 + "@types/node": ^20.8.0 "@types/tail": ^2.2.1 "@types/terminal-kit": ^2.5.2 "@xylabs/assert": ^2.12.14 @@ -8552,7 +8552,7 @@ __metadata: version: 0.0.0-use.local resolution: "@xyo-network/express-node@workspace:packages/node" dependencies: - "@swc/core": ^1.3.90 + "@swc/core": ^1.3.91 "@xylabs/ts-scripts-yarn3": ^3.0.80 "@xylabs/tsconfig": ^3.0.80 "@xyo-network/express-node-dependencies": "workspace:~" @@ -9206,7 +9206,7 @@ __metadata: version: 0.0.0-use.local resolution: "@xyo-network/modules@workspace:packages/modules" dependencies: - "@swc/core": ^1.3.90 + "@swc/core": ^1.3.91 "@xylabs/ts-scripts-yarn3": ^3.0.80 "@xylabs/tsconfig": ^3.0.80 "@xyo-network/archivist": "workspace:~" @@ -9980,12 +9980,12 @@ __metadata: languageName: unknown linkType: soft -"@xyo-network/solidity@npm:~2.2.0": - version: 2.2.0 - resolution: "@xyo-network/solidity@npm:2.2.0" +"@xyo-network/solidity@npm:^2.2.4": + version: 2.2.4 + resolution: "@xyo-network/solidity@npm:2.2.4" dependencies: - "@openzeppelin/contracts": ^4.9.3 - checksum: 6b95da9fabbcbbdbfe5ada015d02a283436ffa3cf947ffb775030d82abf1812712031e0bda785f9add21eafe68304a8f52d76271c5b8cff7a6d83462efad6f85 + "@openzeppelin/contracts": ^4.8.3 + checksum: 8df94c1917684823943564e81b79f50c2c4ca0c6b9839244846350616a3d64a8418d348f37425980bc321ccb4c7ae457c481c31ce5d149e16edbf280ec657293 languageName: node linkType: hard @@ -10013,16 +10013,16 @@ __metadata: languageName: unknown linkType: soft -"@xyo-network/typechain@npm:^2.2.0": - version: 2.2.0 - resolution: "@xyo-network/typechain@npm:2.2.0" +"@xyo-network/typechain@npm:^2.2.4": + version: 2.2.4 + resolution: "@xyo-network/typechain@npm:2.2.4" dependencies: "@ethersproject/abi": ^5.7.0 "@ethersproject/bytes": ^5.7.0 "@ethersproject/contracts": ^5.7.0 "@ethersproject/providers": ^5.7.2 - "@xyo-network/solidity": ~2.2.0 - checksum: cc87ab00f1b612eea9a5c1fb0d4e0b4924aee9642461ba3e9653976d946830650b9c69803b999320988eeab3e0a8fac61e6e34d506ad6b336c7030d970c75ae7 + "@xyo-network/solidity": ^2.2.4 + checksum: 72fd0272deb93293ae99703cf964401a0f5f46d8518a23250aeb29c5d526ed218f44926ff84b5ec512d375834a2f33309d2003928a5887113acafe2939c58508 languageName: node linkType: hard @@ -10071,9 +10071,9 @@ __metadata: "@xyo-network/module-model": "workspace:~" "@xyo-network/payload-model": "workspace:~" "@xyo-network/payloadset-plugin": "workspace:~" - "@xyo-network/typechain": ^2.2.0 + "@xyo-network/typechain": ^2.2.4 "@xyo-network/uniswap-crypto-market-payload-plugin": "workspace:~" - "@xyo-network/uniswap-typechain": ^2.2.0 + "@xyo-network/uniswap-typechain": ^2.2.4 "@xyo-network/witness": "workspace:~" ethers: ^5.7.2 jest: ^29.7.0 @@ -10085,25 +10085,25 @@ __metadata: languageName: unknown linkType: soft -"@xyo-network/uniswap-solidity@npm:~2.2.0": - version: 2.2.0 - resolution: "@xyo-network/uniswap-solidity@npm:2.2.0" +"@xyo-network/uniswap-solidity@npm:^2.2.4": + version: 2.2.4 + resolution: "@xyo-network/uniswap-solidity@npm:2.2.4" dependencies: "@uniswap/v3-core": ^1.0.1 - checksum: a019119c8b5ba4b3630362ff9644a4f2337abde9d11f46a9f74d3fa6a255568fd880571ffc4dc12c6ece099e39b9ef64c3ec3db4afdba035e87bb377f75bd90c + checksum: c51824948ebe8ff8d9d76a0e4fb28e4243a7c67910c57b7852440b66d383ecfe3cb7b01d2c5c03a20524dbc81601a057af24394292b3a1107e094afd7744f3a9 languageName: node linkType: hard -"@xyo-network/uniswap-typechain@npm:^2.2.0": - version: 2.2.0 - resolution: "@xyo-network/uniswap-typechain@npm:2.2.0" +"@xyo-network/uniswap-typechain@npm:^2.2.4": + version: 2.2.4 + resolution: "@xyo-network/uniswap-typechain@npm:2.2.4" dependencies: "@ethersproject/abi": ^5.7.0 "@ethersproject/bytes": ^5.7.0 "@ethersproject/contracts": ^5.7.0 "@ethersproject/providers": ^5.7.2 - "@xyo-network/uniswap-solidity": ~2.2.0 - checksum: fcbcfc107feb095da4afccb2f9a7700bf5463d81805fbdbefc0f41a51affca7b05f90203fb8ed2daabb9b68232e387f3cc491b96e530ea2cbd540a332089a1f6 + "@xyo-network/uniswap-solidity": ^2.2.4 + checksum: 2fa466d673e6057a80db1259311b19e866fb607e0f3158105f07e6b8a7a5eeaa96660bf27699b33c6aced4470a2d643385d51d00b70750d637336c201098fcad languageName: node linkType: hard