remove GetParam fallback mechanism & always use GetParamsIfExists

Author: blindchaser

proto/evm/params.proto

@@ -32,51 +32,6 @@ string minimum_fee_per_gas = 4 [
   (gogoproto.nullable)   = false,
   (gogoproto.jsontag) = "minimum_fee_per_gas"
 ];
-uint64 deliver_tx_hook_wasm_gas_limit = 5;
-  // ChainConfig chain_config = 5 [(gogoproto.moretags) = "yaml:\"chain_config\"", (gogoproto.nullable) = false];
-//   string chain_id = 6 [
-//   (gogoproto.moretags)   = "yaml:\"chain_id\"",
-//   (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-//   (gogoproto.nullable)   = false,
-//   (gogoproto.jsontag) = "chain_id"
-// ];
-  // repeated string whitelisted_codehashes_bank_send = 7 [
-  //   (gogoproto.moretags)   = "yaml:\"whitelisted_codehashes_bank_send\"",
-  //   (gogoproto.jsontag) = "whitelisted_codehashes_bank_send"
-  // ];
-  repeated bytes whitelisted_cw_code_hashes_for_delegate_call = 8 [
-    (gogoproto.moretags)   = "yaml:\"whitelisted_cw_code_hashes_for_delegate_call\"",
-    (gogoproto.jsontag) = "whitelisted_cw_code_hashes_for_delegate_call"
-  ];
-}
-
-// ParamsV590 is for pre V580 and post V590
-message ParamsV590 {
-  option (gogoproto.goproto_stringer) = false;
-  
-  // string base_denom = 1 [
-  //   (gogoproto.moretags)   = "yaml:\"base_denom\"",
-  //   (gogoproto.jsontag) = "base_denom"
-  // ];
-  string priority_normalizer = 2 [
-      (gogoproto.moretags)   = "yaml:\"priority_normalizer\"",
-      (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-      (gogoproto.nullable)   = false,
-      (gogoproto.jsontag) = "priority_normalizer"
-  ];
-  string base_fee_per_gas = 3 [
-    (gogoproto.moretags)   = "yaml:\"base_fee_per_gas\"",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-    (gogoproto.nullable)   = false,
-    (gogoproto.jsontag) = "base_fee_per_gas"
-];
-string minimum_fee_per_gas = 4 [
-  (gogoproto.moretags)   = "yaml:\"minimum_fee_per_gas\"",
-  (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-  (gogoproto.nullable)   = false,
-  (gogoproto.jsontag) = "minimum_fee_per_gas"
-];
-
   // ChainConfig chain_config = 5 [(gogoproto.moretags) = "yaml:\"chain_config\"", (gogoproto.nullable) = false];
 //   string chain_id = 6 [
 //   (gogoproto.moretags)   = "yaml:\"chain_id\"",

x/evm/keeper/params.go

@@ -1,7 +1,6 @@
 package keeper
 
 import (
-	"fmt"
 	"math/big"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -17,32 +16,7 @@ func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
 }
 
 func (k *Keeper) GetParams(ctx sdk.Context) (params types.Params) {
-	if ctx.IsCheckTx() {
-		return k.GetParamsIfExists(ctx)
-	}
-	params = types.Params{}
-	defer func() {
-		if r := recover(); r != nil {
-			// If panic occurs, try to get V590 params
-			fmt.Printf("[Debug panic get paramset with height: %d\n", ctx.BlockHeight())
-			params = k.GetV590Params(ctx)
-		}
-	}()
-	k.Paramstore.GetParamSet(ctx, &params)
-	return params
-}
-
-func (k *Keeper) GetV590Params(ctx sdk.Context) types.Params {
-	v590Params := types.ParamsV590{}
-	k.Paramstore.GetParamSet(ctx, &v590Params)
-	// Convert GetV590Params to types.Params
-	return types.Params{
-		PriorityNormalizer:                     v590Params.PriorityNormalizer,
-		BaseFeePerGas:                          v590Params.BaseFeePerGas,
-		MinimumFeePerGas:                       v590Params.MinimumFeePerGas,
-		WhitelistedCwCodeHashesForDelegateCall: v590Params.WhitelistedCwCodeHashesForDelegateCall,
-		DeliverTxHookWasmGasLimit:              uint64(300000),
-	}
+	return k.GetParamsIfExists(ctx)
 }
 
 func (k *Keeper) GetParamsIfExists(ctx sdk.Context) types.Params {

x/evm/types/params.go

@@ -55,20 +55,6 @@ func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
 	}
 }
 
-func (p *ParamsV590) ParamSetPairs() paramtypes.ParamSetPairs {
-	return paramtypes.ParamSetPairs{
-		paramtypes.NewParamSetPair(KeyPriorityNormalizer, &p.PriorityNormalizer, validatePriorityNormalizer),
-		paramtypes.NewParamSetPair(KeyBaseFeePerGas, &p.BaseFeePerGas, validateBaseFeePerGas),
-		paramtypes.NewParamSetPair(KeyMinFeePerGas, &p.MinimumFeePerGas, validateMinFeePerGas),
-		paramtypes.NewParamSetPair(KeyWhitelistedCwCodeHashesForDelegateCall, &p.WhitelistedCwCodeHashesForDelegateCall, validateWhitelistedCwHashesForDelegateCall),
-		paramtypes.NewParamSetPair(KeyDeliverTxHookWasmGasLimit, &p.DeliverTxHookWasmGasLimit, validateDeliverTxHookWasmGasLimit),
-	}
-}
-func (p ParamsV590) String() string {
-	out, _ := yaml.Marshal(p)
-	return string(out)
-}
-
 func (p Params) Validate() error {
 	if err := validatePriorityNormalizer(p.PriorityNormalizer); err != nil {
 		return err