evm: rm recover (evmos#542)

* evm: rm recover * rm query * lint
gsk967 · Sep 9, 2021 · 6a2914d · 6a2914d
1 parent 397e862
commit 6a2914d
Show file tree

Hide file tree

Showing 8 changed files with 2,179 additions and 1,745 deletions.
diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go
diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml
diff --git a/docs/api/proto-docs.md b/docs/api/proto-docs.md
@@ -40,8 +40,6 @@
     - [QueryAccountResponse](#ethermint.evm.v1.QueryAccountResponse)
     - [QueryBalanceRequest](#ethermint.evm.v1.QueryBalanceRequest)
     - [QueryBalanceResponse](#ethermint.evm.v1.QueryBalanceResponse)
-    - [QueryBaseFeeRequest](#ethermint.evm.v1.QueryBaseFeeRequest)
-    - [QueryBaseFeeResponse](#ethermint.evm.v1.QueryBaseFeeResponse)
     - [QueryBlockBloomRequest](#ethermint.evm.v1.QueryBlockBloomRequest)
     - [QueryBlockBloomResponse](#ethermint.evm.v1.QueryBlockBloomResponse)
     - [QueryBlockLogsRequest](#ethermint.evm.v1.QueryBlockLogsRequest)
@@ -639,32 +637,6 @@ QueryBalanceResponse is the response type for the Query/Balance RPC method.
 
 
 
-<a name="ethermint.evm.v1.QueryBaseFeeRequest"></a>
-
-### QueryBaseFeeRequest
-QueryBaseFeeRequest defines the request type for querying the EIP1559 base
-fee.
-
-
-
-
-
-
-<a name="ethermint.evm.v1.QueryBaseFeeResponse"></a>
-
-### QueryBaseFeeResponse
-BaseFeeResponse returns the EIP1559 base fee.
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| `base_fee` | [string](#string) |  |  |
-
-
-
-
-
-
 <a name="ethermint.evm.v1.QueryBlockBloomRequest"></a>
 
 ### QueryBlockBloomRequest

diff --git a/proto/ethermint/evm/v1/query.proto b/proto/ethermint/evm/v1/query.proto
@@ -255,18 +255,6 @@ message QueryParamsResponse {
   Params params = 1 [ (gogoproto.nullable) = false ];
 }
 
-// QueryBaseFeeRequest defines the request type for querying the EIP1559 base
-// fee.
-message QueryBaseFeeRequest {}
-
-// BaseFeeResponse returns the EIP1559 base fee.
-message QueryBaseFeeResponse {
-  string base_fee = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.nullable) = false
-  ];
-}
-
 // QueryStaticCallRequest defines static call response
 message QueryStaticCallResponse { bytes data = 1; }
 

diff --git a/proto/ethermint/feemarket/v1/feemarket.proto b/proto/ethermint/feemarket/v1/feemarket.proto
@@ -1,8 +1,6 @@
 syntax = "proto3";
 package ethermint.feemarket.v1;
 
-import "gogoproto/gogo.proto";
-
 option go_package = "github.com/tharsis/ethermint/x/feemarket/types";
 
 // Params defines the EVM module parameters

diff --git a/x/evm/handler.go b/x/evm/handler.go
@@ -1,11 +1,6 @@
 package evm
 
 import (
-	"fmt"
-	"runtime/debug"
-
-	tmlog "github.com/tendermint/tendermint/libs/log"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
@@ -15,8 +10,6 @@ import (
 // NewHandler returns a handler for Ethermint type messages.
 func NewHandler(server types.MsgServer) sdk.Handler {
 	return func(ctx sdk.Context, msg sdk.Msg) (result *sdk.Result, err error) {
-		defer Recover(ctx.Logger(), &err)
-
 		ctx = ctx.WithEventManager(sdk.NewEventManager())
 
 		switch msg := msg.(type) {
@@ -31,22 +24,3 @@ func NewHandler(server types.MsgServer) sdk.Handler {
 		}
 	}
 }
-
-func Recover(logger tmlog.Logger, err *error) {
-	if r := recover(); r != nil {
-		*err = sdkerrors.Wrapf(sdkerrors.ErrPanic, "%v", r)
-
-		if e, ok := r.(error); ok {
-			logger.Error(
-				"message handler panicked",
-				"error", e,
-				"stack trace", string(debug.Stack()),
-			)
-		} else {
-			logger.Error(
-				"message handler panicked",
-				"recover", fmt.Sprintf("%v", r),
-			)
-		}
-	}
-}
diff --git a/x/evm/keeper/grpc_query.go b/x/evm/keeper/grpc_query.go
@@ -311,15 +311,6 @@ func (k Keeper) Params(c context.Context, _ *types.QueryParamsRequest) (*types.Q
 	}, nil
 }
 
-// BaseFee implements the Query/BaseFee gRPC method
-func (k Keeper) BaseFee(c context.Context, _ *types.QueryBaseFeeRequest) (*types.QueryBaseFeeResponse, error) {
-	_ = sdk.UnwrapSDKContext(c)
-
-	return &types.QueryBaseFeeResponse{
-		BaseFee: sdk.OneInt(), // TODO: update
-	}, nil
-}
-
 // EthCall implements eth_call rpc api.
 func (k Keeper) EthCall(c context.Context, req *types.EthCallRequest) (*types.MsgEthereumTxResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)

diff --git a/x/evm/types/query.pb.go b/x/evm/types/query.pb.go