Skip to content

Commit

Permalink
Merge 7da5063 into 57127cc
Browse files Browse the repository at this point in the history
  • Loading branch information
@twoeths
twoeths committed Mar 18, 2024
2 parents 57127cc + 7da5063 commit 9ed3e15
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 21 deletions.
4 changes: 2 additions & 2 deletions packages/api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
"check-readme": "typescript-docs-verifier"
},
"dependencies": {
"@chainsafe/persistent-merkle-tree": "^0.6.1",
"@chainsafe/ssz": "^0.14.3",
"@chainsafe/persistent-merkle-tree": "^0.7.1",
"@chainsafe/ssz": "^0.15.1",
"@lodestar/config": "^1.17.0",
"@lodestar/params": "^1.17.0",
"@lodestar/types": "^1.17.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/beacon-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@
"@chainsafe/libp2p-gossipsub": "^11.2.1",
"@chainsafe/libp2p-identify": "^1.0.0",
"@chainsafe/libp2p-noise": "^14.1.0",
"@chainsafe/persistent-merkle-tree": "^0.6.1",
"@chainsafe/persistent-merkle-tree": "^0.7.1",
"@chainsafe/prometheus-gc-stats": "^1.0.0",
"@chainsafe/ssz": "^0.14.3",
"@chainsafe/ssz": "^0.15.1",
"@chainsafe/threads": "^1.11.1",
"@ethersproject/abi": "^5.7.0",
"@fastify/bearer-auth": "^9.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"@chainsafe/blst": "^0.2.10",
"@chainsafe/discv5": "^9.0.0",
"@chainsafe/enr": "^3.0.0",
"@chainsafe/persistent-merkle-tree": "^0.6.1",
"@chainsafe/ssz": "^0.14.3",
"@chainsafe/persistent-merkle-tree": "^0.7.1",
"@chainsafe/ssz": "^0.15.1",
"@chainsafe/threads": "^1.11.1",
"@libp2p/crypto": "^3.0.4",
"@libp2p/peer-id": "^4.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/config/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"blockchain"
],
"dependencies": {
"@chainsafe/ssz": "^0.14.3",
"@chainsafe/ssz": "^0.15.1",
"@lodestar/params": "^1.17.0",
"@lodestar/types": "^1.17.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/db/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"check-readme": "typescript-docs-verifier"
},
"dependencies": {
"@chainsafe/ssz": "^0.14.3",
"@chainsafe/ssz": "^0.15.1",
"@lodestar/config": "^1.17.0",
"@lodestar/utils": "^1.17.0",
"it-all": "^3.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/fork-choice/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"check-readme": "typescript-docs-verifier"
},
"dependencies": {
"@chainsafe/ssz": "^0.14.3",
"@chainsafe/ssz": "^0.15.1",
"@lodestar/config": "^1.17.0",
"@lodestar/params": "^1.17.0",
"@lodestar/state-transition": "^1.17.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/light-client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
},
"dependencies": {
"@chainsafe/bls": "7.1.3",
"@chainsafe/persistent-merkle-tree": "^0.6.1",
"@chainsafe/ssz": "^0.14.3",
"@chainsafe/persistent-merkle-tree": "^0.7.1",
"@chainsafe/ssz": "^0.15.1",
"@lodestar/api": "^1.17.0",
"@lodestar/config": "^1.17.0",
"@lodestar/params": "^1.17.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/state-transition/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
"@chainsafe/as-sha256": "^0.4.1",
"@chainsafe/bls": "7.1.3",
"@chainsafe/blst": "^0.2.10",
"@chainsafe/persistent-merkle-tree": "^0.6.1",
"@chainsafe/persistent-merkle-tree": "^0.7.1",
"@chainsafe/persistent-ts": "^0.19.1",
"@chainsafe/ssz": "^0.14.3",
"@chainsafe/ssz": "^0.15.1",
"@lodestar/config": "^1.17.0",
"@lodestar/params": "^1.17.0",
"@lodestar/types": "^1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
},
"types": "lib/index.d.ts",
"dependencies": {
"@chainsafe/ssz": "^0.14.3",
"@chainsafe/ssz": "^0.15.1",
"@lodestar/params": "^1.17.0",
"ethereum-cryptography": "^2.0.0"
},
Expand Down
4 changes: 3 additions & 1 deletion packages/types/src/phase0/sszTypes.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
ListBasicType,
ListCompositeType,
VectorBasicType,
ListUintNum64Type,
VectorCompositeType,
} from "@chainsafe/ssz";
import {
Expand Down Expand Up @@ -245,7 +246,8 @@ export const Validator = ValidatorNodeStruct;

// Export as stand-alone for direct tree optimizations
export const Validators = new ListCompositeType(ValidatorNodeStruct, VALIDATOR_REGISTRY_LIMIT);
export const Balances = new ListBasicType(UintNum64, VALIDATOR_REGISTRY_LIMIT);
// this ListUintNum64Type is used to cache Leaf Nodes of BeaconState.balances after epoch transition
export const Balances = new ListUintNum64Type(VALIDATOR_REGISTRY_LIMIT);
export const RandaoMixes = new VectorCompositeType(Bytes32, EPOCHS_PER_HISTORICAL_VECTOR);
/**
* This is initially a Gwei (BigInt) vector, however since Nov 2023 it's converted to UintNum64 (number) vector in the state transition because:
Expand Down
2 changes: 1 addition & 1 deletion packages/validator/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
],
"dependencies": {
"@chainsafe/bls": "7.1.3",
"@chainsafe/ssz": "^0.14.3",
"@chainsafe/ssz": "^0.15.1",
"@lodestar/api": "^1.17.0",
"@lodestar/config": "^1.17.0",
"@lodestar/db": "^1.17.0",
Expand Down
18 changes: 13 additions & 5 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,14 @@
"@chainsafe/as-sha256" "^0.4.1"
"@noble/hashes" "^1.3.0"

"@chainsafe/persistent-merkle-tree@^0.7.1":
version "0.7.1"
resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.7.1.tgz#bfe6b3f4296ed3a578bb4fe69f9a7c232822a1dc"
integrity sha512-GUomb8DgkbHyKVBoLY9wMBe67oyAK9HKMjPImIocGOJuwqqxvDbVwh/ihdzyOrhEyhISqD/TxhCBDEXzLM52Vg==
dependencies:
"@chainsafe/as-sha256" "^0.4.1"
"@noble/hashes" "^1.3.0"

"@chainsafe/persistent-ts@^0.19.1":
version "0.19.1"
resolved "https://registry.npmjs.org/@chainsafe/persistent-ts/-/persistent-ts-0.19.1.tgz"
Expand All @@ -465,13 +473,13 @@
"@chainsafe/as-sha256" "^0.4.1"
"@chainsafe/persistent-merkle-tree" "^0.6.1"

"@chainsafe/ssz@^0.14.3":
version "0.14.3"
resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.14.3.tgz#caae48ae2670b2f8b6febed22b0e0619a636f316"
integrity sha512-ldOx4Rk9OC8YMvFdwvHKtRc7KpFRLcXlb9ATCdQ5fHtLT438LRQyxdWFufC9+M8jFHSZcgq31h2BJsSva6sZ0w==
"@chainsafe/ssz@^0.15.1":
version "0.15.1"
resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.15.1.tgz#008a711c3bcdc0d207cd4be15108870b0b1c60c0"
integrity sha512-f09UKTyYwWA1nr1BwrwsFpkXMspDDIZtwWXK1pM5mpPMnexmuPVstnN+P0M4YJ2aHcfqJXG7QOqnOwGj5Z7bUw==
dependencies:
"@chainsafe/as-sha256" "^0.4.1"
"@chainsafe/persistent-merkle-tree" "^0.6.1"
"@chainsafe/persistent-merkle-tree" "^0.7.1"

"@chainsafe/threads@^1.11.1":
version "1.11.1"
Expand Down

0 comments on commit 9ed3e15

Please sign in to comment.