Migrate from `ethereum-types` to `alloy-primitives` #6078

eserilev · 2024-07-11T14:00:29Z

Issue Addressed

partially #6022

Proposed Changes

Migrate LH from ethereum-types to alloy-primitives

Additional Info

Some of the dependencies are referencing branches from my repo. I've opened PR's that need to be merged into those repos so we can revert back to referencing the sigp repos.

I've attempted to patch in some dependencies, but quickly faced some cyclic dep issues that I was unable to resolve

…move_use_of_ethers_core

…nto remove_use_of_ethers_core

…e/lighthouse into remove_use_of_ethers_core

…move_use_of_ethers_core

This reverts commit e3ce7fc.

michaelsproul

Looks great on the whole!

I just have a couple of suggestions and then we can merge!

beacon_node/beacon_chain/src/metrics.rs

beacon_node/execution_layer/src/lib.rs

beacon_node/lighthouse_network/src/discovery/subnet_predicate.rs

beacon_node/lighthouse_network/src/peer_manager/peerdb/peer_info.rs

beacon_node/network/src/service.rs

common/eth2/src/types.rs

consensus/types/src/execution_transaction.rs

crypto/bls/src/lib.rs

testing/ef_tests/src/cases/epoch_processing.rs

testing/ef_tests/src/cases/fork_choice.rs

…grate-to-alloy-primitives

eserilev · 2024-09-01T17:41:58Z

this should be ready for another review!

Cargo.toml

michaelsproul · 2024-09-02T07:30:29Z

@mergify queue

mergify · 2024-09-02T07:30:55Z

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 99e53b8

* Remove use of ethers_core::RlpStream * Merge branch 'unstable' of https://github.com/sigp/lighthouse into remove_use_of_ethers_core * Remove old code * Simplify keccak call * Remove unused package * Merge branch 'unstable' of https://github.com/ethDreamer/lighthouse into remove_use_of_ethers_core * Merge branch 'unstable' into remove_use_of_ethers_core * Run clippy * Merge branch 'remove_use_of_ethers_core' of https://github.com/dospore/lighthouse into remove_use_of_ethers_core * Check all cargo fmt * migrate to alloy primitives init * fix deps * integrate alloy-primitives * resolve dep issues * more changes based on dep changes * add TODOs * Merge branch 'unstable' of https://github.com/sigp/lighthouse into remove_use_of_ethers_core * Revert lock * Add BeaconBlocksByRange v3 * continue migration * Revert "Add BeaconBlocksByRange v3" This reverts commit e3ce7fc. * impl hash256 extended trait * revert some uneeded diffs * merge conflict resolved * fix subnet id rshift calc * rename to FixedBytesExtended * debugging * Merge branch 'unstable' of https://github.com/sigp/lighthouse into migrate-to-alloy-primitives * fix failed test * fixing more tests * Merge branch 'unstable' of https://github.com/sigp/lighthouse into remove_use_of_ethers_core * introduce a shim to convert between the two u256 types * move alloy to wrokspace * align alloy versions * update * update web3signer test certs * refactor * resolve failing tests * linting * fix graffiti string test * fmt * fix ef test * resolve merge conflicts * remove udep and revert cert * cargo patch * cyclic dep * fix build error * Merge branch 'unstable' of https://github.com/sigp/lighthouse into migrate-to-alloy-primitives * resolve conflicts, update deps * merge unstable * fmt * fix deps * Merge branch 'unstable' of https://github.com/sigp/lighthouse into migrate-to-alloy-primitives * resolve merge conflicts * resolve conflicts, make necessary changes * Remove patch * fmt * remove file * merge conflicts * sneaking in a smol change * bump versions * Merge remote-tracking branch 'origin/unstable' into migrate-to-alloy-primitives * Updates for peerDAS * Update ethereum_hashing to prevent dupe * updated alloy-consensus, removed TODOs * cargo update * endianess fix * Merge branch 'unstable' of https://github.com/sigp/lighthouse into migrate-to-alloy-primitives * fmt * fix merge * fix test * fixed_bytes crate * minor fixes * convert u256 to i64 * panic free mixin to_low_u64_le * from_str_radix * computbe_subnet api and ensuring we use big-endian * Merge branch 'unstable' of https://github.com/sigp/lighthouse into migrate-to-alloy-primitives * fix test * Simplify subnet_id test * Simplify some more tests * Add tests to fixed_bytes crate * Merge branch 'unstable' into migrate-to-alloy-primitives

Add retropgf funding (sigp#6324) Migrate from `ethereum-types` to `alloy-primitives` (sigp#6078) * Remove use of ethers_core::RlpStream * Merge branch 'unstable' of https://github.com/sigp/lighthouse into remove_use_of_ethers_core * Remove old code * Simplify keccak call * Remove unused package * Merge branch 'unstable' of https://github.com/ethDreamer/lighthouse into remove_use_of_ethers_core * Merge branch 'unstable' into remove_use_of_ethers_core * Run clippy * Merge branch 'remove_use_of_ethers_core' of https://github.com/dospore/lighthouse into remove_use_of_ethers_core * Check all cargo fmt * migrate to alloy primitives init * fix deps * integrate alloy-primitives * resolve dep issues * more changes based on dep changes * add TODOs * Merge branch 'unstable' of https://github.com/sigp/lighthouse into remove_use_of_ethers_core * Revert lock * Add BeaconBlocksByRange v3 * continue migration * Revert "Add BeaconBlocksByRange v3" This reverts commit e3ce7fc. * impl hash256 extended trait * revert some uneeded diffs * merge conflict resolved * fix subnet id rshift calc * rename to FixedBytesExtended * debugging * Merge branch 'unstable' of https://github.com/sigp/lighthouse into migrate-to-alloy-primitives * fix failed test * fixing more tests * Merge branch 'unstable' of https://github.com/sigp/lighthouse into remove_use_of_ethers_core * introduce a shim to convert between the two u256 types * move alloy to wrokspace * align alloy versions * update * update web3signer test certs * refactor * resolve failing tests * linting * fix graffiti string test * fmt * fix ef test * resolve merge conflicts * remove udep and revert cert * cargo patch * cyclic dep * fix build error * Merge branch 'unstable' of https://github.com/sigp/lighthouse into migrate-to-alloy-primitives * resolve conflicts, update deps * merge unstable * fmt * fix deps * Merge branch 'unstable' of https://github.com/sigp/lighthouse into migrate-to-alloy-primitives * resolve merge conflicts * resolve conflicts, make necessary changes * Remove patch * fmt * remove file * merge conflicts * sneaking in a smol change * bump versions * Merge remote-tracking branch 'origin/unstable' into migrate-to-alloy-primitives * Updates for peerDAS * Update ethereum_hashing to prevent dupe * updated alloy-consensus, removed TODOs * cargo update * endianess fix * Merge branch 'unstable' of https://github.com/sigp/lighthouse into migrate-to-alloy-primitives * fmt * fix merge * fix test * fixed_bytes crate * minor fixes * convert u256 to i64 * panic free mixin to_low_u64_le * from_str_radix * computbe_subnet api and ensuring we use big-endian * Merge branch 'unstable' of https://github.com/sigp/lighthouse into migrate-to-alloy-primitives * fix test * Simplify subnet_id test * Simplify some more tests * Add tests to fixed_bytes crate * Merge branch 'unstable' into migrate-to-alloy-primitives update libp2p to version 0.54 (sigp#6249) * update libp2p to version 0.54.0 * address review * Merge branch 'unstable' of github.com:sigp/lighthouse into update-libp2p * Merge branch 'update-libp2p' of github.com:sigp/lighthouse into update-libp2p Drop block data from BlockError and BlobError (sigp#5735) * Drop block data from BlockError and BlobError * Debug release tests * Fix release tests * Revert unnecessary changes to lighthouse_metrics Update manual checkpoint sync content in Lighthouse book (sigp#6338) * Update manual checkpiont sync * Update faq * Minor revision * Minor revision Light Client Bug Fix (sigp#6299) * Light Client Bug Fix Ignore Rust 1.82 warnings about void patterns (sigp#6357) * Ignore Rust 1.82 warnings about void patterns Enable `large_stack_frames` lint (sigp#6343) * Enable `large_stack_frames` lint Add blob count label to `DATA_COLUMN_SIDECAR_COMPUTATION` metric (sigp#6340) * Add blob count label to `DATA_COLUMN_SIDECAR_COMPUTATION` metric, and move metrics into the compute function, recording only successful computation. * Move `discard_timer_on_break` usage to caller site. * Merge branch 'unstable' into compute-data-column-metric * Merge branch 'unstable' into compute-data-column-metric Metadata request ordering (sigp#6336) * Send metadata request ordering * Merge branch 'unstable' into metadata-order Clarify validator monitor block log (sigp#6342) * Clarify validator monitor block log * Merge branch 'unstable' into clarify-block-log Check known parent on rpc blob process (sigp#5893) * Check known parent on rpc blob process * fix test * Merge branch 'unstable' of https://github.com/sigp/lighthouse into blob-unknown-parent Remove beta tag from gossipsub 1.2 (sigp#6344) * Remove the beta tag from gossipsub v1.2 * fix clippy * Merge branch 'unstable' into remove-beta-tag Fix lints for Rust 1.81 (sigp#6363) * Fix lints for Rust 1.81 Use tikv-jemallocator instead of jemallocator (sigp#6354) * Use tikv-jemallocator instead of jemallocator * Merge branch 'unstable' into tikv-jemallocator * Bump tikv-jemallocator and tikv-jemalloc-ctl Improve `get_custody_columns` validation, caching and error handling (sigp#6308) * Improve `get_custody_columns` validation, caching and error handling. * Merge branch 'unstable' into get-custody-columns-error-handing * Fix failing test and add more test. * Fix failing test and add more test. * Merge branch 'unstable' into get-custody-columns-error-handing * Add unit test to make sure the default specs won't panic on the `compute_custody_requirement_subnets` function. * Add condition when calling `compute_custody_subnets_from_metadata` and update logs. * Validate `csc` when returning from enr. Remove `csc` computation on connection since we get them on metadata anyway. * Add `peers_per_custody_subnet_count` to track peer csc and supernodes. * Disconnect peers with invalid metadata and find other peers instead. * Fix sampling tests. * Merge branch 'unstable' into get-custody-columns-error-handing * Merge branch 'unstable' into get-custody-columns-error-handing Delete legacy payload reconstruction (sigp#6213) * Delete legacy payload reconstruction * Delete unneeded failing test * Merge remote-tracking branch 'origin/unstable' into remove-more-ethers * Merge remote-tracking branch 'origin/unstable' into remove-more-ethers * Cleanups simplify rpc codec logic (sigp#6304) * simplify rpc codec logic * Merge branch 'unstable' of github.com:sigp/lighthouse into simplify-rpc-codec * Merge branch 'unstable' of github.com:sigp/lighthouse into simplify-rpc-codec * Merge branch 'unstable' of github.com:sigp/lighthouse into simply-rpc-codec * Merge branch 'unstable' into simplify-rpc-codec * Merge branch 'unstable' into simplify-rpc-codec

dospore and others added 14 commits February 26, 2024 13:05

Remove use of ethers_core::RlpStream

44f2470

Merge branch 'unstable' of https://github.com/sigp/lighthouse into re…

ee1457d

…move_use_of_ethers_core

Remove old code

7b58435

Simplify keccak call

b3e4690

Remove unused package

6f3fda9

Merge branch 'unstable' of https://github.com/ethDreamer/lighthouse i…

60092e0

…nto remove_use_of_ethers_core

Merge branch 'unstable' into remove_use_of_ethers_core

d790f69

Run clippy

208bf1c

Merge branch 'remove_use_of_ethers_core' of https://github.com/dospor…

da87a2c

…e/lighthouse into remove_use_of_ethers_core

Check all cargo fmt

e882948

migrate to alloy primitives init

77f1e11

fix deps

8b118b3

integrate alloy-primitives

3e6e440

resolve dep issues

abdef93

eserilev added work-in-progress PR is a work-in-progress dependencies Pull requests that update a dependency file code-quality labels Jul 11, 2024

eserilev and others added 11 commits July 11, 2024 16:36

more changes based on dep changes

647c7b0

add TODOs

4063495

Merge branch 'unstable' of https://github.com/sigp/lighthouse into re…

ad3e50e

…move_use_of_ethers_core

Revert lock

8361d4b

Add BeaconBlocksByRange v3

e3ce7fc

continue migration

21b22de

Revert "Add BeaconBlocksByRange v3"

9f40d91

This reverts commit e3ce7fc.

impl hash256 extended trait

e9986db

revert some uneeded diffs

8966da2

merge conflict resolved

7f4d4ef

fix subnet id rshift calc

228510d

AgeManning force-pushed the unstable branch from f290c68 to 13ffdd2 Compare July 15, 2024 23:03

michaelsproul mentioned this pull request Jul 16, 2024

Remove use of ethers core #5301

Merged

fix test

4cd0268

michaelsproul requested changes Aug 30, 2024

View reviewed changes

michaelsproul added waiting-on-author The reviewer has suggested changes and awaits thier implementation. and removed ready-for-review The code is ready for review labels Aug 30, 2024

fixed_bytes crate

5162316

eserilev force-pushed the migrate-to-alloy-primitives branch from 7eb3eb9 to 5162316 Compare September 1, 2024 05:08

eserilev added 6 commits August 31, 2024 22:10

minor fixes

88c75bd

convert u256 to i64

e555728

panic free mixin to_low_u64_le

4cf9de8

from_str_radix

a7876e7

computbe_subnet api and ensuring we use big-endian

bbeb7de

Merge branch 'unstable' of https://github.com/sigp/lighthouse into mi…

4d2b3e4

…grate-to-alloy-primitives

eserilev added ready-for-review The code is ready for review and removed waiting-on-author The reviewer has suggested changes and awaits thier implementation. labels Sep 1, 2024

fix test

c36aee4

michaelsproul reviewed Sep 2, 2024

View reviewed changes

Cargo.toml Show resolved Hide resolved

michaelsproul added 4 commits September 2, 2024 10:54

Simplify subnet_id test

4967294

Simplify some more tests

4bf44c5

Add tests to fixed_bytes crate

8c83b2c

Merge branch 'unstable' into migrate-to-alloy-primitives

ee69580

michaelsproul approved these changes Sep 2, 2024

View reviewed changes

michaelsproul added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels Sep 2, 2024

mergify bot merged commit 99e53b8 into sigp:unstable Sep 2, 2024
28 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate from `ethereum-types` to `alloy-primitives` #6078

Migrate from `ethereum-types` to `alloy-primitives` #6078

eserilev commented Jul 11, 2024 •

edited

Loading

michaelsproul left a comment

eserilev commented Sep 1, 2024

michaelsproul commented Sep 2, 2024

mergify bot commented Sep 2, 2024 •

edited

Loading

Migrate from ethereum-types to alloy-primitives #6078

Migrate from ethereum-types to alloy-primitives #6078

Conversation

eserilev commented Jul 11, 2024 • edited Loading

Issue Addressed

Proposed Changes

Additional Info

michaelsproul left a comment

Choose a reason for hiding this comment

eserilev commented Sep 1, 2024

michaelsproul commented Sep 2, 2024

mergify bot commented Sep 2, 2024 • edited Loading

✅ The pull request has been merged automatically

Migrate from `ethereum-types` to `alloy-primitives` #6078

Migrate from `ethereum-types` to `alloy-primitives` #6078

eserilev commented Jul 11, 2024 •

edited

Loading

mergify bot commented Sep 2, 2024 •

edited

Loading