interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
jwasinger 2024-11-08 21:33:43 +09:00 committed by GitHub
parent 8e00f95056
commit 0fc9cca994
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/ethapi/api.go
View File

@ -1287,9 +1287,18 @@ func AccessList(ctx context.Context, b Backend, blockNrOrHash rpc.BlockNumberOrH
} }
// Ensure any missing fields are filled, extract the recipient and input data // Ensure any missing fields are filled, extract the recipient and input data
if err := args.setDefaults(ctx, b, true); err != nil { if err = args.setFeeDefaults(ctx, b, header); err != nil {
return nil, 0, nil, err 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 {
return nil, 0, nil, err
}
var to common.Address var to common.Address
if args.To != nil { if args.To != nil {
to = *args.To to = *args.To

5
internal/ethapi/transaction_args.go
View File

@ -100,7 +100,7 @@ func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend, skipGas
if err := args.setBlobTxSidecar(ctx); err != nil { if err := args.setBlobTxSidecar(ctx); err != nil {
return err return err
} }
if err := args.setFeeDefaults(ctx, b); err != nil { if err := args.setFeeDefaults(ctx, b, b.CurrentHeader()); err != nil {
return err return err
} }
@ -183,8 +183,7 @@ func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend, skipGas
} }
// setFeeDefaults fills in default fee values for unspecified tx fields. // setFeeDefaults fills in default fee values for unspecified tx fields.
func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend) error { func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend, head *types.Header) error {
head := b.CurrentHeader()
// Sanity check the EIP-4844 fee parameters. // Sanity check the EIP-4844 fee parameters.
if args.BlobFeeCap != nil && args.BlobFeeCap.ToInt().Sign() == 0 { if args.BlobFeeCap != nil && args.BlobFeeCap.ToInt().Sign() == 0 {
return errors.New("maxFeePerBlobGas, if specified, must be non-zero") return errors.New("maxFeePerBlobGas, if specified, must be non-zero")

2
internal/ethapi/transaction_args_test.go
View File

@ -238,7 +238,7 @@ func TestSetFeeDefaults(t *testing.T) {
t.Fatalf("failed to set fork: %v", err) t.Fatalf("failed to set fork: %v", err)
} }
got := test.in got := test.in
err := got.setFeeDefaults(ctx, b) err := got.setFeeDefaults(ctx, b, b.CurrentHeader())
if err != nil { if err != nil {
if test.err == nil { if test.err == nil {
t.Fatalf("test %d (%s): unexpected error: %s", i, test.name, err) t.Fatalf("test %d (%s): unexpected error: %s", i, test.name, err)