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

internal/ethapi: Set basefee for AccessList based on given block, not chain tip #30538

Merged
merged 6 commits into from
Nov 8, 2024
Merged

internal/ethapi: Set basefee for AccessList based on given block, not chain tip #30538

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
612d281
internal/ethapi: set dynamic fee fields to 0 in access list so that s…
jwasinger Oct 2, 2024
5fce58e
try using CallDefaults instead of setDefaults (AccessList is an eth_c…
jwasinger Oct 2, 2024
6d3b000
check error from CallDefaults. if tx nonce was not provided, fill it…
jwasinger Oct 8, 2024
5b243e4
remove print statement
jwasinger Oct 8, 2024
599fded
docs
jwasinger Oct 8, 2024
78897ff
ensure AccessList calls setFeeDefaults so that fee fields are filled …
jwasinger Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions internal/ethapi/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1627,16 +1627,22 @@ func AccessList(ctx context.Context, b Backend, blockNrOrHash rpc.BlockNumberOrH
return nil, 0, nil, err
}

// Ensure any missing fields are filled, extract the recipient and input data
if err := args.setDefaults(ctx, b, true); err != nil {
return nil, 0, nil, err
if args.Nonce == nil {
nonce := hexutil.Uint64(db.GetNonce(args.from()))
args.Nonce = &nonce
}
blockCtx := core.NewEVMBlockContext(header, NewChainContext(ctx, b), nil)
if err := args.CallDefaults(b.RPCGasCap(), blockCtx.BaseFee, b.ChainConfig().ChainID); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

the setDefaults has a lot of logic handling blobs that are passed in the args, and that will become broken if we just change this

Copy link
Contributor

@fjl fjl Oct 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

We could just call setBlobTxSidecar in CallDefaults. But I'd say it's OK not to support them here.

Copy link
Contributor

@holiman holiman Oct 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

But setDefaults will set the fee defaults on the latest block.

	if err := args.setFeeDefaults(ctx, b); err != nil {
		return err
	}

And regardless of what order we invoke it, it will use the latest header, and do

	if err := args.setCancunFeeDefaults(ctx, head, b); err != nil {
		return err
	}

SO it will apply cancun checks according to tip, regardless of what the given block is.

Copy link
Contributor

@holiman holiman Oct 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

How about something like this

// setFeeDefaults fills in default fee values for unspecified tx fields.
func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend) error {
	return setFeeDefaultsUsingThisHeader(b.CurrentHeader())
}
func (args *TransactionArgs) setFeeDefaultsUsingThisHeader(ctx context.Context, b Backend, head *types.Header) error {
	// Sanity check the EIP-4844 fee parameters.

Copy link
Contributor

Choose a reason for hiding this comment

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

the setDefaults has a lot of logic handling blobs that are passed in the args, and that will become broken if we just change this

The logic there is to fill in blob proofs and commitments if they were not provided. Those matter only when submitting a tx. Since for a simulation all that can be accessed via evm is blob hashes (which still can be passed in via TransactionArgs).

All in all I think I agree with @jwasinger that CallDefaults is a better validation function to use here. All the methods that involve signing and submitting a tx use setDefaults while all the "simulation" methods use CallDefaults.

return types.AccessList{}, 0, nil, err
}

var to common.Address
if args.To != nil {
to = *args.To
} else {
to = crypto.CreateAddress(args.from(), uint64(*args.Nonce))
}
fmt.Printf("nonce %d\nto %x\n", *args.Nonce, to)
isPostMerge := header.Difficulty.Sign() == 0
// Retrieve the precompiles since they don't need to be added to the access list
precompiles := vm.ActivePrecompiles(b.ChainConfig().Rules(header.Number, isPostMerge, header.Time))
Expand Down