Skip to content

Commit 058bcf5

Browse files
authored
chore: revert back to previous getPendingBalanceToWithdraw implementation (#7419)
Since ChainSafe/ssz#456 it's possible to use `getAllReadonly()` with uncommited changes. This PR essential reverts changes done in #7375 as it causes more memory allocation which is not ideal.
1 parent 048741b commit 058bcf5

File tree

12 files changed

+15
-16
lines changed

12 files changed

+15
-16
lines changed

packages/api/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
},
7272
"dependencies": {
7373
"@chainsafe/persistent-merkle-tree": "^1.0.1",
74-
"@chainsafe/ssz": "^1.0.1",
74+
"@chainsafe/ssz": "^1.0.2",
7575
"@lodestar/config": "^1.25.0",
7676
"@lodestar/params": "^1.25.0",
7777
"@lodestar/types": "^1.25.0",

packages/beacon-node/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"@chainsafe/persistent-merkle-tree": "^1.0.1",
105105
"@chainsafe/prometheus-gc-stats": "^1.0.0",
106106
"@chainsafe/pubkey-index-map": "2.0.0",
107-
"@chainsafe/ssz": "^1.0.1",
107+
"@chainsafe/ssz": "^1.0.2",
108108
"@chainsafe/threads": "^1.11.1",
109109
"@ethersproject/abi": "^5.7.0",
110110
"@fastify/bearer-auth": "^10.0.1",

packages/cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"@chainsafe/discv5": "^9.0.0",
5858
"@chainsafe/enr": "^3.0.0",
5959
"@chainsafe/persistent-merkle-tree": "^1.0.1",
60-
"@chainsafe/ssz": "^1.0.1",
60+
"@chainsafe/ssz": "^1.0.2",
6161
"@chainsafe/threads": "^1.11.1",
6262
"@libp2p/crypto": "^4.1.0",
6363
"@libp2p/peer-id": "^4.1.0",

packages/config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"blockchain"
6565
],
6666
"dependencies": {
67-
"@chainsafe/ssz": "^1.0.1",
67+
"@chainsafe/ssz": "^1.0.2",
6868
"@lodestar/params": "^1.25.0",
6969
"@lodestar/types": "^1.25.0",
7070
"@lodestar/utils": "^1.25.0"

packages/db/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"check-readme": "typescript-docs-verifier"
3636
},
3737
"dependencies": {
38-
"@chainsafe/ssz": "^1.0.1",
38+
"@chainsafe/ssz": "^1.0.2",
3939
"@lodestar/config": "^1.25.0",
4040
"@lodestar/utils": "^1.25.0",
4141
"classic-level": "^1.4.1",

packages/fork-choice/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"check-readme": "typescript-docs-verifier"
3737
},
3838
"dependencies": {
39-
"@chainsafe/ssz": "^1.0.1",
39+
"@chainsafe/ssz": "^1.0.2",
4040
"@lodestar/config": "^1.25.0",
4141
"@lodestar/params": "^1.25.0",
4242
"@lodestar/state-transition": "^1.25.0",

packages/light-client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"@chainsafe/bls": "7.1.3",
7777
"@chainsafe/blst": "^0.2.0",
7878
"@chainsafe/persistent-merkle-tree": "^1.0.1",
79-
"@chainsafe/ssz": "^1.0.1",
79+
"@chainsafe/ssz": "^1.0.2",
8080
"@lodestar/api": "^1.25.0",
8181
"@lodestar/config": "^1.25.0",
8282
"@lodestar/params": "^1.25.0",

packages/state-transition/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"@chainsafe/persistent-merkle-tree": "^1.0.1",
6464
"@chainsafe/persistent-ts": "^1.0.0",
6565
"@chainsafe/pubkey-index-map": "2.0.0",
66-
"@chainsafe/ssz": "^1.0.1",
66+
"@chainsafe/ssz": "^1.0.2",
6767
"@chainsafe/swap-or-not-shuffle": "^0.0.2",
6868
"@lodestar/config": "^1.25.0",
6969
"@lodestar/params": "^1.25.0",

packages/state-transition/src/util/validator.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ export function getMaxEffectiveBalance(withdrawalCredentials: Uint8Array): numbe
8484

8585
export function getPendingBalanceToWithdraw(state: CachedBeaconStateElectra, validatorIndex: ValidatorIndex): number {
8686
let total = 0;
87-
for (let i = 0; i < state.pendingPartialWithdrawals.length; i++) {
88-
const item = state.pendingPartialWithdrawals.get(i);
87+
for (const item of state.pendingPartialWithdrawals.getAllReadonly()) {
8988
if (item.validatorIndex === validatorIndex) {
9089
total += Number(item.amount);
9190
}

packages/types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
},
7474
"types": "lib/index.d.ts",
7575
"dependencies": {
76-
"@chainsafe/ssz": "^1.0.1",
76+
"@chainsafe/ssz": "^1.0.2",
7777
"@lodestar/params": "^1.25.0",
7878
"ethereum-cryptography": "^2.0.0"
7979
},

packages/validator/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
],
4747
"dependencies": {
4848
"@chainsafe/blst": "^2.1.0",
49-
"@chainsafe/ssz": "^1.0.1",
49+
"@chainsafe/ssz": "^1.0.2",
5050
"@lodestar/api": "^1.25.0",
5151
"@lodestar/config": "^1.25.0",
5252
"@lodestar/db": "^1.25.0",

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -758,10 +758,10 @@
758758
"@chainsafe/as-sha256" "^0.4.1"
759759
"@chainsafe/persistent-merkle-tree" "^0.6.1"
760760

761-
"@chainsafe/ssz@^1.0.1":
762-
version "1.0.1"
763-
resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-1.0.1.tgz#dd1373cb4387fdd869d377f0fc5460edf422bd78"
764-
integrity sha512-+QugG2Wbw3zWmCSIYsjAGoJXmT899ecdfI9OJVG6e3A6pPMJHH4EgENzXYy02ZUDhHXNhJ5c9pA4dElGfT7b4Q==
761+
"@chainsafe/ssz@^1.0.2":
762+
version "1.0.2"
763+
resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-1.0.2.tgz#af09775ac1f14c19a75bfd45279f71dce67545a1"
764+
integrity sha512-T/hiLYRJoM0NkTgTc6XLIL5Nobc/poNqFnJ/8GlvG08czCcri5l8H5DF/6RKdL+1a++LRZCdtHElMaFryszkww==
765765
dependencies:
766766
"@chainsafe/as-sha256" "1.0.0"
767767
"@chainsafe/persistent-merkle-tree" "1.0.1"

0 commit comments

Comments
 (0)