bind, ethapi: replace london with EIP-1559 in log messages

XinFinOrg · Sep 10, 2024 · 7a79c05 · 7a79c05
1 parent 1f6c37a
commit 7a79c05
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go
@@ -242,7 +242,7 @@ func (c *BoundContract) createDynamicTx(opts *TransactOpts, contract *common.Add
 
 func (c *BoundContract) createLegacyTx(opts *TransactOpts, contract *common.Address, input []byte) (*types.Transaction, error) {
 	if opts.GasFeeCap != nil || opts.GasTipCap != nil {
-		return nil, errors.New("maxFeePerGas or maxPriorityFeePerGas specified but london is not active yet")
+		return nil, errors.New("maxFeePerGas or maxPriorityFeePerGas specified but EIP-1559 is not active yet")
 	}
 	// Normalize value
 	value := opts.Value

diff --git a/internal/ethapi/transaction_args.go b/internal/ethapi/transaction_args.go
@@ -167,7 +167,7 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend) erro
 	if args.GasPrice != nil && !eip1559ParamsSet {
 		// Zero gas-price is not allowed after London fork
 		if args.GasPrice.ToInt().Sign() == 0 && isEIP1559 {
-			return errors.New("gasPrice must be non-zero after london fork")
+			return errors.New("gasPrice must be non-zero after EIP-1559 fork")
 		}
 		return nil // No need to set anything, user already set GasPrice
 	}
@@ -180,7 +180,7 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend) erro
 		}
 	} else {
 		if args.MaxFeePerGas != nil || args.MaxPriorityFeePerGas != nil {
-			return errors.New("maxFeePerGas and maxPriorityFeePerGas are not valid before London is active")
+			return errors.New("maxFeePerGas and maxPriorityFeePerGas are not valid before EIP-1559 is active")
 		}
 		// London not active, set gas price.
 		price, err := b.SuggestGasTipCap(ctx)

diff --git a/internal/ethapi/transaction_args_test.go b/internal/ethapi/transaction_args_test.go
@@ -92,7 +92,7 @@ func TestSetFeeDefaults(t *testing.T) {
 			true,
 			&TransactionArgs{GasPrice: zero},
 			nil,
-			errors.New("gasPrice must be non-zero after london fork"),
+			errors.New("gasPrice must be non-zero after EIP-1559 fork"),
 		},
 
 		// Access list txs
@@ -159,14 +159,14 @@ func TestSetFeeDefaults(t *testing.T) {
 			false,
 			&TransactionArgs{MaxFeePerGas: maxFee},
 			nil,
-			fmt.Errorf("maxFeePerGas and maxPriorityFeePerGas are not valid before London is active"),
+			fmt.Errorf("maxFeePerGas and maxPriorityFeePerGas are not valid before EIP-1559 is active"),
 		},
 		{
 			"dynamic fee tx pre-London, priorityFee set",
 			false,
 			&TransactionArgs{MaxPriorityFeePerGas: fortytwo},
 			nil,
-			fmt.Errorf("maxFeePerGas and maxPriorityFeePerGas are not valid before London is active"),
+			fmt.Errorf("maxFeePerGas and maxPriorityFeePerGas are not valid before EIP-1559 is active"),
 		},
 		{
 			"dynamic fee tx, maxFee < priorityFee",