Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge stable to unstable #5996

Merged
merged 7 commits into from
Oct 2, 2023
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 lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"npmClient": "yarn",
"useWorkspaces": true,
"useNx": true,
"version": "1.11.1",
"version": "1.11.3",
"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.1",
"version": "1.11.3",
"type": "module",
"exports": {
".": {
Expand Down Expand Up @@ -71,10 +71,10 @@
"dependencies": {
"@chainsafe/persistent-merkle-tree": "^0.5.0",
"@chainsafe/ssz": "^0.10.2",
"@lodestar/config": "^1.11.1",
"@lodestar/params": "^1.11.1",
"@lodestar/types": "^1.11.1",
"@lodestar/utils": "^1.11.1",
"@lodestar/config": "^1.11.3",
"@lodestar/params": "^1.11.3",
"@lodestar/types": "^1.11.3",
"@lodestar/utils": "^1.11.3",
"eventsource": "^2.0.2",
"qs": "^6.11.1"
},
Expand Down
26 changes: 13 additions & 13 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.1",
"version": "1.11.3",
"type": "module",
"exports": {
".": {
Expand Down Expand Up @@ -117,18 +117,18 @@
"@libp2p/peer-id-factory": "^3.0.2",
"@libp2p/prometheus-metrics": "^2.0.2",
"@libp2p/tcp": "8.0.2",
"@lodestar/api": "^1.11.1",
"@lodestar/config": "^1.11.1",
"@lodestar/db": "^1.11.1",
"@lodestar/fork-choice": "^1.11.1",
"@lodestar/light-client": "^1.11.1",
"@lodestar/logger": "^1.11.1",
"@lodestar/params": "^1.11.1",
"@lodestar/reqresp": "^1.11.1",
"@lodestar/state-transition": "^1.11.1",
"@lodestar/types": "^1.11.1",
"@lodestar/utils": "^1.11.1",
"@lodestar/validator": "^1.11.1",
"@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",
"@multiformats/multiaddr": "^12.1.3",
"@types/datastore-level": "^3.0.0",
"buffer-xor": "^2.0.2",
Expand Down
26 changes: 13 additions & 13 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.1",
"version": "1.11.3",
"description": "Command line interface for lodestar",
"author": "ChainSafe Systems",
"license": "LGPL-3.0",
Expand Down Expand Up @@ -64,17 +64,17 @@
"@libp2p/crypto": "^2.0.2",
"@libp2p/peer-id": "^3.0.1",
"@libp2p/peer-id-factory": "^3.0.2",
"@lodestar/api": "^1.11.1",
"@lodestar/beacon-node": "^1.11.1",
"@lodestar/config": "^1.11.1",
"@lodestar/db": "^1.11.1",
"@lodestar/light-client": "^1.11.1",
"@lodestar/logger": "^1.11.1",
"@lodestar/params": "^1.11.1",
"@lodestar/state-transition": "^1.11.1",
"@lodestar/types": "^1.11.1",
"@lodestar/utils": "^1.11.1",
"@lodestar/validator": "^1.11.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",
"@multiformats/multiaddr": "^12.1.3",
"@types/lockfile": "^1.0.2",
"bip39": "^3.1.0",
Expand All @@ -95,7 +95,7 @@
"yargs": "^17.7.1"
},
"devDependencies": {
"@lodestar/test-utils": "^1.11.1",
"@lodestar/test-utils": "^1.11.3",
"@types/debug": "^4.1.7",
"@types/expand-tilde": "^2.0.0",
"@types/got": "^9.6.12",
Expand Down
9 changes: 6 additions & 3 deletions packages/cli/src/networks/holesky.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ export const bootnodesFileUrl =
"https://raw.githubusercontent.com/eth-clients/holesky/main/custom_config_data/bootstrap_nodes.txt";

export const bootEnrs = [
"enr:-Iq4QJk4WqRkjsX5c2CXtOra6HnxN-BMXnWhmhEQO9Bn9iABTJGdjUOurM7Btj1ouKaFkvTRoju5vz2GPmVON2dffQKGAX53x8JigmlkgnY0gmlwhLKAlv6Jc2VjcDI1NmsxoQK6S-Cii_KmfFdUJL2TANL3ksaKUnNXvTCv1tLwXs0QgIN1ZHCCIyk",
"enr:-KG4QMH842KsJOZAHxI98VJcf8oPr1U8Ylyp2Tb-sNAPniWSCaxIS4F9gc3lGOnROEok7g5qrOm8WgJTl2WXx8MhMmIMhGV0aDKQqX6DZjABcAAKAAAAAAAAAIJpZIJ2NIJpcISygIjpiXNlY3AyNTZrMaECvQMvoDF46BfJgvAbbv1hwpNu9VQBXRIpHS_B8zmkZmmDdGNwgiMog3VkcIIjKA",
"enr:-Ly4QDU8tZeygxz1gEeAD4EKe4H_8gg-IanpTY6h8A1YGPv5BPNvCMD77zjHUk_iF1pfG_8DC6jYWbIOD1k5kF-LaG4Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCpfoNmMAFwAAoAAAAAAAAAgmlkgnY0gmlwhJK-DYCJc2VjcDI1NmsxoQN4bUae9DwIcq_56DNztksQYXeddTDKRonI5qI3YhN4SohzeW5jbmV0cwCDdGNwgiMog3VkcIIjKA",
"enr:-Ku4QFo-9q73SspYI8cac_4kTX7yF800VXqJW4Lj3HkIkb5CMqFLxciNHePmMt4XdJzHvhrCC5ADI4D_GkAsxGJRLnQBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpAhnTT-AQFwAP__________gmlkgnY0gmlwhLKAiOmJc2VjcDI1NmsxoQORcM6e19T1T9gi7jxEZjk_sjVLGFscUNqAY9obgZaxbIN1ZHCCIyk",
"enr:-Ku4QPG7F72mbKx3gEQEx07wpYYusGDh-ni6SNkLvOS-hhN-BxIggN7tKlmalb0L5JPoAfqD-akTZ-gX06hFeBEz4WoBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpAhnTT-AQFwAP__________gmlkgnY0gmlwhJK-DYCJc2VjcDI1NmsxoQKLVXFOhp2uX6jeT0DvvDpPcU8FWMjQdR4wMuORMhpX24N1ZHCCIyk",
"enr:-LK4QPxe-mDiSOtEB_Y82ozvxn9aQM07Ui8A-vQHNgYGMMthfsfOabaaTHhhJHFCBQQVRjBww_A5bM1rf8MlkJU_l68Eh2F0dG5ldHOIAADAAAAAAACEZXRoMpBpt9l0BAFwAAABAAAAAAAAgmlkgnY0gmlwhLKAiOmJc2VjcDI1NmsxoQJu6T9pclPObAzEVQ53DpVQqjadmVxdTLL-J3h9NFoCeIN0Y3CCIyiDdWRwgiMo",
"enr:-Ly4QGbOw4xNel5EhmDsJJ-QhC9XycWtsetnWoZ0uRy381GHdHsNHJiCwDTOkb3S1Ade0SFQkWJX_pgb3g8Jfh93rvMBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpBpt9l0BAFwAAABAAAAAAAAgmlkgnY0gmlwhJK-DYCJc2VjcDI1NmsxoQOxKv9sv3zKF8GDewgFGGHKP5HCZZpPpTrwl9eXKAWGxIhzeW5jbmV0cwCDdGNwgiMog3VkcIIjKA",
"enr:-LS4QG0uV4qvcpJ-HFDJRGBmnlD3TJo7yc4jwK8iP7iKaTlfQ5kZvIDspLMJhk7j9KapuL9yyHaZmwTEZqr10k9XumyCEcmHYXR0bmV0c4gAAAAABgAAAIRldGgykGm32XQEAXAAAAEAAAAAAACCaWSCdjSCaXCErK4j-YlzZWNwMjU2azGhAgfWRBEJlb7gAhXIB5ePmjj2b8io0UpEenq1Kl9cxStJg3RjcIIjKIN1ZHCCIyg",
"enr:-Le4QLoE1wFHSlGcm48a9ZESb_MRLqPPu6G0vHqu4MaUcQNDHS69tsy-zkN0K6pglyzX8m24mkb-LtBcbjAYdP1uxm4BhGV0aDKQabfZdAQBcAAAAQAAAAAAAIJpZIJ2NIJpcIQ5gR6Wg2lwNpAgAUHQBwEQAAAAAAAAADR-iXNlY3AyNTZrMaEDPMSNdcL92uNIyCsS177Z6KTXlbZakQqxv3aQcWawNXeDdWRwgiMohHVkcDaCI4I",
];
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.1",
"version": "1.11.3",
"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.10.2",
"@lodestar/params": "^1.11.1",
"@lodestar/types": "^1.11.1"
"@lodestar/params": "^1.11.3",
"@lodestar/types": "^1.11.3"
}
}
12 changes: 6 additions & 6 deletions packages/config/src/chainConfig/networks/holesky.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ export const holeskyChainConfig: ChainConfig = {
// Genesis
// ---------------------------------------------------------------
MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 16384,
// Sep-15-2023 14:55:00 +UTC
MIN_GENESIS_TIME: 1694786100,
// Sep-28-2023 11:55:00 +UTC
MIN_GENESIS_TIME: 1695902100,
GENESIS_DELAY: 300,
GENESIS_FORK_VERSION: b("0x00017000"),
GENESIS_FORK_VERSION: b("0x01017000"),

// Forking
// ---------------------------------------------------------------
// # Altair
ALTAIR_FORK_VERSION: b("0x10017000"),
ALTAIR_FORK_VERSION: b("0x02017000"),
ALTAIR_FORK_EPOCH: 0,
// # Merge
BELLATRIX_FORK_VERSION: b("0x20017000"),
BELLATRIX_FORK_VERSION: b("0x03017000"),
BELLATRIX_FORK_EPOCH: 0,
TERMINAL_TOTAL_DIFFICULTY: BigInt("0"),
// Capella
CAPELLA_FORK_VERSION: b("0x30017000"),
CAPELLA_FORK_VERSION: b("0x04017000"),
CAPELLA_FORK_EPOCH: 256,

// # 28,000,000,000 Gwei to ensure quicker ejection
Expand Down
2 changes: 1 addition & 1 deletion packages/config/src/networks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const genesisData: Record<NetworkName, GenesisData> = {
genesisValidatorsRoot: "0xd8ea171f3c94aea21ebc42a1ed61052acf3f9209c00e4efbaaddac09ed9b8078",
},
holesky: {
genesisTime: 1694786400,
genesisTime: 1695902400,
genesisValidatorsRoot: "0x9143aa7c615a7f7115e2b6aac319c03529df8242ae705fba9df39b79c59fa8b1",
},
chiado: {
Expand Down
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.1",
"version": "1.11.3",
"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.10.2",
"@lodestar/config": "^1.11.1",
"@lodestar/utils": "^1.11.1",
"@lodestar/config": "^1.11.3",
"@lodestar/utils": "^1.11.3",
"@types/levelup": "^4.3.3",
"it-all": "^3.0.2",
"level": "^8.0.0"
},
"devDependencies": {
"@lodestar/logger": "^1.11.1"
"@lodestar/logger": "^1.11.3"
}
}
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.1",
"version": "1.11.3",
"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.1",
"@lodestar/config": "^1.11.1",
"@lodestar/params": "^1.11.1",
"@lodestar/state-transition": "^1.11.1",
"@lodestar/types": "^1.11.1",
"@lodestar/utils": "^1.11.1",
"@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",
"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.1",
"version": "1.11.3",
"type": "module",
"exports": "./lib/index.js",
"types": "./lib/index.d.ts",
Expand Down Expand Up @@ -39,11 +39,11 @@
},
"dependencies": {
"@chainsafe/ssz": "^0.10.2",
"@lodestar/config": "^1.11.1",
"@lodestar/params": "^1.11.1",
"@lodestar/state-transition": "^1.11.1",
"@lodestar/types": "^1.11.1",
"@lodestar/utils": "^1.11.1"
"@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"
},
"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.1",
"version": "1.11.3",
"type": "module",
"exports": {
".": {
Expand Down Expand Up @@ -67,12 +67,12 @@
"@chainsafe/bls": "7.1.1",
"@chainsafe/persistent-merkle-tree": "^0.5.0",
"@chainsafe/ssz": "^0.10.2",
"@lodestar/api": "^1.11.1",
"@lodestar/config": "^1.11.1",
"@lodestar/params": "^1.11.1",
"@lodestar/state-transition": "^1.11.1",
"@lodestar/types": "^1.11.1",
"@lodestar/utils": "^1.11.1",
"@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",
"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.1",
"version": "1.11.3",
"type": "module",
"exports": {
".": {
Expand Down Expand Up @@ -63,13 +63,13 @@
},
"types": "lib/index.d.ts",
"dependencies": {
"@lodestar/utils": "^1.11.1",
"@lodestar/utils": "^1.11.3",
"winston": "^3.8.2",
"winston-daily-rotate-file": "^4.7.1",
"winston-transport": "^4.5.0"
},
"devDependencies": {
"@lodestar/test-utils": "^1.11.1",
"@lodestar/test-utils": "^1.11.3",
"@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.1",
"version": "1.11.3",
"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.1",
"version": "1.11.3",
"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.1",
"@lodestar/config": "^1.11.1",
"@lodestar/light-client": "^1.11.1",
"@lodestar/logger": "^1.11.1",
"@lodestar/params": "^1.11.1",
"@lodestar/types": "^1.11.1",
"@lodestar/utils": "^1.11.1",
"@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",
"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.1",
"@lodestar/test-utils": "^1.11.3",
"@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.1",
"version": "1.11.3",
"type": "module",
"exports": {
".": {
Expand Down Expand Up @@ -56,9 +56,9 @@
"dependencies": {
"@chainsafe/fast-crc32c": "^4.1.1",
"@libp2p/interface": "^0.1.1",
"@lodestar/config": "^1.11.1",
"@lodestar/params": "^1.11.1",
"@lodestar/utils": "^1.11.1",
"@lodestar/config": "^1.11.3",
"@lodestar/params": "^1.11.3",
"@lodestar/utils": "^1.11.3",
"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.1",
"@lodestar/types": "^1.11.1",
"@lodestar/logger": "^1.11.3",
"@lodestar/types": "^1.11.3",
"libp2p": "0.46.3"
},
"peerDependencies": {
Expand Down
Loading
Loading