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.

Sign up for GitHub

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

Jump to bottom

[4844] wip - added versioned hashes checking #5520

Closed
wants to merge 53 commits into from
Closed

[4844] wip - added versioned hashes checking #5520

wants to merge 53 commits into from

Conversation

macfarla
Copy link
Contributor

refs #5487
still TBD whether this is added to V2 or V3.

gezero and others added 30 commits May 24, 2023 08:15
@gezero @jflo
SSZ - encoding (hyperledger#4979)
60be8c0 
* Adding preliminary SSZ encoding/decoding of Transaction Network Payload

* Adding ssz snapshot jar, delete it before moving to main

also removing licenses....

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
(cherry picked from commit bd147e0)
(cherry picked from commit 4e19926eb7b85fda7d40a0f565d46c0d9b27075d)
@gezero @jflo
verfifying kzg proof (hyperledger#4994)
6fef25a 
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
(cherry picked from commit 8e3a912)
(cherry picked from commit c325682b0f8acadc411acd6daafb55f5941785a0)
@jflo
4844 engine api (hyperledger#4991)
36577b6 
* json container for getting blob bundles
* spdx headers, formatting, npe fix

Signed-off-by: Justin Florentine <justin+github@florentine.us>
Co-authored-by: Jason Frame <jason.frame@consensys.net>
Co-authored-by: garyschulte <garyschulte@gmail.com>
(cherry picked from commit 5fa9433)
(cherry picked from commit af8466f1561b4d5995bfa85782acee0644c3f879)
@fab-10 @jflo
[Interop-4844] Data gas accounting (hyperledger#4998)
332fb08 
merge of hyperledger#4992 into interop feature branch

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
(cherry picked from commit 949e3fe)
(cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)
@gezero @jflo
Adding trace logs to mention ssz transaction encoding/deconding in lo…
573a942 
…gs (hyperledger#5003)

* Adding trace logs to mention ssz transaction encoding/deconding in logs
* ssz encoding should go int keccak256 of blob transaction

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
(cherry picked from commit d92909f)
(cherry picked from commit 42ba8192139c1f4fabad40e3085e158ca99a9156)
@gezero @jflo
adding test for nonblob blob transaction (hyperledger#5008)
bf73985 
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
(cherry picked from commit 6085b23)
(cherry picked from commit d2d761b389ea811a7d62b26c6af7e74bb1c15564)
@fab-10 @jflo
Blob tx network size and hash (hyperledger#5015)
6c24554 
* adding test for nonblob blob transaction
* Adapt hash and network size computation for blob txs

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Co-authored-by: Justin Florentine <justin+github@florentine.us>
Signed-off-by: Justin Florentine <justin+github@florentine.us>
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
(cherry picked from commit fd427d4)
(cherry picked from commit 28e8d18130cebe1e2835e299f6df2079f2351925)
@fab-10 @jflo
Consumed data gas receipt fix (hyperledger#5018)
9eec66b 
* adding test for nonblob blob transaction
* Do not add consumed data gas to gas used in the transaction receipt

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com>
(cherry picked from commit b13583a)
(cherry picked from commit 5993c03220891b2d233c6957fb2fc47b5685de71)
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
ffb36cb 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
@fab-10 @jflo
Fix getBloblsBundleV1 response (hyperledger#5049)
adf1da6 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
(cherry picked from commit 94e1141)
(cherry picked from commit 95e23f341006ec98898643610716f24b5725ec35)
@fab-10 @jflo
Fix GetBlobBundleV1 response (hyperledger#5075)
f9ea8be 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
(cherry picked from commit 031db82)
(cherry picked from commit de9875b00e72c018603885fa3c68142e828d9a06)
@fab-10 @jflo
4844: read blobs as raw bytes not as unit256 and fix blob versioned h…
ffb6e96 
…ashes validation (hyperledger#5071)

* Fix: read blobs as raw bytes not as unit256

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Do not load a trusted setup more than once

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Update evm/src/main/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompiledContract.java

Co-authored-by: Justin Florentine <justin+github@florentine.us>
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Ignore tests that fails due to mixing c-kzg presets

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Revert failing unit test

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

---------

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Co-authored-by: Justin Florentine <justin+github@florentine.us>
(cherry picked from commit cd67140)
(cherry picked from commit 25691b172113d4410fe55adc9271aa4a093f419a)
@fab-10 @jflo
Temporary embed devnet 4 trusted setup until a configuration option i…
2badf77 
…s available (hyperledger#5091)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
(cherry picked from commit 38c3988)
(cherry picked from commit 09849be01c9aa66d9733bd2f847825c988deb891)
@jflo
update verification for tuweni ssz
acc4956 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
(cherry picked from commit c8d18188bb5e6087c84ff446b086e74ef64cb652)
@jflo
passing tests up till SSL stuff
44d4228 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
(cherry picked from commit 38546f87e260da38de0a27652c7f4f85c42b9ad9)
@jflo
updated from main
a4503c6 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
made hardforks optional
a483981 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
new tx type got lost
00cfc5a 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
fixes wrong encoding method on persisting to RocksDB
b3cd177 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
extend correct parent gas calc
ffd383d 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
spotless
1146309 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
plugin api version
1f308be 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@gezero @jflo
SSZ - encoding (hyperledger#4979)
2716b85 
* Adding preliminary SSZ encoding/decoding of Transaction Network Payload

* Adding ssz snapshot jar, delete it before moving to main

also removing licenses....

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
(cherry picked from commit bd147e0)
(cherry picked from commit 4e19926eb7b85fda7d40a0f565d46c0d9b27075d)
@gezero @jflo
verfifying kzg proof (hyperledger#4994)
e9644ff 
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
(cherry picked from commit 8e3a912)
(cherry picked from commit c325682b0f8acadc411acd6daafb55f5941785a0)
@jflo
4844 engine api (hyperledger#4991)
8b37cfd 
* json container for getting blob bundles
* spdx headers, formatting, npe fix

Signed-off-by: Justin Florentine <justin+github@florentine.us>
Co-authored-by: Jason Frame <jason.frame@consensys.net>
Co-authored-by: garyschulte <garyschulte@gmail.com>
(cherry picked from commit 5fa9433)
(cherry picked from commit af8466f1561b4d5995bfa85782acee0644c3f879)
@fab-10 @jflo
[Interop-4844] Data gas accounting (hyperledger#4998)
16b2427 
merge of hyperledger#4992 into interop feature branch

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
(cherry picked from commit 949e3fe)
(cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)
@gezero @jflo
Adding trace logs to mention ssz transaction encoding/deconding in lo…
c208bd2 
…gs (hyperledger#5003)

* Adding trace logs to mention ssz transaction encoding/deconding in logs
* ssz encoding should go int keccak256 of blob transaction

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
(cherry picked from commit d92909f)
(cherry picked from commit 42ba8192139c1f4fabad40e3085e158ca99a9156)
@gezero @jflo
adding test for nonblob blob transaction (hyperledger#5008)
6ef302a 
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
(cherry picked from commit 6085b23)
(cherry picked from commit d2d761b389ea811a7d62b26c6af7e74bb1c15564)
@fab-10 @jflo
Blob tx network size and hash (hyperledger#5015)
a4abc7f 
* adding test for nonblob blob transaction
* Adapt hash and network size computation for blob txs

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Co-authored-by: Justin Florentine <justin+github@florentine.us>
Signed-off-by: Justin Florentine <justin+github@florentine.us>
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
(cherry picked from commit fd427d4)
(cherry picked from commit 28e8d18130cebe1e2835e299f6df2079f2351925)
@fab-10 @jflo
Consumed data gas receipt fix (hyperledger#5018)
fa3f6c9 
* adding test for nonblob blob transaction
* Do not add consumed data gas to gas used in the transaction receipt

Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com>
(cherry picked from commit b13583a)
(cherry picked from commit 5993c03220891b2d233c6957fb2fc47b5685de71)
fab-10 and others added 22 commits May 24, 2023 08:15
@fab-10 @jflo
Fix getBloblsBundleV1 response (hyperledger#5049)
ef3fdf4 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
(cherry picked from commit 94e1141)
(cherry picked from commit 95e23f341006ec98898643610716f24b5725ec35)
@fab-10 @jflo
Fix GetBlobBundleV1 response (hyperledger#5075)
2f877c2 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
(cherry picked from commit 031db82)
(cherry picked from commit de9875b00e72c018603885fa3c68142e828d9a06)
@fab-10 @jflo
4844: read blobs as raw bytes not as unit256 and fix blob versioned h…
1e779f1 
…ashes validation (hyperledger#5071)

* Fix: read blobs as raw bytes not as unit256

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Do not load a trusted setup more than once

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Update evm/src/main/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompiledContract.java

Co-authored-by: Justin Florentine <justin+github@florentine.us>
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Ignore tests that fails due to mixing c-kzg presets

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Revert failing unit test

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

---------

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Co-authored-by: Justin Florentine <justin+github@florentine.us>
(cherry picked from commit cd67140)
(cherry picked from commit 25691b172113d4410fe55adc9271aa4a093f419a)
@jflo
passing tests up till SSL stuff
4df6fdc 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
(cherry picked from commit 38546f87e260da38de0a27652c7f4f85c42b9ad9)
@jflo
updated from main
ef21b1c 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
made hardforks optional
97b70b9 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
new tx type got lost
c2aaa72 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
fixes wrong encoding method on persisting to RocksDB
c1f19c2 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
spotless
669c54b 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
toString updates
1298ffb 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
update sigs
3ab84ae 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
adds test coverage for broken transaction root calc on block 62717 fr…
4a97dae 
…om 4844-devnet-5

Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
workaround for incorrect SSZ implementation for BytesList[]
0b389d2 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
block validation test coverage for cancun, handle blob transactions w…
832cb2d 
…ithout a to

Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
test fixup
24064b3 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
should run like the other txs
b47d6db 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
goldarn fuzzer
3ab97e4 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
correct optional handling
a351daa 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@jflo
pass versionedHashes to child frames
2a26fb1 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@gfukushima @jflo
add proofs to blobs bundle
17c66da 
Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
@jflo
cherrypicked in blob decoupling
63f1684 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
@macfarla
wip - added versioned hashes checking
cce26f7 
Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
@macfarla macfarla marked this pull request as draft May 31, 2023 20:42
@macfarla macfarla changed the title wip - added versioned hashes checking [4844] wip - added versioned hashes checking May 31, 2023
jflo
jflo approved these changes Jun 5, 2023
View reviewed changes
Copy link
Contributor

@jflo jflo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would you mind rebasing pls? 4844-devnet-5b has been updated from main and is passing unittests. Pr looks great and can be merged in to interop branch asap.

@macfarla
Copy link
Contributor Author

macfarla commented Jun 8, 2023

cherry-picked commit into #5546

@macfarla macfarla closed this Jun 8, 2023
@macfarla macfarla deleted the versioned-hashes branch June 22, 2023 01:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jflo jflo jflo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@macfarla @jflo @gezero @fab-10 @gfukushima