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

core: check excessBlobGas in front #27797

Merged
merged 3 commits into from Jul 31, 2023
Merged

core: check excessBlobGas in front #27797

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c4947a
core: check excessBlobGas in front
jsvisa Jul 28, 2023
d3784e1
core: no need to manual panic
jsvisa Jul 28, 2023
73f39af
core: no comment
jsvisa Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions core/state_transition.go
View file
Open in desktop
Expand Up @@ -242,10 +242,6 @@ func (st *StateTransition) buyGas() error {
}
if st.evm.ChainConfig().IsCancun(st.evm.Context.BlockNumber, st.evm.Context.Time) {
if blobGas := st.blobGasUsed(); blobGas > 0 {
if st.evm.Context.ExcessBlobGas == nil {
// programming error
panic("missing field excess data gas")
}
// Check that the user has enough funds to cover blobGasUsed * tx.BlobGasFeeCap
blobBalanceCheck := new(big.Int).SetUint64(blobGas)
blobBalanceCheck.Mul(blobBalanceCheck, st.msg.BlobGasFeeCap)
Expand Down Expand Up @@ -333,6 +329,7 @@ func (st *StateTransition) preCheck() error {
if st.evm.ChainConfig().IsCancun(st.evm.Context.BlockNumber, st.evm.Context.Time) {
if st.blobGasUsed() > 0 {
// Check that the user is paying at least the current blob fee
// ExcessBlobGas must not be nil, which is checked in eip4844.VerifyEIP4844Header
jsvisa marked this conversation as resolved.
Show resolved Hide resolved
blobFee := eip4844.CalcBlobFee(*st.evm.Context.ExcessBlobGas)
if st.msg.BlobGasFeeCap.Cmp(blobFee) < 0 {
return fmt.Errorf("%w: address %v have %v want %v", ErrBlobFeeCapTooLow, st.msg.From.Hex(), st.msg.BlobGasFeeCap, blobFee)
Expand Down