Merge branch 'main' into begin-block-base-fee

CHANGELOG.md

@@ -39,7 +39,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### State Machine Breaking
 
-- (feemarket) [tharsis#822](https://github.com/tharsis/ethermint/pull/822) Update base fee in begin blocker
+- (evm) [tharsis#840](https://github.com/tharsis/ethermint/pull/840) Store empty topics as empty array rather than nil.
+- (feemarket) [tharsis#822](https://github.com/tharsis/ethermint/pull/822) Update EIP1559 base fee in `BeginBlock`.
 
 ### Improvements
 

x/evm/keeper/statedb_test.go

@@ -592,6 +592,7 @@ func (suite *KeeperTestSuite) TestAddLog() {
 			&ethtypes.Log{
 				Address: addr,
 				TxHash:  txHash,
+				Topics:  make([]common.Hash, 0),
 			},
 			func() {},
 		},
@@ -606,6 +607,7 @@ func (suite *KeeperTestSuite) TestAddLog() {
 				TxHash:  txHash2,
 				TxIndex: 1,
 				Index:   1,
+				Topics:  make([]common.Hash, 0),
 			},
 			func() {
 				suite.app.EvmKeeper.SetTxHashTransient(txHash)
@@ -624,6 +626,7 @@ func (suite *KeeperTestSuite) TestAddLog() {
 			&ethtypes.Log{
 				Address: addr,
 				TxHash:  txHash3,
+				Topics:  make([]common.Hash, 0),
 			},
 			func() {},
 		},
@@ -638,6 +641,7 @@ func (suite *KeeperTestSuite) TestAddLog() {
 				TxHash:  txHash4,
 				TxIndex: 1,
 				Index:   1,
+				Topics:  make([]common.Hash, 0),
 			},
 			func() {
 				suite.app.EvmKeeper.SetTxHashTransient(txHash)

x/evm/types/logs.go

@@ -70,9 +70,9 @@ func (log *Log) Validate() error {
 
 // ToEthereum returns the Ethereum type Log from a Ethermint proto compatible Log.
 func (log *Log) ToEthereum() *ethtypes.Log {
-	var topics []common.Hash // nolint: prealloc
-	for i := range log.Topics {
-		topics = append(topics, common.HexToHash(log.Topics[i]))
+	topics := make([]common.Hash, len(log.Topics))
+	for i, topic := range log.Topics {
+		topics[i] = common.HexToHash(topic)
 	}
 
 	return &ethtypes.Log{
@@ -108,9 +108,9 @@ func LogsToEthereum(logs []*Log) []*ethtypes.Log {
 
 // NewLogFromEth creates a new Log instance from a Ethereum type Log.
 func NewLogFromEth(log *ethtypes.Log) *Log {
-	var topics []string // nolint: prealloc
-	for _, topic := range log.Topics {
-		topics = append(topics, topic.String())
+	topics := make([]string, len(log.Topics))
+	for i, topic := range log.Topics {
+		topics[i] = topic.String()
 	}
 
 	return &Log{

x/evm/types/tx_args.go

@@ -85,10 +85,6 @@ func (args *TransactionArgs) ToTransaction() *MsgEthereumTx {
 		maxPriorityFeePerGas = sdk.NewIntFromBigInt(args.MaxPriorityFeePerGas.ToInt())
 	}
 
-	if args.GasPrice != nil {
-		gasPrice = sdk.NewIntFromBigInt(args.GasPrice.ToInt())
-	}
-
 	if args.Value != nil {
 		value = sdk.NewIntFromBigInt(args.Value.ToInt())
 	}