Revert "chore(evm, feemarket) - Migrate Event emitting to TypedEvent (e…

…vmos#1544)"

This reverts commit 8886ce3.

CHANGELOG.md

@@ -67,7 +67,6 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
-* (evm) [#1544](https://github.com/evmos/ethermint/pull/1544) Migrate deprecated event emitting to new TypedEvent
 * (tests) [#1507](https://github.com/evmos/ethermint/pull/1507) Remove legacy sim tests
 * (feemarket) [#1508](https://github.com/evmos/ethermint/pull/1508) Remove old x/params migration logic
 * (evm) [#1499](https://github.com/evmos/ethermint/pull/1499) Add Shanghai and Cancun block

scripts/integration-test-all.sh

@@ -145,7 +145,7 @@ echo "done sleeping"
 set +e
 
 if [[ -z $TEST || $TEST == "rpc" ||  $TEST == "pending" ]]; then
-    time_out=900s
+    time_out=300s
     if [[ $TEST == "pending" ]]; then
       time_out=60m0s
     fi

tests/rpc/rpc_test.go

@@ -347,37 +347,36 @@ func TestEth_IncompleteSendTransaction(t *testing.T) {
 	require.NotEqual(t, err.Error(), "method handler crashed", "no from field dealt with incorrectly")
 }
 
-// TODO: Investigate why it's failing
-//func TestEth_GetFilterChanges_NoTopics(t *testing.T) {
-//	rpcRes := call(t, "eth_blockNumber", []string{})
-//
-//	var res hexutil.Uint64
-//	err := res.UnmarshalJSON(rpcRes.Result)
-//	require.NoError(t, err)
-//
-//	param := make([]map[string]interface{}, 1)
-//	param[0] = make(map[string]interface{})
-//	param[0]["topics"] = []string{}
-//	param[0]["fromBlock"] = res.String()
-//
-//	// instantiate new filter
-//	rpcRes = call(t, "eth_newFilter", param)
-//	require.Nil(t, rpcRes.Error)
-//	var ID string
-//	err = json.Unmarshal(rpcRes.Result, &ID)
-//	require.NoError(t, err)
-//
-//	// deploy contract, emitting some event
-//	deployTestContract(t)
-//
-//	// get filter changes
-//	changesRes := call(t, "eth_getFilterChanges", []string{ID})
-//
-//	var logs []*ethtypes.Log
-//	err = json.Unmarshal(changesRes.Result, &logs)
-//	require.NoError(t, err)
-//	require.Equal(t, 1, len(logs))
-//}
+func TestEth_GetFilterChanges_NoTopics(t *testing.T) {
+	rpcRes := call(t, "eth_blockNumber", []string{})
+
+	var res hexutil.Uint64
+	err := res.UnmarshalJSON(rpcRes.Result)
+	require.NoError(t, err)
+
+	param := make([]map[string]interface{}, 1)
+	param[0] = make(map[string]interface{})
+	param[0]["topics"] = []string{}
+	param[0]["fromBlock"] = res.String()
+
+	// instantiate new filter
+	rpcRes = call(t, "eth_newFilter", param)
+	require.Nil(t, rpcRes.Error)
+	var ID string
+	err = json.Unmarshal(rpcRes.Result, &ID)
+	require.NoError(t, err)
+
+	// deploy contract, emitting some event
+	deployTestContract(t)
+
+	// get filter changes
+	changesRes := call(t, "eth_getFilterChanges", []string{ID})
+
+	var logs []*ethtypes.Log
+	err = json.Unmarshal(changesRes.Result, &logs)
+	require.NoError(t, err)
+	require.Equal(t, 1, len(logs))
+}
 
 // hash of Hello event
 var helloTopic = "0x775a94827b8fd9b519d36cd827093c664f93347070a554f65e4a6f56cd738898"
@@ -427,68 +426,66 @@ func deployTestContractWithFunction(t *testing.T) hexutil.Bytes {
 	return hash
 }
 
-// TODO: Investigate why it's failing
 // Tests topics case where there are topics in first two positions
-//func TestEth_GetFilterChanges_Topics_AB(t *testing.T) {
-//	rpcRes := call(t, "eth_blockNumber", []string{})
-//
-//	var res hexutil.Uint64
-//	err := res.UnmarshalJSON(rpcRes.Result)
-//	require.NoError(t, err)
-//
-//	param := make([]map[string]interface{}, 1)
-//	param[0] = make(map[string]interface{})
-//	param[0]["topics"] = []string{helloTopic, worldTopic}
-//	param[0]["fromBlock"] = res.String()
-//
-//	// instantiate new filter
-//	rpcRes = call(t, "eth_newFilter", param)
-//	var ID string
-//	err = json.Unmarshal(rpcRes.Result, &ID)
-//	require.NoError(t, err, string(rpcRes.Result))
-//
-//	deployTestContractWithFunction(t)
-//
-//	// get filter changes
-//	changesRes := call(t, "eth_getFilterChanges", []string{ID})
-//
-//	var logs []*ethtypes.Log
-//	err = json.Unmarshal(changesRes.Result, &logs)
-//	require.NoError(t, err)
-//
-//	require.Equal(t, 1, len(logs))
-//}
+func TestEth_GetFilterChanges_Topics_AB(t *testing.T) {
+	rpcRes := call(t, "eth_blockNumber", []string{})
 
-// TODO: Investigate why it's failing
-//func TestEth_GetFilterChanges_Topics_XB(t *testing.T) {
-//	rpcRes := call(t, "eth_blockNumber", []string{})
-//
-//	var res hexutil.Uint64
-//	err := res.UnmarshalJSON(rpcRes.Result)
-//	require.NoError(t, err)
-//
-//	param := make([]map[string]interface{}, 1)
-//	param[0] = make(map[string]interface{})
-//	param[0]["topics"] = []interface{}{nil, worldTopic}
-//	param[0]["fromBlock"] = res.String()
-//
-//	// instantiate new filter
-//	rpcRes = call(t, "eth_newFilter", param)
-//	var ID string
-//	err = json.Unmarshal(rpcRes.Result, &ID)
-//	require.NoError(t, err)
-//
-//	deployTestContractWithFunction(t)
-//
-//	// get filter changes
-//	changesRes := call(t, "eth_getFilterChanges", []string{ID})
-//
-//	var logs []*ethtypes.Log
-//	err = json.Unmarshal(changesRes.Result, &logs)
-//	require.NoError(t, err)
-//
-//	require.Equal(t, 1, len(logs))
-//}
+	var res hexutil.Uint64
+	err := res.UnmarshalJSON(rpcRes.Result)
+	require.NoError(t, err)
+
+	param := make([]map[string]interface{}, 1)
+	param[0] = make(map[string]interface{})
+	param[0]["topics"] = []string{helloTopic, worldTopic}
+	param[0]["fromBlock"] = res.String()
+
+	// instantiate new filter
+	rpcRes = call(t, "eth_newFilter", param)
+	var ID string
+	err = json.Unmarshal(rpcRes.Result, &ID)
+	require.NoError(t, err, string(rpcRes.Result))
+
+	deployTestContractWithFunction(t)
+
+	// get filter changes
+	changesRes := call(t, "eth_getFilterChanges", []string{ID})
+
+	var logs []*ethtypes.Log
+	err = json.Unmarshal(changesRes.Result, &logs)
+	require.NoError(t, err)
+
+	require.Equal(t, 1, len(logs))
+}
+
+func TestEth_GetFilterChanges_Topics_XB(t *testing.T) {
+	rpcRes := call(t, "eth_blockNumber", []string{})
+
+	var res hexutil.Uint64
+	err := res.UnmarshalJSON(rpcRes.Result)
+	require.NoError(t, err)
+
+	param := make([]map[string]interface{}, 1)
+	param[0] = make(map[string]interface{})
+	param[0]["topics"] = []interface{}{nil, worldTopic}
+	param[0]["fromBlock"] = res.String()
+
+	// instantiate new filter
+	rpcRes = call(t, "eth_newFilter", param)
+	var ID string
+	err = json.Unmarshal(rpcRes.Result, &ID)
+	require.NoError(t, err)
+
+	deployTestContractWithFunction(t)
+
+	// get filter changes
+	changesRes := call(t, "eth_getFilterChanges", []string{ID})
+
+	var logs []*ethtypes.Log
+	err = json.Unmarshal(changesRes.Result, &logs)
+	require.NoError(t, err)
+
+	require.Equal(t, 1, len(logs))
+}
 
 func TestEth_PendingTransactionFilter(t *testing.T) {
 	rpcRes := call(t, "eth_newPendingTransactionFilter", []string{})

x/evm/keeper/abci_test.go

@@ -1,6 +1,7 @@
 package keeper_test
 
 import (
+	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	"github.com/tendermint/tendermint/abci/types"
 )
 
@@ -13,5 +14,5 @@ func (suite *KeeperTestSuite) TestEndBlock() {
 
 	// should emit 1 EventTypeBlockBloom event on EndBlock
 	suite.Require().Equal(1, len(em.Events()))
-	suite.Require().Equal("ethermint.evm.v1.EventBlockBloom", em.Events()[0].Type)
+	suite.Require().Equal(evmtypes.EventTypeBlockBloom, em.Events()[0].Type)
 }

x/evm/keeper/grpc_query_test.go

@@ -540,7 +540,10 @@ func (suite *KeeperTestSuite) TestEstimateGas() {
 			"enough balance",
 			func() {
 				args = types.TransactionArgs{To: &common.Address{}, From: &suite.address, Value: (*hexutil.Big)(big.NewInt(100))}
-			}, false, 0, false,
+			},
+			false,
+			0,
+			false,
 		},
 		// should success, because gas limit lower than 21000 is ignored
 		{

x/evm/keeper/keeper.go

@@ -152,14 +152,12 @@ func (k Keeper) ChainID() *big.Int {
 
 // EmitBlockBloomEvent emit block bloom events
 func (k Keeper) EmitBlockBloomEvent(ctx sdk.Context, bloom ethtypes.Bloom) {
-	err := ctx.EventManager().EmitTypedEvent(
-		&types.EventBlockBloom{
-			Bloom: string(bloom.Bytes()),
-		},
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventTypeBlockBloom,
+			sdk.NewAttribute(types.AttributeKeyEthereumBloom, string(bloom.Bytes())),
+		),
 	)
-	if err != nil {
-		k.Logger(ctx).Error(err.Error())
-	}
 }
 
 // GetAuthority returns the x/evm module authority address