From 73c9ea218e48c393b04957c83b25c019ad7a748b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Kunze=20K=C3=BCllmer?=
 <31522760+fedekunze@users.noreply.github.com>
Date: Tue, 19 Jul 2022 17:00:43 +0200
Subject: [PATCH] fix(rpc): fix panic on breaking EVM and feemarket params
 (#1188)

* release: v0.17.0 changelog (#1153)

* release: v0.17.0 changelog

* rm newline

* update link

* fix(rpc): fix panic on breaking EVM and feemarket params

* changelog

* fix gosec
---
 .mergify.yml                 |  8 ++++++++
 CHANGELOG.md                 |  1 +
 server/json_rpc.go           | 11 ++++++-----
 x/evm/keeper/params.go       |  7 ++++++-
 x/feemarket/keeper/params.go |  6 +++++-
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 56378a89..eb3ceeee 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -23,6 +23,14 @@ pull_request_rules:
       backport:
         branches:
           - main
+  - name: backport patches to v0.17.x branch
+    conditions:
+      - base=main
+      - label=backport/0.17.x
+    actions:
+      backport:
+        branches:
+          - release/v0.17.x
   - name: backport patches to v0.16.x branch
     conditions:
       - base=main
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61bd122d..43b894bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 
+* (rpc) [\#1190](https://github.com/evmos/ethermint/issues/1190) Fix `UnmarshalJSON` panig of breaking EVM and fee market `Params`.
 * (rpc) [#1179](https://github.com/evmos/ethermint/pull/1179) Fix gas used in traceTransaction response.
 
 ## [v0.17.0] - 2022-06-27
diff --git a/server/json_rpc.go b/server/json_rpc.go
index feefa12c..c27399b8 100644
--- a/server/json_rpc.go
+++ b/server/json_rpc.go
@@ -61,11 +61,12 @@ func StartJSONRPC(ctx *server.Context, clientCtx client.Context, tmRPCAddr, tmEn
 	}
 
 	httpSrv := &http.Server{
-		Addr:         config.JSONRPC.Address,
-		Handler:      handlerWithCors.Handler(r),
-		ReadTimeout:  config.JSONRPC.HTTPTimeout,
-		WriteTimeout: config.JSONRPC.HTTPTimeout,
-		IdleTimeout:  config.JSONRPC.HTTPIdleTimeout,
+		Addr:              config.JSONRPC.Address,
+		Handler:           handlerWithCors.Handler(r),
+		ReadHeaderTimeout: config.JSONRPC.HTTPTimeout,
+		ReadTimeout:       config.JSONRPC.HTTPTimeout,
+		WriteTimeout:      config.JSONRPC.HTTPTimeout,
+		IdleTimeout:       config.JSONRPC.HTTPIdleTimeout,
 	}
 	httpSrvDone := make(chan struct{}, 1)
 
diff --git a/x/evm/keeper/params.go b/x/evm/keeper/params.go
index f9de24bf..c28198b4 100644
--- a/x/evm/keeper/params.go
+++ b/x/evm/keeper/params.go
@@ -8,7 +8,12 @@ import (
 
 // GetParams returns the total set of evm parameters.
 func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) {
-	k.paramSpace.GetParamSet(ctx, &params)
+	// TODO: update once https://github.com/cosmos/cosmos-sdk/pull/12615 is merged
+	// and released
+	for _, pair := range params.ParamSetPairs() {
+		k.paramSpace.GetIfExists(ctx, pair.Key, pair.Value)
+	}
+
 	return params
 }
 
diff --git a/x/feemarket/keeper/params.go b/x/feemarket/keeper/params.go
index 1fb9e28f..1583716c 100644
--- a/x/feemarket/keeper/params.go
+++ b/x/feemarket/keeper/params.go
@@ -9,7 +9,11 @@ import (
 
 // GetParams returns the total set of fee market parameters.
 func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) {
-	k.paramSpace.GetParamSet(ctx, &params)
+	// TODO: update once https://github.com/cosmos/cosmos-sdk/pull/12615 is merged
+	// and released
+	for _, pair := range params.ParamSetPairs() {
+		k.paramSpace.GetIfExists(ctx, pair.Key, pair.Value)
+	}
 	return params
 }