internal/ethapi: fix defaults for blob fields (#29037)
Co-authored-by: Martin HS <martin@swende.se>
This commit is contained in:
parent
b9ca38b735
commit
b47cf8fe1d
|
@ -177,6 +177,14 @@ func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend) error {
|
||||||
|
|
||||||
// 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) error {
|
||||||
|
head := b.CurrentHeader()
|
||||||
|
// Sanity check the EIP-4844 fee parameters.
|
||||||
|
if args.BlobFeeCap != nil && args.BlobFeeCap.ToInt().Sign() == 0 {
|
||||||
|
return errors.New("maxFeePerBlobGas, if specified, must be non-zero")
|
||||||
|
}
|
||||||
|
if err := args.setCancunFeeDefaults(ctx, head, b); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
// If both gasPrice and at least one of the EIP-1559 fee parameters are specified, error.
|
// If both gasPrice and at least one of the EIP-1559 fee parameters are specified, error.
|
||||||
if args.GasPrice != nil && (args.MaxFeePerGas != nil || args.MaxPriorityFeePerGas != nil) {
|
if args.GasPrice != nil && (args.MaxFeePerGas != nil || args.MaxPriorityFeePerGas != nil) {
|
||||||
return errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified")
|
return errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified")
|
||||||
|
@ -186,7 +194,6 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend) erro
|
||||||
// other tx values. See https://github.com/ethereum/go-ethereum/pull/23274
|
// other tx values. See https://github.com/ethereum/go-ethereum/pull/23274
|
||||||
// for more information.
|
// for more information.
|
||||||
eip1559ParamsSet := args.MaxFeePerGas != nil && args.MaxPriorityFeePerGas != nil
|
eip1559ParamsSet := args.MaxFeePerGas != nil && args.MaxPriorityFeePerGas != nil
|
||||||
|
|
||||||
// Sanity check the EIP-1559 fee parameters if present.
|
// Sanity check the EIP-1559 fee parameters if present.
|
||||||
if args.GasPrice == nil && eip1559ParamsSet {
|
if args.GasPrice == nil && eip1559ParamsSet {
|
||||||
if args.MaxFeePerGas.ToInt().Sign() == 0 {
|
if args.MaxFeePerGas.ToInt().Sign() == 0 {
|
||||||
|
@ -198,13 +205,7 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend) erro
|
||||||
return nil // No need to set anything, user already set MaxFeePerGas and MaxPriorityFeePerGas
|
return nil // No need to set anything, user already set MaxFeePerGas and MaxPriorityFeePerGas
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sanity check the EIP-4844 fee parameters.
|
|
||||||
if args.BlobFeeCap != nil && args.BlobFeeCap.ToInt().Sign() == 0 {
|
|
||||||
return errors.New("maxFeePerBlobGas must be non-zero")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sanity check the non-EIP-1559 fee parameters.
|
// Sanity check the non-EIP-1559 fee parameters.
|
||||||
head := b.CurrentHeader()
|
|
||||||
isLondon := b.ChainConfig().IsLondon(head.Number)
|
isLondon := b.ChainConfig().IsLondon(head.Number)
|
||||||
if args.GasPrice != nil && !eip1559ParamsSet {
|
if args.GasPrice != nil && !eip1559ParamsSet {
|
||||||
// Zero gas-price is not allowed after London fork
|
// Zero gas-price is not allowed after London fork
|
||||||
|
@ -215,21 +216,14 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend) erro
|
||||||
}
|
}
|
||||||
|
|
||||||
// Now attempt to fill in default value depending on whether London is active or not.
|
// Now attempt to fill in default value depending on whether London is active or not.
|
||||||
if b.ChainConfig().IsCancun(head.Number, head.Time) {
|
if isLondon {
|
||||||
if err := args.setCancunFeeDefaults(ctx, head, b); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
} else if isLondon {
|
|
||||||
if args.BlobFeeCap != nil {
|
|
||||||
return errors.New("maxFeePerBlobGas is not valid before Cancun is active")
|
|
||||||
}
|
|
||||||
// London is active, set maxPriorityFeePerGas and maxFeePerGas.
|
// London is active, set maxPriorityFeePerGas and maxFeePerGas.
|
||||||
if err := args.setLondonFeeDefaults(ctx, head, b); err != nil {
|
if err := args.setLondonFeeDefaults(ctx, head, b); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if args.MaxFeePerGas != nil || args.MaxPriorityFeePerGas != nil || args.BlobFeeCap != nil {
|
if args.MaxFeePerGas != nil || args.MaxPriorityFeePerGas != nil {
|
||||||
return errors.New("maxFeePerGas and maxPriorityFeePerGas and maxFeePerBlobGas are not valid before London is active")
|
return errors.New("maxFeePerGas and maxPriorityFeePerGas are not valid before London is active")
|
||||||
}
|
}
|
||||||
// London not active, set gas price.
|
// London not active, set gas price.
|
||||||
price, err := b.SuggestGasTipCap(ctx)
|
price, err := b.SuggestGasTipCap(ctx)
|
||||||
|
@ -245,15 +239,19 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend) erro
|
||||||
func (args *TransactionArgs) setCancunFeeDefaults(ctx context.Context, head *types.Header, b Backend) error {
|
func (args *TransactionArgs) setCancunFeeDefaults(ctx context.Context, head *types.Header, b Backend) error {
|
||||||
// Set maxFeePerBlobGas if it is missing.
|
// Set maxFeePerBlobGas if it is missing.
|
||||||
if args.BlobHashes != nil && args.BlobFeeCap == nil {
|
if args.BlobHashes != nil && args.BlobFeeCap == nil {
|
||||||
|
var excessBlobGas uint64
|
||||||
|
if head.ExcessBlobGas != nil {
|
||||||
|
excessBlobGas = *head.ExcessBlobGas
|
||||||
|
}
|
||||||
// ExcessBlobGas must be set for a Cancun block.
|
// ExcessBlobGas must be set for a Cancun block.
|
||||||
blobBaseFee := eip4844.CalcBlobFee(*head.ExcessBlobGas)
|
blobBaseFee := eip4844.CalcBlobFee(excessBlobGas)
|
||||||
// Set the max fee to be 2 times larger than the previous block's blob base fee.
|
// Set the max fee to be 2 times larger than the previous block's blob base fee.
|
||||||
// The additional slack allows the tx to not become invalidated if the base
|
// The additional slack allows the tx to not become invalidated if the base
|
||||||
// fee is rising.
|
// fee is rising.
|
||||||
val := new(big.Int).Mul(blobBaseFee, big.NewInt(2))
|
val := new(big.Int).Mul(blobBaseFee, big.NewInt(2))
|
||||||
args.BlobFeeCap = (*hexutil.Big)(val)
|
args.BlobFeeCap = (*hexutil.Big)(val)
|
||||||
}
|
}
|
||||||
return args.setLondonFeeDefaults(ctx, head, b)
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// setLondonFeeDefaults fills in reasonable default fee values for unspecified fields.
|
// setLondonFeeDefaults fills in reasonable default fee values for unspecified fields.
|
||||||
|
|
|
@ -153,14 +153,14 @@ func TestSetFeeDefaults(t *testing.T) {
|
||||||
"legacy",
|
"legacy",
|
||||||
&TransactionArgs{MaxFeePerGas: maxFee},
|
&TransactionArgs{MaxFeePerGas: maxFee},
|
||||||
nil,
|
nil,
|
||||||
errors.New("maxFeePerGas and maxPriorityFeePerGas and maxFeePerBlobGas are not valid before London is active"),
|
errors.New("maxFeePerGas and maxPriorityFeePerGas are not valid before London is active"),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"dynamic fee tx pre-London, priorityFee set",
|
"dynamic fee tx pre-London, priorityFee set",
|
||||||
"legacy",
|
"legacy",
|
||||||
&TransactionArgs{MaxPriorityFeePerGas: fortytwo},
|
&TransactionArgs{MaxPriorityFeePerGas: fortytwo},
|
||||||
nil,
|
nil,
|
||||||
errors.New("maxFeePerGas and maxPriorityFeePerGas and maxFeePerBlobGas are not valid before London is active"),
|
errors.New("maxFeePerGas and maxPriorityFeePerGas are not valid before London is active"),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"dynamic fee tx, maxFee < priorityFee",
|
"dynamic fee tx, maxFee < priorityFee",
|
||||||
|
@ -207,20 +207,6 @@ func TestSetFeeDefaults(t *testing.T) {
|
||||||
errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified"),
|
errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified"),
|
||||||
},
|
},
|
||||||
// EIP-4844
|
// EIP-4844
|
||||||
{
|
|
||||||
"set maxFeePerBlobGas pre cancun",
|
|
||||||
"london",
|
|
||||||
&TransactionArgs{BlobFeeCap: fortytwo},
|
|
||||||
nil,
|
|
||||||
errors.New("maxFeePerBlobGas is not valid before Cancun is active"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"set maxFeePerBlobGas pre london",
|
|
||||||
"legacy",
|
|
||||||
&TransactionArgs{BlobFeeCap: fortytwo},
|
|
||||||
nil,
|
|
||||||
errors.New("maxFeePerGas and maxPriorityFeePerGas and maxFeePerBlobGas are not valid before London is active"),
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"set gas price and maxFee for blob transaction",
|
"set gas price and maxFee for blob transaction",
|
||||||
"cancun",
|
"cancun",
|
||||||
|
@ -235,6 +221,13 @@ func TestSetFeeDefaults(t *testing.T) {
|
||||||
&TransactionArgs{BlobHashes: []common.Hash{}, BlobFeeCap: (*hexutil.Big)(big.NewInt(4)), MaxFeePerGas: maxFee, MaxPriorityFeePerGas: fortytwo},
|
&TransactionArgs{BlobHashes: []common.Hash{}, BlobFeeCap: (*hexutil.Big)(big.NewInt(4)), MaxFeePerGas: maxFee, MaxPriorityFeePerGas: fortytwo},
|
||||||
nil,
|
nil,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"fill maxFeePerBlobGas when dynamic fees are set",
|
||||||
|
"cancun",
|
||||||
|
&TransactionArgs{BlobHashes: []common.Hash{}, MaxFeePerGas: maxFee, MaxPriorityFeePerGas: fortytwo},
|
||||||
|
&TransactionArgs{BlobHashes: []common.Hash{}, BlobFeeCap: (*hexutil.Big)(big.NewInt(4)), MaxFeePerGas: maxFee, MaxPriorityFeePerGas: fortytwo},
|
||||||
|
nil,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
@ -244,11 +237,16 @@ func TestSetFeeDefaults(t *testing.T) {
|
||||||
}
|
}
|
||||||
got := test.in
|
got := test.in
|
||||||
err := got.setFeeDefaults(ctx, b)
|
err := got.setFeeDefaults(ctx, b)
|
||||||
if err != nil && err.Error() == test.err.Error() {
|
if err != nil {
|
||||||
// Test threw expected error.
|
if test.err == nil {
|
||||||
|
t.Fatalf("test %d (%s): unexpected error: %s", i, test.name, err)
|
||||||
|
} else if err.Error() != test.err.Error() {
|
||||||
|
t.Fatalf("test %d (%s): unexpected error: (got: %s, want: %s)", i, test.name, err, test.err)
|
||||||
|
}
|
||||||
|
// Matching error.
|
||||||
continue
|
continue
|
||||||
} else if err != nil {
|
} else if test.err != nil {
|
||||||
t.Fatalf("test %d (%s): unexpected error: %s", i, test.name, err)
|
t.Fatalf("test %d (%s): expected error: %s", i, test.name, test.err)
|
||||||
}
|
}
|
||||||
if !reflect.DeepEqual(got, test.want) {
|
if !reflect.DeepEqual(got, test.want) {
|
||||||
t.Fatalf("test %d (%s): did not fill defaults as expected: (got: %v, want: %v)", i, test.name, got, test.want)
|
t.Fatalf("test %d (%s): did not fill defaults as expected: (got: %v, want: %v)", i, test.name, got, test.want)
|
||||||
|
|
Loading…
Reference in New Issue