From 11af9dfbb48151ea75e4331fee3985b115d95e0a Mon Sep 17 00:00:00 2001 From: Cayman Date: Sat, 2 Sep 2023 09:25:23 -0400 Subject: [PATCH 1/2] v1.11.1 --- lerna.json | 2 +- packages/api/package.json | 10 +++++----- packages/beacon-node/package.json | 26 +++++++++++++------------- packages/cli/package.json | 26 +++++++++++++------------- packages/config/package.json | 6 +++--- packages/db/package.json | 8 ++++---- packages/flare/package.json | 14 +++++++------- packages/fork-choice/package.json | 12 ++++++------ packages/light-client/package.json | 14 +++++++------- packages/logger/package.json | 6 +++--- packages/params/package.json | 2 +- packages/prover/package.json | 18 +++++++++--------- packages/reqresp/package.json | 12 ++++++------ packages/spec-test-util/package.json | 4 ++-- packages/state-transition/package.json | 10 +++++----- packages/test-utils/package.json | 4 ++-- packages/types/package.json | 4 ++-- packages/utils/package.json | 2 +- packages/validator/package.json | 16 ++++++++-------- 19 files changed, 98 insertions(+), 98 deletions(-) diff --git a/lerna.json b/lerna.json index 36126fe71630..fdaff0be1060 100644 --- a/lerna.json +++ b/lerna.json @@ -5,7 +5,7 @@ "npmClient": "yarn", "useWorkspaces": true, "useNx": true, - "version": "1.11.0", + "version": "1.11.1", "stream": "true", "command": { "version": { diff --git a/packages/api/package.json b/packages/api/package.json index f2bda020ba9f..4e555d072409 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -11,7 +11,7 @@ "bugs": { "url": "https://github.com/ChainSafe/lodestar/issues" }, - "version": "1.11.0", + "version": "1.11.1", "type": "module", "exports": { ".": { @@ -71,10 +71,10 @@ "dependencies": { "@chainsafe/persistent-merkle-tree": "^0.5.0", "@chainsafe/ssz": "^0.10.2", - "@lodestar/config": "^1.11.0", - "@lodestar/params": "^1.11.0", - "@lodestar/types": "^1.11.0", - "@lodestar/utils": "^1.11.0", + "@lodestar/config": "^1.11.1", + "@lodestar/params": "^1.11.1", + "@lodestar/types": "^1.11.1", + "@lodestar/utils": "^1.11.1", "eventsource": "^2.0.2", "qs": "^6.11.1" }, diff --git a/packages/beacon-node/package.json b/packages/beacon-node/package.json index 95ec9b2a55c6..d596e9696525 100644 --- a/packages/beacon-node/package.json +++ b/packages/beacon-node/package.json @@ -11,7 +11,7 @@ "bugs": { "url": "https://github.com/ChainSafe/lodestar/issues" }, - "version": "1.11.0", + "version": "1.11.1", "type": "module", "exports": { ".": { @@ -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.0", - "@lodestar/config": "^1.11.0", - "@lodestar/db": "^1.11.0", - "@lodestar/fork-choice": "^1.11.0", - "@lodestar/light-client": "^1.11.0", - "@lodestar/logger": "^1.11.0", - "@lodestar/params": "^1.11.0", - "@lodestar/reqresp": "^1.11.0", - "@lodestar/state-transition": "^1.11.0", - "@lodestar/types": "^1.11.0", - "@lodestar/utils": "^1.11.0", - "@lodestar/validator": "^1.11.0", + "@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", "@multiformats/multiaddr": "^12.1.3", "@types/datastore-level": "^3.0.0", "buffer-xor": "^2.0.2", diff --git a/packages/cli/package.json b/packages/cli/package.json index 3aa5193824da..e0420d4a21a9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@chainsafe/lodestar", - "version": "1.11.0", + "version": "1.11.1", "description": "Command line interface for lodestar", "author": "ChainSafe Systems", "license": "LGPL-3.0", @@ -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.0", - "@lodestar/beacon-node": "^1.11.0", - "@lodestar/config": "^1.11.0", - "@lodestar/db": "^1.11.0", - "@lodestar/light-client": "^1.11.0", - "@lodestar/logger": "^1.11.0", - "@lodestar/params": "^1.11.0", - "@lodestar/state-transition": "^1.11.0", - "@lodestar/types": "^1.11.0", - "@lodestar/utils": "^1.11.0", - "@lodestar/validator": "^1.11.0", + "@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", "@multiformats/multiaddr": "^12.1.3", "@types/lockfile": "^1.0.2", "bip39": "^3.1.0", @@ -95,7 +95,7 @@ "yargs": "^17.7.1" }, "devDependencies": { - "@lodestar/test-utils": "^1.11.0", + "@lodestar/test-utils": "^1.11.1", "@types/debug": "^4.1.7", "@types/expand-tilde": "^2.0.0", "@types/got": "^9.6.12", diff --git a/packages/config/package.json b/packages/config/package.json index e707887dcc29..c9a18d134db2 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@lodestar/config", - "version": "1.11.0", + "version": "1.11.1", "description": "Chain configuration required for lodestar", "author": "ChainSafe Systems", "license": "Apache-2.0", @@ -65,7 +65,7 @@ ], "dependencies": { "@chainsafe/ssz": "^0.10.2", - "@lodestar/params": "^1.11.0", - "@lodestar/types": "^1.11.0" + "@lodestar/params": "^1.11.1", + "@lodestar/types": "^1.11.1" } } diff --git a/packages/db/package.json b/packages/db/package.json index a0c382dc76dd..98927f2372b6 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -1,6 +1,6 @@ { "name": "@lodestar/db", - "version": "1.11.0", + "version": "1.11.1", "description": "DB modules of Lodestar", "author": "ChainSafe Systems", "homepage": "https://github.com/ChainSafe/lodestar#readme", @@ -38,13 +38,13 @@ }, "dependencies": { "@chainsafe/ssz": "^0.10.2", - "@lodestar/config": "^1.11.0", - "@lodestar/utils": "^1.11.0", + "@lodestar/config": "^1.11.1", + "@lodestar/utils": "^1.11.1", "@types/levelup": "^4.3.3", "it-all": "^3.0.2", "level": "^8.0.0" }, "devDependencies": { - "@lodestar/logger": "^1.11.0" + "@lodestar/logger": "^1.11.1" } } diff --git a/packages/flare/package.json b/packages/flare/package.json index 0a008f2ad7e8..05f6094f3a16 100644 --- a/packages/flare/package.json +++ b/packages/flare/package.json @@ -1,6 +1,6 @@ { "name": "@lodestar/flare", - "version": "1.11.0", + "version": "1.11.1", "description": "Beacon chain debugging tool", "author": "ChainSafe Systems", "license": "Apache-2.0", @@ -60,12 +60,12 @@ "dependencies": { "@chainsafe/bls": "7.1.1", "@chainsafe/bls-keygen": "^0.3.0", - "@lodestar/api": "^1.11.0", - "@lodestar/config": "^1.11.0", - "@lodestar/params": "^1.11.0", - "@lodestar/state-transition": "^1.11.0", - "@lodestar/types": "^1.11.0", - "@lodestar/utils": "^1.11.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", "source-map-support": "^0.5.21", "yargs": "^17.7.1" }, diff --git a/packages/fork-choice/package.json b/packages/fork-choice/package.json index 727e7b81ed4b..d00437f70d71 100644 --- a/packages/fork-choice/package.json +++ b/packages/fork-choice/package.json @@ -11,7 +11,7 @@ "bugs": { "url": "https://github.com/ChainSafe/lodestar/issues" }, - "version": "1.11.0", + "version": "1.11.1", "type": "module", "exports": "./lib/index.js", "types": "./lib/index.d.ts", @@ -39,11 +39,11 @@ }, "dependencies": { "@chainsafe/ssz": "^0.10.2", - "@lodestar/config": "^1.11.0", - "@lodestar/params": "^1.11.0", - "@lodestar/state-transition": "^1.11.0", - "@lodestar/types": "^1.11.0", - "@lodestar/utils": "^1.11.0" + "@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" }, "keywords": [ "ethereum", diff --git a/packages/light-client/package.json b/packages/light-client/package.json index 042af27e5902..6c09ac47e655 100644 --- a/packages/light-client/package.json +++ b/packages/light-client/package.json @@ -11,7 +11,7 @@ "bugs": { "url": "https://github.com/ChainSafe/lodestar/issues" }, - "version": "1.11.0", + "version": "1.11.1", "type": "module", "exports": { ".": { @@ -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.0", - "@lodestar/config": "^1.11.0", - "@lodestar/params": "^1.11.0", - "@lodestar/state-transition": "^1.11.0", - "@lodestar/types": "^1.11.0", - "@lodestar/utils": "^1.11.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", "mitt": "^3.0.0", "strict-event-emitter-types": "^2.0.0" }, diff --git a/packages/logger/package.json b/packages/logger/package.json index cd6231cb6e72..838e3385d4e4 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -11,7 +11,7 @@ "bugs": { "url": "https://github.com/ChainSafe/lodestar/issues" }, - "version": "1.11.0", + "version": "1.11.1", "type": "module", "exports": { ".": { @@ -63,13 +63,13 @@ }, "types": "lib/index.d.ts", "dependencies": { - "@lodestar/utils": "^1.11.0", + "@lodestar/utils": "^1.11.1", "winston": "^3.8.2", "winston-daily-rotate-file": "^4.7.1", "winston-transport": "^4.5.0" }, "devDependencies": { - "@lodestar/test-utils": "^1.11.0", + "@lodestar/test-utils": "^1.11.1", "@types/triple-beam": "^1.3.2", "rimraf": "^4.4.1", "triple-beam": "^1.3.0" diff --git a/packages/params/package.json b/packages/params/package.json index 52e7974f8294..180b58990ca9 100644 --- a/packages/params/package.json +++ b/packages/params/package.json @@ -1,6 +1,6 @@ { "name": "@lodestar/params", - "version": "1.11.0", + "version": "1.11.1", "description": "Chain parameters required for lodestar", "author": "ChainSafe Systems", "license": "Apache-2.0", diff --git a/packages/prover/package.json b/packages/prover/package.json index 5c283a38c760..9822b25cf60e 100644 --- a/packages/prover/package.json +++ b/packages/prover/package.json @@ -11,7 +11,7 @@ "bugs": { "url": "https://github.com/ChainSafe/lodestar/issues" }, - "version": "1.11.0", + "version": "1.11.1", "type": "module", "exports": { ".": { @@ -69,13 +69,13 @@ "@ethereumjs/tx": "^4.1.2", "@ethereumjs/util": "^8.0.6", "@ethereumjs/vm": "^6.4.2", - "@lodestar/api": "^1.11.0", - "@lodestar/config": "^1.11.0", - "@lodestar/light-client": "^1.11.0", - "@lodestar/logger": "^1.11.0", - "@lodestar/params": "^1.11.0", - "@lodestar/types": "^1.11.0", - "@lodestar/utils": "^1.11.0", + "@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", "ethereum-cryptography": "^1.2.0", "find-up": "^6.3.0", "http-proxy": "^1.18.1", @@ -84,7 +84,7 @@ "yargs": "^17.7.1" }, "devDependencies": { - "@lodestar/test-utils": "^1.11.0", + "@lodestar/test-utils": "^1.11.1", "@types/http-proxy": "^1.17.10", "@types/yargs": "^17.0.24", "axios": "^1.3.4", diff --git a/packages/reqresp/package.json b/packages/reqresp/package.json index 1031cccc2d74..d24fc6379462 100644 --- a/packages/reqresp/package.json +++ b/packages/reqresp/package.json @@ -11,7 +11,7 @@ "bugs": { "url": "https://github.com/ChainSafe/lodestar/issues" }, - "version": "1.11.0", + "version": "1.11.1", "type": "module", "exports": { ".": { @@ -56,9 +56,9 @@ "dependencies": { "@chainsafe/fast-crc32c": "^4.1.1", "@libp2p/interface": "^0.1.1", - "@lodestar/config": "^1.11.0", - "@lodestar/params": "^1.11.0", - "@lodestar/utils": "^1.11.0", + "@lodestar/config": "^1.11.1", + "@lodestar/params": "^1.11.1", + "@lodestar/utils": "^1.11.1", "it-all": "^3.0.2", "it-pipe": "^3.0.1", "snappy": "^7.2.2", @@ -67,8 +67,8 @@ "uint8arraylist": "^2.4.3" }, "devDependencies": { - "@lodestar/logger": "^1.11.0", - "@lodestar/types": "^1.11.0", + "@lodestar/logger": "^1.11.1", + "@lodestar/types": "^1.11.1", "libp2p": "0.46.3" }, "peerDependencies": { diff --git a/packages/spec-test-util/package.json b/packages/spec-test-util/package.json index 9fbf1129bc0b..c8dcdddebd5c 100644 --- a/packages/spec-test-util/package.json +++ b/packages/spec-test-util/package.json @@ -1,6 +1,6 @@ { "name": "@lodestar/spec-test-util", - "version": "1.11.0", + "version": "1.11.1", "description": "Spec test suite generator from yaml test files", "author": "ChainSafe Systems", "license": "Apache-2.0", @@ -45,7 +45,7 @@ "blockchain" ], "dependencies": { - "@lodestar/utils": "^1.11.0", + "@lodestar/utils": "^1.11.1", "async-retry": "^1.3.3", "axios": "^1.3.4", "chai": "^4.3.7", diff --git a/packages/state-transition/package.json b/packages/state-transition/package.json index a7549b83269f..6c68a83f8c26 100644 --- a/packages/state-transition/package.json +++ b/packages/state-transition/package.json @@ -11,7 +11,7 @@ "bugs": { "url": "https://github.com/ChainSafe/lodestar/issues" }, - "version": "1.11.0", + "version": "1.11.1", "type": "module", "exports": { ".": { @@ -62,10 +62,10 @@ "@chainsafe/persistent-merkle-tree": "^0.5.0", "@chainsafe/persistent-ts": "^0.19.1", "@chainsafe/ssz": "^0.10.2", - "@lodestar/config": "^1.11.0", - "@lodestar/params": "^1.11.0", - "@lodestar/types": "^1.11.0", - "@lodestar/utils": "^1.11.0", + "@lodestar/config": "^1.11.1", + "@lodestar/params": "^1.11.1", + "@lodestar/types": "^1.11.1", + "@lodestar/utils": "^1.11.1", "bigint-buffer": "^1.1.5", "buffer-xor": "^2.0.2" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 2fd5c78bd279..18ac9c6f1efb 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@lodestar/test-utils", "private": true, - "version": "1.11.0", + "version": "1.11.1", "description": "Test utilities reused across other packages", "author": "ChainSafe Systems", "license": "Apache-2.0", @@ -61,7 +61,7 @@ "blockchain" ], "dependencies": { - "@lodestar/utils": "^1.11.0", + "@lodestar/utils": "^1.11.1", "axios": "^1.3.4", "chai": "^4.3.7", "mocha": "^10.2.0", diff --git a/packages/types/package.json b/packages/types/package.json index 41e55ca4b776..97ac8c345f6c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -11,7 +11,7 @@ "bugs": { "url": "https://github.com/ChainSafe/lodestar/issues" }, - "version": "1.11.0", + "version": "1.11.1", "type": "module", "exports": { ".": { @@ -68,7 +68,7 @@ "types": "lib/index.d.ts", "dependencies": { "@chainsafe/ssz": "^0.10.2", - "@lodestar/params": "^1.11.0" + "@lodestar/params": "^1.11.1" }, "keywords": [ "ethereum", diff --git a/packages/utils/package.json b/packages/utils/package.json index d7de75d84177..6e2bc4ab50fa 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -11,7 +11,7 @@ "bugs": { "url": "https://github.com/ChainSafe/lodestar/issues" }, - "version": "1.11.0", + "version": "1.11.1", "type": "module", "exports": "./lib/index.js", "files": [ diff --git a/packages/validator/package.json b/packages/validator/package.json index b4345b767109..0caa0aa23fca 100644 --- a/packages/validator/package.json +++ b/packages/validator/package.json @@ -1,6 +1,6 @@ { "name": "@lodestar/validator", - "version": "1.11.0", + "version": "1.11.1", "description": "A Typescript implementation of the validator client", "author": "ChainSafe Systems", "license": "LGPL-3.0", @@ -50,13 +50,13 @@ "dependencies": { "@chainsafe/bls": "7.1.1", "@chainsafe/ssz": "^0.10.2", - "@lodestar/api": "^1.11.0", - "@lodestar/config": "^1.11.0", - "@lodestar/db": "^1.11.0", - "@lodestar/params": "^1.11.0", - "@lodestar/state-transition": "^1.11.0", - "@lodestar/types": "^1.11.0", - "@lodestar/utils": "^1.11.0", + "@lodestar/api": "^1.11.1", + "@lodestar/config": "^1.11.1", + "@lodestar/db": "^1.11.1", + "@lodestar/params": "^1.11.1", + "@lodestar/state-transition": "^1.11.1", + "@lodestar/types": "^1.11.1", + "@lodestar/utils": "^1.11.1", "bigint-buffer": "^1.1.5", "strict-event-emitter-types": "^2.0.0" }, From daa811d519cf3fb0bd2bf4d2d54a93b632bdf7b8 Mon Sep 17 00:00:00 2001 From: g11tech Date: Sat, 2 Sep 2023 17:21:17 +0530 Subject: [PATCH 2/2] fix: fix breaking builder block production (#5928) --- .../src/chain/produceBlock/produceBlockBody.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/beacon-node/src/chain/produceBlock/produceBlockBody.ts b/packages/beacon-node/src/chain/produceBlock/produceBlockBody.ts index 2df0f71afa87..1ab87b392150 100644 --- a/packages/beacon-node/src/chain/produceBlock/produceBlockBody.ts +++ b/packages/beacon-node/src/chain/produceBlock/produceBlockBody.ts @@ -329,8 +329,14 @@ export async function produceBlockBody( (blockBody as capella.BeaconBlockBody).blsToExecutionChanges = blsToExecutionChanges; Object.assign(logMeta, { blsToExecutionChanges: blsToExecutionChanges.length, - withdrawals: (blockBody as capella.BeaconBlockBody).executionPayload.withdrawals.length, }); + + // withdrawals are only available in full body + if (blockType === BlockType.Full) { + Object.assign(logMeta, { + withdrawals: (blockBody as capella.BeaconBlockBody).executionPayload.withdrawals.length, + }); + } } Object.assign(logMeta, {blockValue});