Skip to content

Commit

Permalink
chore: merge stable v1.12 back to unstable (#6100)
Browse files Browse the repository at this point in the history
  • Loading branch information
philknows authored Nov 9, 2023
2 parents 00160a9 + 7000473 commit 8c5e7e4
Show file tree
Hide file tree
Showing 19 changed files with 103 additions and 101 deletions.
6 changes: 4 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"packages": ["packages/*"],
"packages": [
"packages/*"
],
"npmClient": "yarn",
"useNx": true,
"version": "1.11.3",
"version": "1.12.0",
"stream": true,
"command": {
"version": {
Expand Down
10 changes: 5 additions & 5 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"bugs": {
"url": "https://github.com/ChainSafe/lodestar/issues"
},
"version": "1.11.3",
"version": "1.12.0",
"type": "module",
"exports": {
".": {
Expand Down Expand Up @@ -71,10 +71,10 @@
"dependencies": {
"@chainsafe/persistent-merkle-tree": "^0.6.1",
"@chainsafe/ssz": "^0.14.0",
"@lodestar/config": "^1.11.3",
"@lodestar/params": "^1.11.3",
"@lodestar/types": "^1.11.3",
"@lodestar/utils": "^1.11.3",
"@lodestar/config": "^1.12.0",
"@lodestar/params": "^1.12.0",
"@lodestar/types": "^1.12.0",
"@lodestar/utils": "^1.12.0",
"eventsource": "^2.0.2",
"qs": "^6.11.1"
},
Expand Down
28 changes: 14 additions & 14 deletions packages/beacon-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"bugs": {
"url": "https://github.com/ChainSafe/lodestar/issues"
},
"version": "1.11.3",
"version": "1.12.0",
"type": "module",
"exports": {
".": {
Expand Down Expand Up @@ -119,18 +119,18 @@
"@libp2p/peer-id-factory": "^3.0.4",
"@libp2p/prometheus-metrics": "^2.0.7",
"@libp2p/tcp": "8.0.8",
"@lodestar/api": "^1.11.3",
"@lodestar/config": "^1.11.3",
"@lodestar/db": "^1.11.3",
"@lodestar/fork-choice": "^1.11.3",
"@lodestar/light-client": "^1.11.3",
"@lodestar/logger": "^1.11.3",
"@lodestar/params": "^1.11.3",
"@lodestar/reqresp": "^1.11.3",
"@lodestar/state-transition": "^1.11.3",
"@lodestar/types": "^1.11.3",
"@lodestar/utils": "^1.11.3",
"@lodestar/validator": "^1.11.3",
"@lodestar/api": "^1.12.0",
"@lodestar/config": "^1.12.0",
"@lodestar/db": "^1.12.0",
"@lodestar/fork-choice": "^1.12.0",
"@lodestar/light-client": "^1.12.0",
"@lodestar/logger": "^1.12.0",
"@lodestar/params": "^1.12.0",
"@lodestar/reqresp": "^1.12.0",
"@lodestar/state-transition": "^1.12.0",
"@lodestar/types": "^1.12.0",
"@lodestar/utils": "^1.12.0",
"@lodestar/validator": "^1.12.0",
"@multiformats/multiaddr": "^12.1.3",
"@types/datastore-level": "^3.0.0",
"buffer-xor": "^2.0.2",
Expand Down Expand Up @@ -162,8 +162,8 @@
"@types/supertest": "^2.0.12",
"@types/tmp": "^0.2.3",
"eventsource": "^2.0.2",
"it-pair": "^2.0.6",
"it-drain": "^3.0.3",
"it-pair": "^2.0.6",
"leveldown": "^6.1.1",
"rewiremock": "^3.14.5",
"rimraf": "^4.4.1",
Expand Down
28 changes: 14 additions & 14 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@chainsafe/lodestar",
"version": "1.11.3",
"version": "1.12.0",
"description": "Command line interface for lodestar",
"author": "ChainSafe Systems",
"license": "LGPL-3.0",
Expand Down Expand Up @@ -59,23 +59,23 @@
"@chainsafe/bls-keystore": "^2.0.0",
"@chainsafe/blst": "^0.2.9",
"@chainsafe/discv5": "^5.1.0",
"@chainsafe/persistent-merkle-tree": "^0.6.1",
"@chainsafe/ssz": "^0.14.0",
"@chainsafe/threads": "^1.11.1",
"@libp2p/crypto": "^2.0.4",
"@libp2p/peer-id": "^3.0.2",
"@libp2p/peer-id-factory": "^3.0.4",
"@chainsafe/persistent-merkle-tree": "^0.6.1",
"@lodestar/api": "^1.11.3",
"@lodestar/beacon-node": "^1.11.3",
"@lodestar/config": "^1.11.3",
"@lodestar/db": "^1.11.3",
"@lodestar/light-client": "^1.11.3",
"@lodestar/logger": "^1.11.3",
"@lodestar/params": "^1.11.3",
"@lodestar/state-transition": "^1.11.3",
"@lodestar/types": "^1.11.3",
"@lodestar/utils": "^1.11.3",
"@lodestar/validator": "^1.11.3",
"@lodestar/api": "^1.12.0",
"@lodestar/beacon-node": "^1.12.0",
"@lodestar/config": "^1.12.0",
"@lodestar/db": "^1.12.0",
"@lodestar/light-client": "^1.12.0",
"@lodestar/logger": "^1.12.0",
"@lodestar/params": "^1.12.0",
"@lodestar/state-transition": "^1.12.0",
"@lodestar/types": "^1.12.0",
"@lodestar/utils": "^1.12.0",
"@lodestar/validator": "^1.12.0",
"@multiformats/multiaddr": "^12.1.3",
"@types/lockfile": "^1.0.2",
"bip39": "^3.1.0",
Expand All @@ -96,7 +96,7 @@
"yargs": "^17.7.1"
},
"devDependencies": {
"@lodestar/test-utils": "^1.11.3",
"@lodestar/test-utils": "^1.12.0",
"@types/debug": "^4.1.7",
"@types/expand-tilde": "^2.0.0",
"@types/got": "^9.6.12",
Expand Down
6 changes: 3 additions & 3 deletions packages/config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@lodestar/config",
"version": "1.11.3",
"version": "1.12.0",
"description": "Chain configuration required for lodestar",
"author": "ChainSafe Systems",
"license": "Apache-2.0",
Expand Down Expand Up @@ -65,7 +65,7 @@
],
"dependencies": {
"@chainsafe/ssz": "^0.14.0",
"@lodestar/params": "^1.11.3",
"@lodestar/types": "^1.11.3"
"@lodestar/params": "^1.12.0",
"@lodestar/types": "^1.12.0"
}
}
8 changes: 4 additions & 4 deletions packages/db/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@lodestar/db",
"version": "1.11.3",
"version": "1.12.0",
"description": "DB modules of Lodestar",
"author": "ChainSafe Systems",
"homepage": "https://github.com/ChainSafe/lodestar#readme",
Expand Down Expand Up @@ -38,13 +38,13 @@
},
"dependencies": {
"@chainsafe/ssz": "^0.14.0",
"@lodestar/config": "^1.11.3",
"@lodestar/utils": "^1.11.3",
"@lodestar/config": "^1.12.0",
"@lodestar/utils": "^1.12.0",
"@types/levelup": "^4.3.3",
"it-all": "^3.0.2",
"level": "^8.0.0"
},
"devDependencies": {
"@lodestar/logger": "^1.11.3"
"@lodestar/logger": "^1.12.0"
}
}
14 changes: 7 additions & 7 deletions packages/flare/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@lodestar/flare",
"version": "1.11.3",
"version": "1.12.0",
"description": "Beacon chain debugging tool",
"author": "ChainSafe Systems",
"license": "Apache-2.0",
Expand Down Expand Up @@ -60,12 +60,12 @@
"dependencies": {
"@chainsafe/bls": "7.1.1",
"@chainsafe/bls-keygen": "^0.3.0",
"@lodestar/api": "^1.11.3",
"@lodestar/config": "^1.11.3",
"@lodestar/params": "^1.11.3",
"@lodestar/state-transition": "^1.11.3",
"@lodestar/types": "^1.11.3",
"@lodestar/utils": "^1.11.3",
"@lodestar/api": "^1.12.0",
"@lodestar/config": "^1.12.0",
"@lodestar/params": "^1.12.0",
"@lodestar/state-transition": "^1.12.0",
"@lodestar/types": "^1.12.0",
"@lodestar/utils": "^1.12.0",
"source-map-support": "^0.5.21",
"yargs": "^17.7.1"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/fork-choice/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"bugs": {
"url": "https://github.com/ChainSafe/lodestar/issues"
},
"version": "1.11.3",
"version": "1.12.0",
"type": "module",
"exports": "./lib/index.js",
"types": "./lib/index.d.ts",
Expand Down Expand Up @@ -39,11 +39,11 @@
},
"dependencies": {
"@chainsafe/ssz": "^0.14.0",
"@lodestar/config": "^1.11.3",
"@lodestar/params": "^1.11.3",
"@lodestar/state-transition": "^1.11.3",
"@lodestar/types": "^1.11.3",
"@lodestar/utils": "^1.11.3"
"@lodestar/config": "^1.12.0",
"@lodestar/params": "^1.12.0",
"@lodestar/state-transition": "^1.12.0",
"@lodestar/types": "^1.12.0",
"@lodestar/utils": "^1.12.0"
},
"keywords": [
"ethereum",
Expand Down
14 changes: 7 additions & 7 deletions packages/light-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"bugs": {
"url": "https://github.com/ChainSafe/lodestar/issues"
},
"version": "1.11.3",
"version": "1.12.0",
"type": "module",
"exports": {
".": {
Expand Down Expand Up @@ -67,12 +67,12 @@
"@chainsafe/bls": "7.1.1",
"@chainsafe/persistent-merkle-tree": "^0.6.1",
"@chainsafe/ssz": "^0.14.0",
"@lodestar/api": "^1.11.3",
"@lodestar/config": "^1.11.3",
"@lodestar/params": "^1.11.3",
"@lodestar/state-transition": "^1.11.3",
"@lodestar/types": "^1.11.3",
"@lodestar/utils": "^1.11.3",
"@lodestar/api": "^1.12.0",
"@lodestar/config": "^1.12.0",
"@lodestar/params": "^1.12.0",
"@lodestar/state-transition": "^1.12.0",
"@lodestar/types": "^1.12.0",
"@lodestar/utils": "^1.12.0",
"mitt": "^3.0.0",
"strict-event-emitter-types": "^2.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"bugs": {
"url": "https://github.com/ChainSafe/lodestar/issues"
},
"version": "1.11.3",
"version": "1.12.0",
"type": "module",
"exports": {
".": {
Expand Down Expand Up @@ -63,13 +63,13 @@
},
"types": "lib/index.d.ts",
"dependencies": {
"@lodestar/utils": "^1.11.3",
"@lodestar/utils": "^1.12.0",
"winston": "^3.8.2",
"winston-daily-rotate-file": "^4.7.1",
"winston-transport": "^4.5.0"
},
"devDependencies": {
"@lodestar/test-utils": "^1.11.3",
"@lodestar/test-utils": "^1.12.0",
"@types/triple-beam": "^1.3.2",
"rimraf": "^4.4.1",
"triple-beam": "^1.3.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/params/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@lodestar/params",
"version": "1.11.3",
"version": "1.12.0",
"description": "Chain parameters required for lodestar",
"author": "ChainSafe Systems",
"license": "Apache-2.0",
Expand Down
18 changes: 9 additions & 9 deletions packages/prover/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"bugs": {
"url": "https://github.com/ChainSafe/lodestar/issues"
},
"version": "1.11.3",
"version": "1.12.0",
"type": "module",
"exports": {
".": {
Expand Down Expand Up @@ -69,13 +69,13 @@
"@ethereumjs/tx": "^4.1.2",
"@ethereumjs/util": "^8.0.6",
"@ethereumjs/vm": "^6.4.2",
"@lodestar/api": "^1.11.3",
"@lodestar/config": "^1.11.3",
"@lodestar/light-client": "^1.11.3",
"@lodestar/logger": "^1.11.3",
"@lodestar/params": "^1.11.3",
"@lodestar/types": "^1.11.3",
"@lodestar/utils": "^1.11.3",
"@lodestar/api": "^1.12.0",
"@lodestar/config": "^1.12.0",
"@lodestar/light-client": "^1.12.0",
"@lodestar/logger": "^1.12.0",
"@lodestar/params": "^1.12.0",
"@lodestar/types": "^1.12.0",
"@lodestar/utils": "^1.12.0",
"ethereum-cryptography": "^1.2.0",
"find-up": "^6.3.0",
"http-proxy": "^1.18.1",
Expand All @@ -84,7 +84,7 @@
"yargs": "^17.7.1"
},
"devDependencies": {
"@lodestar/test-utils": "^1.11.3",
"@lodestar/test-utils": "^1.12.0",
"@types/http-proxy": "^1.17.10",
"@types/yargs": "^17.0.24",
"axios": "^1.3.4",
Expand Down
12 changes: 6 additions & 6 deletions packages/reqresp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"bugs": {
"url": "https://github.com/ChainSafe/lodestar/issues"
},
"version": "1.11.3",
"version": "1.12.0",
"type": "module",
"exports": {
".": {
Expand Down Expand Up @@ -56,9 +56,9 @@
"dependencies": {
"@chainsafe/fast-crc32c": "^4.1.1",
"@libp2p/interface": "^0.1.2",
"@lodestar/config": "^1.11.3",
"@lodestar/params": "^1.11.3",
"@lodestar/utils": "^1.11.3",
"@lodestar/config": "^1.12.0",
"@lodestar/params": "^1.12.0",
"@lodestar/utils": "^1.12.0",
"it-all": "^3.0.2",
"it-pipe": "^3.0.1",
"snappy": "^7.2.2",
Expand All @@ -67,8 +67,8 @@
"uint8arraylist": "^2.4.3"
},
"devDependencies": {
"@lodestar/logger": "^1.11.3",
"@lodestar/types": "^1.11.3",
"@lodestar/logger": "^1.12.0",
"@lodestar/types": "^1.12.0",
"libp2p": "0.46.12"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/spec-test-util/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@lodestar/spec-test-util",
"version": "1.11.3",
"version": "1.12.0",
"description": "Spec test suite generator from yaml test files",
"author": "ChainSafe Systems",
"license": "Apache-2.0",
Expand Down Expand Up @@ -45,7 +45,7 @@
"blockchain"
],
"dependencies": {
"@lodestar/utils": "^1.11.3",
"@lodestar/utils": "^1.12.0",
"async-retry": "^1.3.3",
"axios": "^1.3.4",
"chai": "^4.3.7",
Expand Down
Loading

0 comments on commit 8c5e7e4

Please sign in to comment.