Skip to content

Fix data gas calculation during block import #5023

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
Merged
merged 7 commits into from
Jan 31, 2023
Merged

Fix data gas calculation during block import #5023

merged 7 commits into from
Jan 31, 2023

Conversation

@fab-10
Copy link
Contributor

@fab-10 fab-10 commented Jan 30, 2023

PR description

Fixed Issue(s)

Documentation

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

Changelog

shemnon
shemnon suggested changes Jan 30, 2023
View reviewed changes
Copy link
Contributor

@shemnon shemnon left a comment •
edited
Loading

Choose a reason for hiding this comment

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

MainnetTransactionValidator.java nonce check needs to be restored.

Other than that LGTM.

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessor.java
protocolSpec.getGasCalculator().dataGasCost(transaction.getBlobCount());

currentGasUsed += transaction.getGasLimit() - result.getGasRemaining() - dataGasUsed;
currentGasUsed += transaction.getGasLimit() - result.getGasRemaining();
Copy link
Contributor

@shemnon shemnon Jan 30, 2023

Choose a reason for hiding this comment

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

I'm thinking DataGas wasn't the best name to use in the spec, not that we can control it anymore.

...um/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java
previousNonce,
sender.getNonce());

final Wei transactionGasPrice =
Copy link
Contributor

@shemnon shemnon Jan 30, 2023

Choose a reason for hiding this comment

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

Did moving this to the other side of the trace really have an impact? Can it be rolled back for clarity?

Copy link
Contributor Author

@fab-10 fab-10 Jan 31, 2023

Choose a reason for hiding this comment

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

My intent was to move the log of the nonce just after the statement that changed it, no behavior change of course

...um/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java
}
}

if (transaction.getNonce() == MAX_NONCE) {
Copy link
Contributor

@shemnon shemnon Jan 30, 2023

Choose a reason for hiding this comment

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

This needs to stay.

Copy link
Contributor Author

@fab-10 fab-10 Jan 31, 2023

Choose a reason for hiding this comment

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

removed since it is a duplication, the check is present at line 156

@fab-10 fab-10 force-pushed the 4844-state-root-fix branch from 0b79a28 to 46fb6c4 Compare January 31, 2023 17:47
@fab-10 fab-10 merged commit f20d064 into hyperledger:eip-4844-interop Jan 31, 2023
@fab-10 fab-10 deleted the 4844-state-root-fix branch January 31, 2023 18:09
fab-10 added a commit to fab-10/besu that referenced this pull request Feb 1, 2023
@fab-10
Fix data gas calculation during block import (hyperledger#5023)
112e774 
Signed-off-by: Fabio Di Fabio <[email protected]>
jflo pushed a commit to jflo/besu that referenced this pull request May 9, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
bb6dbed 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request May 10, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
a9f3225 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request May 15, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
b43b294 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request May 16, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
027edff 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request May 17, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
8b73ba5 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request May 18, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
c07f140 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request May 22, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
62388c1 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request May 22, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
7460665 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request May 24, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
ffb36cb 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request May 24, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
fdd8c25 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request May 31, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
2679ea0 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request May 31, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
bc8c3d7 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request May 31, 2023
@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)
jflo pushed a commit to jflo/besu that referenced this pull request May 31, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
f46fdaa 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request Jun 5, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
8fbd4a7 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request Jun 5, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
d061e5a 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request Jun 7, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
222d13f 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request Jun 7, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
79113ff 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 13, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
a46a01b 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 13, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
0390a24 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 14, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
a2abc04 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 14, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
622c8c7 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 15, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
32db8cb 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 15, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
8199faa 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 16, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
f875bbd 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 16, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
2733af4 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 21, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
125f1c3 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 21, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
414b7f7 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 29, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
e27876a 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 29, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
3f6391b 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 30, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
8007264 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jun 30, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
0a97779 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jul 5, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
92c8666 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit that referenced this pull request Jul 5, 2023
@fab-10 @jflo
Fix data gas calculation during block import (#5023)
e79f9bf 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request Jul 20, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
6c8fa2f 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
jflo pushed a commit to jflo/besu that referenced this pull request Jul 20, 2023
@fab-10 @jflo
Fix data gas calculation during block import (hyperledger#5023)
b617b21 
Signed-off-by: Fabio Di Fabio <[email protected]>
(cherry picked from commit f20d064)
(cherry picked from commit bcd9735d1605f4fffef57bec4af95bfae818ac7e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@shemnon shemnon shemnon approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@fab-10 @shemnon