From fcf82c3b2466eab1a1dc15b7b8ff94d8079a2966 Mon Sep 17 00:00:00 2001 From: Matthew Keil Date: Tue, 21 Jan 2025 00:58:49 +0700 Subject: [PATCH] fix: update ssz to use non-simd on systems that do not support (#7371) * chore: update ssz to use non-simd on systems that do not support * chore: update as-sha256 and persistent-merkle-tree direct deps * chore: update yarn.lock * chore: update ssz package versions * chore: add ssz resolution stemming from sub packages of prover * chore: update yarn.lock * fix: remove resolution for ssz * chore: update yarn.lock --- packages/api/package.json | 4 +-- packages/beacon-node/package.json | 6 ++-- packages/cli/package.json | 4 +-- packages/config/package.json | 2 +- packages/db/package.json | 2 +- packages/fork-choice/package.json | 2 +- packages/light-client/package.json | 6 ++-- packages/state-transition/package.json | 8 +++--- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- packages/validator/package.json | 2 +- yarn.lock | 38 +++++++++++++------------- 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index c2234e0db5e..a1ecab9cdef 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -70,8 +70,8 @@ "check-readme": "typescript-docs-verifier" }, "dependencies": { - "@chainsafe/persistent-merkle-tree": "^0.8.0", - "@chainsafe/ssz": "^0.18.0", + "@chainsafe/persistent-merkle-tree": "^0.9.1", + "@chainsafe/ssz": "^0.19.1", "@lodestar/config": "^1.25.0", "@lodestar/params": "^1.25.0", "@lodestar/types": "^1.25.0", diff --git a/packages/beacon-node/package.json b/packages/beacon-node/package.json index 4be101ba92a..960bf1ee11d 100644 --- a/packages/beacon-node/package.json +++ b/packages/beacon-node/package.json @@ -94,17 +94,17 @@ "check-readme": "typescript-docs-verifier" }, "dependencies": { - "@chainsafe/as-sha256": "^0.5.0", + "@chainsafe/as-sha256": "^0.6.1", "@chainsafe/blst": "^2.1.0", "@chainsafe/discv5": "^9.0.0", "@chainsafe/enr": "^3.0.0", "@chainsafe/libp2p-gossipsub": "^13.0.0", "@chainsafe/libp2p-identify": "^1.0.0", "@chainsafe/libp2p-noise": "^15.0.0", - "@chainsafe/persistent-merkle-tree": "^0.8.0", + "@chainsafe/persistent-merkle-tree": "^0.9.1", "@chainsafe/prometheus-gc-stats": "^1.0.0", "@chainsafe/pubkey-index-map": "2.0.0", - "@chainsafe/ssz": "^0.18.0", + "@chainsafe/ssz": "^0.19.1", "@chainsafe/threads": "^1.11.1", "@ethersproject/abi": "^5.7.0", "@fastify/bearer-auth": "^10.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index b9d9ce7c164..6481cc930c5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -56,8 +56,8 @@ "@chainsafe/blst": "^2.1.0", "@chainsafe/discv5": "^9.0.0", "@chainsafe/enr": "^3.0.0", - "@chainsafe/persistent-merkle-tree": "^0.8.0", - "@chainsafe/ssz": "^0.18.0", + "@chainsafe/persistent-merkle-tree": "^0.9.1", + "@chainsafe/ssz": "^0.19.1", "@chainsafe/threads": "^1.11.1", "@libp2p/crypto": "^4.1.0", "@libp2p/peer-id": "^4.1.0", diff --git a/packages/config/package.json b/packages/config/package.json index 8e9047a12db..c35aeffb81d 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -64,7 +64,7 @@ "blockchain" ], "dependencies": { - "@chainsafe/ssz": "^0.18.0", + "@chainsafe/ssz": "^0.19.1", "@lodestar/params": "^1.25.0", "@lodestar/types": "^1.25.0", "@lodestar/utils": "^1.25.0" diff --git a/packages/db/package.json b/packages/db/package.json index 30cf7e6bbc2..e302520dab2 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -35,7 +35,7 @@ "check-readme": "typescript-docs-verifier" }, "dependencies": { - "@chainsafe/ssz": "^0.18.0", + "@chainsafe/ssz": "^0.19.1", "@lodestar/config": "^1.25.0", "@lodestar/utils": "^1.25.0", "classic-level": "^1.4.1", diff --git a/packages/fork-choice/package.json b/packages/fork-choice/package.json index 1102bca3c6b..f62e1f2a877 100644 --- a/packages/fork-choice/package.json +++ b/packages/fork-choice/package.json @@ -36,7 +36,7 @@ "check-readme": "typescript-docs-verifier" }, "dependencies": { - "@chainsafe/ssz": "^0.18.0", + "@chainsafe/ssz": "^0.19.1", "@lodestar/config": "^1.25.0", "@lodestar/params": "^1.25.0", "@lodestar/state-transition": "^1.25.0", diff --git a/packages/light-client/package.json b/packages/light-client/package.json index 9f408ac1cab..95dadc8110c 100644 --- a/packages/light-client/package.json +++ b/packages/light-client/package.json @@ -75,8 +75,8 @@ "dependencies": { "@chainsafe/bls": "7.1.3", "@chainsafe/blst": "^0.2.0", - "@chainsafe/persistent-merkle-tree": "^0.8.0", - "@chainsafe/ssz": "^0.18.0", + "@chainsafe/persistent-merkle-tree": "^0.9.1", + "@chainsafe/ssz": "^0.19.1", "@lodestar/api": "^1.25.0", "@lodestar/config": "^1.25.0", "@lodestar/params": "^1.25.0", @@ -85,7 +85,7 @@ "mitt": "^3.0.0" }, "devDependencies": { - "@chainsafe/as-sha256": "^0.5.0", + "@chainsafe/as-sha256": "^0.6.1", "@types/qs": "^6.9.7", "fastify": "^5.0.0", "qs": "^6.11.1", diff --git a/packages/state-transition/package.json b/packages/state-transition/package.json index 38c22e84d56..db142ffd24f 100644 --- a/packages/state-transition/package.json +++ b/packages/state-transition/package.json @@ -58,12 +58,12 @@ }, "types": "lib/index.d.ts", "dependencies": { - "@chainsafe/as-sha256": "^0.5.0", + "@chainsafe/as-sha256": "^0.6.1", "@chainsafe/blst": "^2.1.0", - "@chainsafe/persistent-merkle-tree": "^0.8.0", - "@chainsafe/persistent-ts": "^0.19.1", + "@chainsafe/persistent-merkle-tree": "^0.9.1", + "@chainsafe/persistent-ts": "^0.19.2", "@chainsafe/pubkey-index-map": "2.0.0", - "@chainsafe/ssz": "^0.18.0", + "@chainsafe/ssz": "^0.19.1", "@chainsafe/swap-or-not-shuffle": "^0.0.2", "@lodestar/config": "^1.25.0", "@lodestar/params": "^1.25.0", diff --git a/packages/types/package.json b/packages/types/package.json index 6db16772d3f..77f0f2e6e38 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -73,7 +73,7 @@ }, "types": "lib/index.d.ts", "dependencies": { - "@chainsafe/ssz": "^0.18.0", + "@chainsafe/ssz": "^0.19.1", "@lodestar/params": "^1.25.0", "ethereum-cryptography": "^2.0.0" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index 4180998f2ca..c8cf3a50219 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -39,7 +39,7 @@ }, "types": "lib/index.d.ts", "dependencies": { - "@chainsafe/as-sha256": "^0.5.0", + "@chainsafe/as-sha256": "^0.6.1", "any-signal": "3.0.1", "bigint-buffer": "^1.1.5", "case": "^1.6.3", diff --git a/packages/validator/package.json b/packages/validator/package.json index c71c6b68872..72940759ecb 100644 --- a/packages/validator/package.json +++ b/packages/validator/package.json @@ -46,7 +46,7 @@ ], "dependencies": { "@chainsafe/blst": "^2.1.0", - "@chainsafe/ssz": "^0.18.0", + "@chainsafe/ssz": "^0.19.1", "@lodestar/api": "^1.25.0", "@lodestar/config": "^1.25.0", "@lodestar/db": "^1.25.0", diff --git a/yarn.lock b/yarn.lock index 60ff9034fd6..ab6fa59fbdf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -357,10 +357,10 @@ resolved "https://registry.yarnpkg.com/@chainsafe/as-chacha20poly1305/-/as-chacha20poly1305-0.1.0.tgz#7da6f8796f9b42dac6e830a086d964f1f9189e09" integrity sha512-BpNcL8/lji/GM3+vZ/bgRWqJ1q5kwvTFmGPk7pxm/QQZDbaMI98waOHjEymTjq2JmdD/INdNBFOVSyJofXg7ew== -"@chainsafe/as-sha256@0.5.0", "@chainsafe/as-sha256@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@chainsafe/as-sha256/-/as-sha256-0.5.0.tgz#2523fbef2b80b5000f9aa71f4a76e5c2c5c076bb" - integrity sha512-dTIY6oUZNdC5yDTVP5Qc9hAlKAsn0QTQ2DnQvvsbTnKSTbYs3p5RPN0aIUqN0liXei/9h24c7V0dkV44cnWIQA== +"@chainsafe/as-sha256@0.6.1", "@chainsafe/as-sha256@^0.6.1": + version "0.6.1" + resolved "https://registry.yarnpkg.com/@chainsafe/as-sha256/-/as-sha256-0.6.1.tgz#0643cf699118f2a0db6d8ce6e8d68fe7c5084158" + integrity sha512-bYDOK5aK7NYE/ZZ/A3C+Q8ZrEWdzpH80fcEotjgX3pmntv3SJfOTTYE53mjnPSEZFlv/rST0H/ZETsz8Wab9iw== "@chainsafe/as-sha256@^0.4.1": version "0.4.1" @@ -595,12 +595,12 @@ dependencies: "@chainsafe/is-ip" "^2.0.1" -"@chainsafe/persistent-merkle-tree@0.8.0", "@chainsafe/persistent-merkle-tree@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.8.0.tgz#18e2f0a5de3a0b59c6e5be8797a78e0d209dd7dc" - integrity sha512-hh6C1JO6SKlr0QGNTNtTLqgGVMA/Bc20wD6CeMHp+wqbFKCULRJuBUxhF4WDx/7mX8QlqF3nFriF/Eo8oYJ4/A== +"@chainsafe/persistent-merkle-tree@0.9.1", "@chainsafe/persistent-merkle-tree@^0.9.1": + version "0.9.1" + resolved "https://registry.yarnpkg.com/@chainsafe/persistent-merkle-tree/-/persistent-merkle-tree-0.9.1.tgz#fd29d36381f53e1d04c3ffbbb92eb91a9f460f96" + integrity sha512-UVMKbWcKr1Y56qgy6m1W4peUaCwwsn/W2Vd5Ffu7Tb9lMW80q0IaW7e97jvyWd2SDfqVQ1p2XP4bBj6WAcfZvg== dependencies: - "@chainsafe/as-sha256" "0.5.0" + "@chainsafe/as-sha256" "0.6.1" "@chainsafe/hashtree" "1.0.1" "@noble/hashes" "^1.3.0" @@ -612,10 +612,10 @@ "@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" - integrity sha512-fUFFFFxdcpYkMAHnjm83EYL/R/smtVmEkJr3FGSI6dwPk4ue9rXjEHf7FTd3V8AbVOcTJGriN4cYf2V+HOYkjQ== +"@chainsafe/persistent-ts@^0.19.2": + version "0.19.2" + resolved "https://registry.yarnpkg.com/@chainsafe/persistent-ts/-/persistent-ts-0.19.2.tgz#f7da892b76f5a159d568bacd96563c2c56c3e99c" + integrity sha512-CFz1jniPezZJmrPdYkm1wbCj7+H0yWfrAs4qE4HJ3ZWWqcTu3KQWgqUVZ7J4WGxuYU9HAXJSYsO3xtAqHWm8YQ== "@chainsafe/prometheus-gc-stats@^1.0.0": version "1.0.2" @@ -666,13 +666,13 @@ "@chainsafe/as-sha256" "^0.4.1" "@chainsafe/persistent-merkle-tree" "^0.6.1" -"@chainsafe/ssz@^0.18.0": - version "0.18.0" - resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.18.0.tgz#773d40df9dff3b6a2a4c6685d9797abceb9d36f7" - integrity sha512-1ikTjk3JK6+fsGWiT5IvQU0AP6gF3fDzGmPfkKthbcbgTUR8fjB83Ywp9ko/ZoiDGfrSFkATgT4hvRzclu0IAA== +"@chainsafe/ssz@^0.19.1": + version "0.19.1" + resolved "https://registry.yarnpkg.com/@chainsafe/ssz/-/ssz-0.19.1.tgz#e6f88561cf83204d23a401cb8f4344eedcbcbae4" + integrity sha512-LsEx6vbQPxNG3ydjabjIHcvhbW6GvugTw2tAIB39mmLNIsbYk1YUdskHHsM29+Oe3937ekdk2NZpo3QHye5zJA== dependencies: - "@chainsafe/as-sha256" "0.5.0" - "@chainsafe/persistent-merkle-tree" "0.8.0" + "@chainsafe/as-sha256" "0.6.1" + "@chainsafe/persistent-merkle-tree" "0.9.1" "@chainsafe/swap-or-not-shuffle-darwin-arm64@0.0.2": version "0.0.2"