Problem: recent fixes not released (#1278)

* Problem: recent fixes not released Solution: - merge into the un-released rc2 veresion * Update CHANGELOG.md Signed-off-by: yihuang <[email protected]> * bring testnet feemarket parameters same as mainnet * update sdk * remove authz from swagger * fix sim test * fix gas price --------- Signed-off-by: yihuang <[email protected]>
crypto-org-chain · Jan 3, 2024 · 86ad7b3 · 86ad7b3
1 parent 4cf57d8
commit 86ad7b3
Show file tree

Hide file tree

Showing 9 changed files with 4,937 additions and 7,402 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,14 @@
 # Changelog
 
-## UNRELEASED
+*January 2, 2023*
+
+## v1.1.0-rc2
 
 - [#1258](https://github.com/crypto-org-chain/cronos/pull/1258) Support hard-fork style upgrades.
 - [#1272](https://github.com/crypto-org-chain/cronos/pull/1272) Update ethermint to develop, cosmos-sdk to `v0.47.7`.
 - [#1273](https://github.com/crypto-org-chain/cronos/pull/1273) Enable push0 opcode in integration test.
 - [#1274](https://github.com/crypto-org-chain/cronos/pull/1274) Remove authz module.
 
-*December 11, 2023*
-
-## v1.1.0-rc2
-
 ### Bug Fixes
 
 - [#1215](https://github.com/crypto-org-chain/cronos/pull/1215) Update ethermint to fix of concurrent write in fee history.

diff --git a/app/test_helpers.go b/app/test_helpers.go
@@ -41,7 +41,7 @@ import (
 
 const (
 	SimAppChainID  = "simulation_777-1"
-	SimBlockMaxGas = 81500000
+	SimBlockMaxGas = 815000000
 	TestAppChainID = "cronos_777-1"
 )
 

diff --git a/app/upgrades.go b/app/upgrades.go
@@ -130,6 +130,14 @@ func (app *App) RegisterUpgradeHandlers(cdc codec.BinaryCodec, clientKeeper clie
 		if err := app.CronosKeeper.SetParams(ctx, params); err != nil {
 			return m, err
 		}
+
+		feeparams := app.FeeMarketKeeper.GetParams(ctx)
+		feeparams.BaseFeeChangeDenominator = 300
+		feeparams.ElasticityMultiplier = 4
+		feeparams.BaseFee = sdk.NewInt(10000000000000)
+		feeparams.MinGasPrice = sdk.NewDec(10000000000000)
+		app.FeeMarketKeeper.SetParams(ctx, feeparams)
+
 		return m, nil
 	})
 

diff --git a/client/docs/config.json b/client/docs/config.json
@@ -128,14 +128,6 @@
         }
       }
     },
-    {
-      "url": "./tmp-swagger-gen/cosmos/authz/v1beta1/query.swagger.json",
-      "operationIds": {
-        "rename": {
-          "Params": "AuthzParams"
-        }
-      }
-    },
     {
       "url": "./tmp-swagger-gen/cosmos/feegrant/v1beta1/query.swagger.json",
       "operationIds": {