chore(reth116): Ugly dirty yolo attempt at reth 1.1.6 update. #370
+282
−394
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📝 Summary
This was just a quick test for me to see how bad the update to 1.1.6 will be now that we are on 1.1.5 (note that 1.1.6 hasn't been released yet, and we don't know what the final version needed for pectra will be).
My focus was on getting things to compile vs. changing method/trait signatures, so opted for
.clone()
etc as the quick and dirty way, obviously it'd be much better foruse to refactor our code to work around the upstream changes where possible.💡 Motivation and Context
Making sure we can reasonably update to the final epctra release without major surprises.
A non-exhaustive list of what's changed upstream:
tx.hash() -> TxHash
is removed in favor oftx.tx_hash() -> &TxHash
so we need to either change our code to use references or add a bunch of.clones()
CfgEnv
andBlockEnv
arguments now instead take a&EvmEnv
e.g.SystemCaller.pre_block_blockhashes_contract_call
. We might want to change our context to hold aEvmEnv
instead of.initialized_cfg/.block_env
. For now I used an ugly clone/into monstrosity.TransactionSignedEcRecovered
is marked deprecated in favor ofRecovered<TransactionSigned>
so generates a couple pages of deprecated warnings when buildingoptimism
feature onreth/primitives
crate any more, removing it from rbuilder Cargo.toml seemed to work (with caveat about other build errors possibly blocking it)It still doesn't compile, here's what's left to fix:
cargo build
output:✅ I have completed the following steps:
make lint
make test