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

Add dataGasUsed and dataGasPrice to receipts for 4844 txs #15

Closed
wants to merge 77 commits into from
Closed

Add dataGasUsed and dataGasPrice to receipts for 4844 txs #15

wants to merge 77 commits into from

Conversation

Gabriel-Trintinalia
Copy link
Collaborator

PR description

Add dataGasUsed and dataGasPrice to receipts for 4844 txs

Fixed Issue(s)

hyperledger#5489

gezero and others added 30 commits May 31, 2023 09:38
@gezero @jflo
SSZ - encoding (hyperledger#4979)
c59908a 
* 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 <[email protected]>
(cherry picked from commit bd147e0)
(cherry picked from commit 4e19926eb7b85fda7d40a0f565d46c0d9b27075d)
@gezero @jflo
verfifying kzg proof (hyperledger#4994)
81224fb 
Signed-off-by: Jiri Peinlich <[email protected]>
(cherry picked from commit 8e3a912)
(cherry picked from commit c325682b0f8acadc411acd6daafb55f5941785a0)
@jflo
4844 engine api (hyperledger#4991)
bf2ca41 
* json container for getting blob bundles
* spdx headers, formatting, npe fix

Signed-off-by: Justin Florentine <[email protected]>
Co-authored-by: Jason Frame <[email protected]>
Co-authored-by: garyschulte <[email protected]>
(cherry picked from commit 5fa9433)
(cherry picked from commit af8466f1561b4d5995bfa85782acee0644c3f879)
@fab-10 @jflo
[Interop-4844] Data gas accounting (hyperledger#4998)
2c80651 
merge of hyperledger#4992 into interop feature branch

Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit 949e3fe)
(cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)
@gezero @jflo
Adding trace logs to mention ssz transaction encoding/deconding in lo…
3679c96 
…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 <[email protected]>
(cherry picked from commit d92909f)
(cherry picked from commit 42ba8192139c1f4fabad40e3085e158ca99a9156)
@gezero @jflo
adding test for nonblob blob transaction (hyperledger#5008)
2807b0a 
Signed-off-by: Jiri Peinlich <[email protected]>

Signed-off-by: Jiri Peinlich <[email protected]>
Co-authored-by: Sally MacFarlane <[email protected]>
(cherry picked from commit 6085b23)
(cherry picked from commit d2d761b389ea811a7d62b26c6af7e74bb1c15564)
@fab-10 @jflo
Blob tx network size and hash (hyperledger#5015)
8e6de49 
* adding test for nonblob blob transaction
* Adapt hash and network size computation for blob txs

Signed-off-by: Fabio Di Fabio <[email protected]>
Co-authored-by: Jiri Peinlich <[email protected]>
Co-authored-by: Justin Florentine <[email protected]>
Signed-off-by: Justin Florentine <[email protected]>
Signed-off-by: Jiri Peinlich <[email protected]>
(cherry picked from commit fd427d4)
(cherry picked from commit 28e8d18130cebe1e2835e299f6df2079f2351925)
@fab-10 @jflo
Consumed data gas receipt fix (hyperledger#5018)
1c959db 
* adding test for nonblob blob transaction
* Do not add consumed data gas to gas used in the transaction receipt

Signed-off-by: Jiri Peinlich <[email protected]>
Signed-off-by: Fabio Di Fabio <[email protected]>
Co-authored-by: Jiri Peinlich <[email protected]>
(cherry picked from commit b13583a)
(cherry picked from commit 5993c03220891b2d233c6957fb2fc47b5685de71)
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
8918139 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
@fab-10 @jflo
Fix getBloblsBundleV1 response (hyperledger#5049)
58fe2bc 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit 94e1141)
(cherry picked from commit 95e23f341006ec98898643610716f24b5725ec35)
@fab-10 @jflo
Fix GetBlobBundleV1 response (hyperledger#5075)
1022a73 
Signed-off-by: Fabio Di Fabio <[email protected]>
(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…
0ff54f4 
…ashes validation (hyperledger#5071)

* Fix: read blobs as raw bytes not as unit256

Signed-off-by: Fabio Di Fabio <[email protected]>

* Do not load a trusted setup more than once

Signed-off-by: Fabio Di Fabio <[email protected]>

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

Co-authored-by: Justin Florentine <[email protected]>
Signed-off-by: Fabio Di Fabio <[email protected]>

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

Signed-off-by: Fabio Di Fabio <[email protected]>

* Revert failing unit test

Signed-off-by: Fabio Di Fabio <[email protected]>

---------

Signed-off-by: Fabio Di Fabio <[email protected]>
Co-authored-by: Justin Florentine <[email protected]>
(cherry picked from commit cd67140)
(cherry picked from commit 25691b172113d4410fe55adc9271aa4a093f419a)
@fab-10 @jflo
Temporary embed devnet 4 trusted setup until a configuration option i…
c4bb880 
…s available (hyperledger#5091)

Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit 38c3988)
(cherry picked from commit 09849be01c9aa66d9733bd2f847825c988deb891)
@jflo
update verification for tuweni ssz
047669c 
Signed-off-by: Justin Florentine <[email protected]>
(cherry picked from commit c8d18188bb5e6087c84ff446b086e74ef64cb652)
@jflo
passing tests up till SSL stuff
f27ec34 
Signed-off-by: Justin Florentine <[email protected]>
(cherry picked from commit 38546f87e260da38de0a27652c7f4f85c42b9ad9)
@jflo
updated from main
9c1f820 
Signed-off-by: Justin Florentine <[email protected]>
@jflo
made hardforks optional
90c2c92 
Signed-off-by: Justin Florentine <[email protected]>
@jflo
new tx type got lost
7dabcd3 
Signed-off-by: Justin Florentine <[email protected]>
@jflo
fixes wrong encoding method on persisting to RocksDB
304db38 
Signed-off-by: Justin Florentine <[email protected]>
@jflo
extend correct parent gas calc
ea12a94 
Signed-off-by: Justin Florentine <[email protected]>
@jflo
spotless
807254a 
Signed-off-by: Justin Florentine <[email protected]>
@jflo
plugin api version
bcec730 
Signed-off-by: Justin Florentine <[email protected]>
@gezero @jflo
SSZ - encoding (hyperledger#4979)
6ad7041 
* 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 <[email protected]>
(cherry picked from commit bd147e0)
(cherry picked from commit 4e19926eb7b85fda7d40a0f565d46c0d9b27075d)
@gezero @jflo
verfifying kzg proof (hyperledger#4994)
083e8d3 
Signed-off-by: Jiri Peinlich <[email protected]>
(cherry picked from commit 8e3a912)
(cherry picked from commit c325682b0f8acadc411acd6daafb55f5941785a0)
@jflo
4844 engine api (hyperledger#4991)
d3a9462 
* json container for getting blob bundles
* spdx headers, formatting, npe fix

Signed-off-by: Justin Florentine <[email protected]>
Co-authored-by: Jason Frame <[email protected]>
Co-authored-by: garyschulte <[email protected]>
(cherry picked from commit 5fa9433)
(cherry picked from commit af8466f1561b4d5995bfa85782acee0644c3f879)
@fab-10 @jflo
[Interop-4844] Data gas accounting (hyperledger#4998)
5c0f107 
merge of hyperledger#4992 into interop feature branch

Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit 949e3fe)
(cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)
@gezero @jflo
Adding trace logs to mention ssz transaction encoding/deconding in lo…
b468bd3 
…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 <[email protected]>
(cherry picked from commit d92909f)
(cherry picked from commit 42ba8192139c1f4fabad40e3085e158ca99a9156)
@gezero @jflo
adding test for nonblob blob transaction (hyperledger#5008)
8994719 
Signed-off-by: Jiri Peinlich <[email protected]>

Signed-off-by: Jiri Peinlich <[email protected]>
Co-authored-by: Sally MacFarlane <[email protected]>
(cherry picked from commit 6085b23)
(cherry picked from commit d2d761b389ea811a7d62b26c6af7e74bb1c15564)
@fab-10 @jflo
Blob tx network size and hash (hyperledger#5015)
4b4c36e 
* adding test for nonblob blob transaction
* Adapt hash and network size computation for blob txs

Signed-off-by: Fabio Di Fabio <[email protected]>
Co-authored-by: Jiri Peinlich <[email protected]>
Co-authored-by: Justin Florentine <[email protected]>
Signed-off-by: Justin Florentine <[email protected]>
Signed-off-by: Jiri Peinlich <[email protected]>
(cherry picked from commit fd427d4)
(cherry picked from commit 28e8d18130cebe1e2835e299f6df2079f2351925)
@fab-10 @jflo
Consumed data gas receipt fix (hyperledger#5018)
45d5943 
* adding test for nonblob blob transaction
* Do not add consumed data gas to gas used in the transaction receipt

Signed-off-by: Jiri Peinlich <[email protected]>
Signed-off-by: Fabio Di Fabio <[email protected]>
Co-authored-by: Jiri Peinlich <[email protected]>
(cherry picked from commit b13583a)
(cherry picked from commit 5993c03220891b2d233c6957fb2fc47b5685de71)
jflo and others added 23 commits May 31, 2023 09:38
@jflo
plugin api version
73d90ee 
Signed-off-by: Justin Florentine <[email protected]>
@fab-10 @jflo
[Interop-4844] Data gas accounting (hyperledger#4998)
70a13a0 
merge of hyperledger#4992 into interop feature branch

Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit 949e3fe)
(cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)
@jflo
passing tests up till SSL stuff
f8b096a 
Signed-off-by: Justin Florentine <[email protected]>
(cherry picked from commit 38546f87e260da38de0a27652c7f4f85c42b9ad9)
@fab-10 @jflo
[Interop-4844] Data gas accounting (hyperledger#4998)
b8f84af 
merge of hyperledger#4992 into interop feature branch

Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit 949e3fe)
(cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)
@jflo
passing tests up till SSL stuff
ff233dd 
Signed-off-by: Justin Florentine <[email protected]>
(cherry picked from commit 38546f87e260da38de0a27652c7f4f85c42b9ad9)
@fab-10 @jflo
[Interop-4844] Data gas accounting (hyperledger#4998)
6389e84 
merge of hyperledger#4992 into interop feature branch

Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit 949e3fe)
(cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)
@jflo
passing tests up till SSL stuff
7030bf2 
Signed-off-by: Justin Florentine <[email protected]>
(cherry picked from commit 38546f87e260da38de0a27652c7f4f85c42b9ad9)
@jflo
replace encoder with RLP
cc7c7fa 
Signed-off-by: Justin Florentine <[email protected]>
@jflo
rolled back decoder/encoder to pre-ssz ish state
c6a354e 
Signed-off-by: Justin Florentine <[email protected]>
@fab-10 @jflo
[Interop-4844] Data gas accounting (hyperledger#4998)
aa71c26 
merge of hyperledger#4992 into interop feature branch

Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit 949e3fe)
(cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)
@jflo
passing tests up till SSL stuff
6236ee3 
Signed-off-by: Justin Florentine <[email protected]>
(cherry picked from commit 38546f87e260da38de0a27652c7f4f85c42b9ad9)
@fab-10 @jflo
[Interop-4844] Data gas accounting (hyperledger#4998)
d3c5a43 
merge of hyperledger#4992 into interop feature branch

Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit 949e3fe)
(cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)
@jflo
passing tests up till SSL stuff
e033901 
Signed-off-by: Justin Florentine <[email protected]>
(cherry picked from commit 38546f87e260da38de0a27652c7f4f85c42b9ad9)
@fab-10 @jflo
[Interop-4844] Data gas accounting (hyperledger#4998)
a2ada08 
merge of hyperledger#4992 into interop feature branch

Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit 949e3fe)
(cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)
Signed-off-by: Gabriel-Trintinalia <[email protected]>
@jflo
passing tests up till SSL stuff
bb6750e 
Signed-off-by: Justin Florentine <[email protected]>
(cherry picked from commit 38546f87e260da38de0a27652c7f4f85c42b9ad9)
Signed-off-by: Gabriel-Trintinalia <[email protected]>
@fab-10 @jflo
[Interop-4844] Data gas accounting (hyperledger#4998)
fa03c36 
merge of hyperledger#4992 into interop feature branch

Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit 949e3fe)
(cherry picked from commit 9734c983ce00bda161434506688f12ee07bbd820)
Signed-off-by: Gabriel-Trintinalia <[email protected]>
@jflo
passing tests up till SSL stuff
78c088f 
Signed-off-by: Justin Florentine <[email protected]>
(cherry picked from commit 38546f87e260da38de0a27652c7f4f85c42b9ad9)
Signed-off-by: Gabriel-Trintinalia <[email protected]>
@Gabriel-Trintinalia @jflo
Initial modifications to remove SSZ
a97607f 
Signed-off-by: Gabriel-Trintinalia <[email protected]>
@Gabriel-Trintinalia @jflo
Add encoding-decoding tests
755d938 
Signed-off-by: Gabriel-Trintinalia <[email protected]>
@Gabriel-Trintinalia @jflo
Fix missing field
c4cf6f1 
Signed-off-by: Gabriel-Trintinalia <[email protected]>
@jflo
spotless
ce322ee 
Signed-off-by: Justin Florentine <[email protected]>
@jflo
merge corrections
becbffd 
Signed-off-by: Justin Florentine <[email protected]>
@Gabriel-Trintinalia
Add dataGasUsed and dataGasPrice to receipts for 4844 txs
202b8b3 
Signed-off-by: Gabriel-Trintinalia <[email protected]>
@Gabriel-Trintinalia Gabriel-Trintinalia marked this pull request as ready for review June 4, 2023 09:18
macfarla
macfarla reviewed Jun 5, 2023
View reviewed changes
Copy link

@macfarla macfarla left a comment

Choose a reason for hiding this comment

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

LGTM. couple of comments

...org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java
when(blockchain.getBlockByHash(blockHash)).thenReturn(Optional.of(block));
mockProtocolSpec(header);
when(blockchain.getTransactionLocation(receiptHash))
.thenReturn(Optional.of(transactionLocation));
Copy link

Choose a reason for hiding this comment

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

so many mocks!

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java
final Transaction transaction, final BlockHeader header, final ProtocolSpec protocolSpec) {
if (transaction.getType().supportsBlob()) {
return blockchain
.getBlockHeader(header.getParentHash())
Copy link

Choose a reason for hiding this comment

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

why do you need to use the parentHeader here rather than the header passed in?

@jflo jflo force-pushed the 4844-devnet-5b branch 2 times, most recently from 268f33a to 904d001 Compare June 7, 2023 00:26
@Gabriel-Trintinalia Gabriel-Trintinalia deleted the 5489-datagas-receipts-rpc branch June 14, 2023 02:53
jflo pushed a commit that referenced this pull request Sep 3, 2024
@fab-10
Upload distributions to Cloudsmith (#15)
90bdd3c 
Signed-off-by: Fabio Di Fabio <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@macfarla macfarla macfarla left review comments

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

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