interface: Add CallMsg.GasFeeCap,GasTipCap

accounts/abi/bind/backends/blockchain.go

@@ -138,7 +138,16 @@ func (b *BlockchainContractBackend) callContract(call kaia.CallMsg, block *types
 	if call.AccessList != nil {
 		accessList = *call.AccessList
 	}
-	msg := types.NewMessage(call.From, call.To, 0, call.Value, call.Gas, call.GasPrice, call.Data,
+	gasPrice := common.Big0
+	if call.GasPrice != nil && (call.GasFeeCap != nil || call.GasTipCap != nil) {
+		return nil, errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified")
+	} else if call.GasPrice != nil {
+		gasPrice = call.GasPrice
+	} else if call.GasFeeCap != nil {
+		gasPrice = call.GasFeeCap
+	}
+
+	msg := types.NewMessage(call.From, call.To, 0, call.Value, call.Gas, gasPrice, call.Data,
 		false, intrinsicGas, accessList)
 
 	txContext := blockchain.NewEVMTxContext(msg, block.Header(), b.bc.Config())
@@ -232,7 +241,16 @@ func (b *BlockchainContractBackend) EstimateGas(ctx context.Context, call kaia.C
 		return res.Failed(), res, nil
 	}
 
-	estimated, err := blockchain.DoEstimateGas(ctx, call.Gas, 0, call.Value, call.GasPrice, balance, executable)
+	gasPrice := common.Big0
+	if call.GasPrice != nil && (call.GasFeeCap != nil || call.GasTipCap != nil) {
+		return 0, errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified")
+	} else if call.GasPrice != nil {
+		gasPrice = call.GasPrice
+	} else if call.GasFeeCap != nil {
+		gasPrice = call.GasFeeCap
+	}
+
+	estimated, err := blockchain.DoEstimateGas(ctx, call.Gas, 0, call.Value, gasPrice, balance, executable)
 	return uint64(estimated), err
 }
 

accounts/abi/bind/backends/blockchain_test.go

@@ -22,6 +22,7 @@ import (
 	"context"
 	"encoding/hex"
 	"errors"
+	"fmt"
 	"math/big"
 	"strings"
 	"testing"
@@ -133,6 +134,18 @@ func TestBlockchainCallContract(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, expectedReturn, ret)
 
+	// Argument error - both gasPrice and feecap, tipcap
+	ret, err = c.CallContract(context.Background(), kaia.CallMsg{
+		From:      testAddr,
+		To:        &code1Addr,
+		Gas:       1000000,
+		Data:      data_receive,
+		GasPrice:  big.NewInt(1),
+		GasFeeCap: big.NewInt(1),
+		GasTipCap: big.NewInt(1),
+	}, nil)
+	assert.Equal(t, "both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified", err.Error())
+
 	// Error outside VM - Intrinsic Gas
 	ret, err = c.CallContract(context.Background(), kaia.CallMsg{
 		From: testAddr,
@@ -226,6 +239,28 @@ func TestBlockChainEstimateGas(t *testing.T) {
 	})
 	assert.Contains(t, err.Error(), "insufficient balance for transfer")
 	assert.Zero(t, gas)
+
+	// Error case - simple transfer with high GasPrice
+	gas, err = c.EstimateGas(context.Background(), kaia.CallMsg{
+		From:     testAddr,
+		To:       &testAddr,
+		Value:    big.NewInt(1),
+		GasPrice: big.NewInt(1e9),
+	})
+	assert.Zero(t, gas)
+	fmt.Println(gas, err)
+	assert.Contains(t, err.Error(), "gas required exceeds allowance")
+
+	// Error case - simple transfer with high GasFeeCap
+	gas, err = c.EstimateGas(context.Background(), kaia.CallMsg{
+		From:      testAddr,
+		To:        &testAddr,
+		Value:     big.NewInt(1),
+		GasFeeCap: big.NewInt(1e9),
+	})
+	assert.Zero(t, gas)
+	fmt.Println(gas, err)
+	assert.Contains(t, err.Error(), "gas required exceeds allowance")
 }
 
 func TestBlockChainSendTransaction(t *testing.T) {

accounts/abi/bind/backends/simulated.go

@@ -441,7 +441,16 @@ func (b *SimulatedBackend) EstimateGas(ctx context.Context, call kaia.CallMsg) (
 		return res.Failed(), res, nil
 	}
 
-	estimated, err := blockchain.DoEstimateGas(ctx, call.Gas, 0, call.Value, call.GasPrice, balance, executable)
+	gasPrice := common.Big0
+	if call.GasPrice != nil && (call.GasFeeCap != nil || call.GasTipCap != nil) {
+		return 0, errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified")
+	} else if call.GasPrice != nil {
+		gasPrice = call.GasPrice
+	} else if call.GasFeeCap != nil {
+		gasPrice = call.GasFeeCap
+	}
+
+	estimated, err := blockchain.DoEstimateGas(ctx, call.Gas, 0, call.Value, gasPrice, balance, executable)
 	if err != nil {
 		return 0, err
 	} else {
@@ -453,9 +462,6 @@ func (b *SimulatedBackend) EstimateGas(ctx context.Context, call kaia.CallMsg) (
 // state is modified during execution, make sure to copy it if necessary.
 func (b *SimulatedBackend) callContract(_ context.Context, call kaia.CallMsg, block *types.Block, stateDB *state.StateDB) (*blockchain.ExecutionResult, error) {
 	// Ensure message is initialized properly.
-	if call.GasPrice == nil {
-		call.GasPrice = big.NewInt(1)
-	}
 	if call.Gas == 0 {
 		call.Gas = 50000000
 	}
@@ -473,7 +479,16 @@ func (b *SimulatedBackend) callContract(_ context.Context, call kaia.CallMsg, bl
 	if call.AccessList != nil {
 		accessList = *call.AccessList
 	}
-	msg := types.NewMessage(call.From, call.To, nonce, call.Value, call.Gas, call.GasPrice, call.Data, true, intrinsicGas, accessList)
+	gasPrice := common.Big0
+	if call.GasPrice != nil && (call.GasFeeCap != nil || call.GasTipCap != nil) {
+		return nil, errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified")
+	} else if call.GasPrice != nil {
+		gasPrice = call.GasPrice
+	} else if call.GasFeeCap != nil {
+		gasPrice = call.GasFeeCap
+	}
+
+	msg := types.NewMessage(call.From, call.To, nonce, call.Value, call.Gas, gasPrice, call.Data, true, intrinsicGas, accessList)
 
 	txContext := blockchain.NewEVMTxContext(msg, block.Header(), b.config)
 	blockContext := blockchain.NewEVMBlockContext(block.Header(), b.blockchain, nil)

accounts/abi/bind/backends/simulated_test.go

@@ -476,6 +476,18 @@ func TestSimulatedBackend_EstimateGas(t *testing.T) {
 			Data:     common.Hex2Bytes("50f6fe34"),
 		}, 0, errors.New("gas required exceeds allowance (100000)"), nil},
 
+		{"HighGasPrice", kaia.CallMsg{
+			From:     addr,
+			To:       &addr,
+			GasPrice: big.NewInt(1e9),
+		}, 0, errors.New("gas required exceeds allowance (10)"), nil},
+
+		{"HighFeeCap", kaia.CallMsg{
+			From:      addr,
+			To:        &addr,
+			GasFeeCap: big.NewInt(1e9),
+		}, 0, errors.New("gas required exceeds allowance (10)"), nil},
+
 		{"Assert", kaia.CallMsg{
 			From:     addr,
 			To:       &contractAddr,

client/kaia_client.go

@@ -567,6 +567,15 @@ func toCallArg(msg kaia.CallMsg) interface{} {
 	if msg.GasPrice != nil {
 		arg["gasPrice"] = (*hexutil.Big)(msg.GasPrice)
 	}
+	if msg.GasFeeCap != nil {
+		arg["maxFeePerGas"] = (*hexutil.Big)(msg.GasFeeCap)
+	}
+	if msg.GasTipCap != nil {
+		arg["maxPriorityFeePerGas"] = (*hexutil.Big)(msg.GasTipCap)
+	}
+	if msg.AccessList != nil {
+		arg["accessList"] = msg.AccessList
+	}
 	return arg
 }
 
@@ -581,6 +590,12 @@ func toSendTxArgs(msg api.SendTxArgs) interface{} {
 	if msg.Price != nil {
 		arg["gasPrice"] = (*hexutil.Big)(msg.Price)
 	}
+	if msg.MaxFeePerGas != nil {
+		arg["maxFeePerGas"] = (*hexutil.Big)(msg.MaxFeePerGas)
+	}
+	if msg.MaxPriorityFeePerGas != nil {
+		arg["maxPriorityFeePerGas"] = (*hexutil.Big)(msg.MaxPriorityFeePerGas)
+	}
 	if msg.Amount != nil {
 		arg["value"] = (*hexutil.Big)(msg.Amount)
 	}
@@ -590,6 +605,9 @@ func toSendTxArgs(msg api.SendTxArgs) interface{} {
 	if len(*msg.Payload) > 0 {
 		arg["input"] = (*hexutil.Bytes)(msg.Payload)
 	}
+	if msg.AccessList != nil {
+		arg["accessList"] = msg.AccessList
+	}
 
 	return arg
 }

interfaces.go

@@ -118,12 +118,14 @@ type ChainSyncReader interface {
 
 // CallMsg contains parameters for contract calls.
 type CallMsg struct {
-	From     common.Address  // the sender of the 'transaction'
-	To       *common.Address // the destination contract (nil for contract creation)
-	Gas      uint64          // if 0, the call executes with near-infinite gas
-	GasPrice *big.Int        // kei <-> gas exchange ratio
-	Value    *big.Int        // amount of kei sent along with the call
-	Data     []byte          // input data, usually an ABI-encoded contract method invocation
+	From      common.Address  // the sender of the 'transaction'
+	To        *common.Address // the destination contract (nil for contract creation)
+	Gas       uint64          // if 0, the call executes with near-infinite gas
+	GasPrice  *big.Int        // kei <-> gas exchange ratio
+	GasFeeCap *big.Int        // EIP-1559 fee cap per gas.
+	GasTipCap *big.Int        // EIP-1559 tip per gas.
+	Value     *big.Int        // amount of kei sent along with the call
+	Data      []byte          // input data, usually an ABI-encoded contract method invocation
 
 	// Introduced by AccessListTxType transaction.
 	AccessList *types.AccessList `json:"accessList,omitempty"`

node/sc/remote_backend.go

@@ -237,5 +237,14 @@ func toCallArg(msg klaytn.CallMsg) interface{} {
 	if msg.GasPrice != nil {
 		arg["gasPrice"] = (*hexutil.Big)(msg.GasPrice)
 	}
+	if msg.GasFeeCap != nil {
+		arg["maxFeePerGas"] = (*hexutil.Big)(msg.GasFeeCap)
+	}
+	if msg.GasTipCap != nil {
+		arg["maxPriorityFeePerGas"] = (*hexutil.Big)(msg.GasTipCap)
+	}
+	if msg.AccessList != nil {
+		arg["accessList"] = msg.AccessList
+	}
 	return arg
 }