Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Withdrawals and timestamp #4758

Closed
wants to merge 52 commits into from

Conversation

jframe
Copy link
Contributor

@jframe jframe commented Dec 1, 2022

PR description

DO NOT MERGE

Test branch for withdrawals & timestamp protocol schedule changes

Fixed Issue(s)

Documentation

  • I thought about documentation and added the doc-change-required label to this PR if
    updates are required.

Changelog

@JsonProperty("prevRandao") final String prevRandao,
@JsonProperty("suggestedFeeRecipient") final String suggestedFeeRecipient,
@JsonProperty("withdrawals") final List<WithdrawalParameter> withdrawals) {
this.timestamp = Long.decode(timestamp);

Check notice

Code scanning / CodeQL

Missing catch of NumberFormatException

Potential uncaught 'java.lang.NumberFormatException'.
gezero and others added 26 commits December 19, 2022 13:08
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Now getting Invalid block RLP while validating block during prepareBlock

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
…hortHexString)

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
This is probably temporary measure and we will need to detect the block using a timestamp in the future
The shanghai.json is useless probably now

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
…pella.

This commit might break post-shanghai V2 until I switch the validation depending on the fork.

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Hacky pre/post shanghai validation

Serialize UInt64 toQuantityHexString instead of toShortHexString so 0 is returned as "0x0" instead of "0x"

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
…t contain null withdrawals

This means shanghai can be activated before capella which makes devnets a lot smoother, rather than having to perfectly align capella timestamp with shanghaiBlock

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
…n rules

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
jframe and others added 18 commits December 19, 2022 14:23
…bled at genesis

Signed-off-by: Jason Frame <jason.frame@consensys.net>
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
Add cancun timestamp and definition so getByTimestamp can be tested for correct ordering

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
…idator to use getByBlockHeader

Signed-off-by: Jason Frame <jason.frame@consensys.net>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
…called in reality though

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@siladu
Copy link
Contributor

siladu commented Dec 19, 2022

merged in main with the shanghaiTime code. This is now a more accurate and up-to-date Withdrawals WIP than #4552

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
@siladu siladu mentioned this pull request Dec 21, 2022
…lock (as well as BlockBodies)

Suspect the code path that receives blocks from EL peers isn't writing withdrawals to disk

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
…dule and enable shanghai

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
… other mods in

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
@siladu siladu mentioned this pull request Jan 4, 2023
27 tasks
@siladu siladu mentioned this pull request Jan 14, 2023
@jframe jframe closed this Jan 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants