From 60db788e2c9312b91d353ed08f07d54d1893bfce Mon Sep 17 00:00:00 2001
From: mmsqe <mavis@crypto.com>
Date: Wed, 28 Jun 2023 06:59:54 +0800
Subject: [PATCH] feat: add custom max gas for block for sim config (#16656)

(cherry picked from commit 9b2fd7bad9eac5015d10ed76c798826bfd63d44d)

# Conflicts:
#	x/simulation/params.go
---
 CHANGELOG.md               | 4 ++++
 types/simulation/config.go | 3 ++-
 x/simulation/params.go     | 6 +++++-
 x/simulation/simulate.go   | 6 +++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a7388571089..dde8d8e5a977 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
+### Features
+
+* (sims) [#16656](https://github.com/cosmos/cosmos-sdk/pull/16656) Add custom max gas for block for sim config with unlimited as default.
+
 ### Improvements
 
 * (deps) [#16553](https://github.com/cosmos/cosmos-sdk/pull/16553) Bump CometBFT to [v0.34.29](https://github.com/cometbft/cometbft/blob/v0.34.29/CHANGELOG.md#v03429).
diff --git a/types/simulation/config.go b/types/simulation/config.go
index 7f520004d478..4ed9530a92bc 100644
--- a/types/simulation/config.go
+++ b/types/simulation/config.go
@@ -22,5 +22,6 @@ type Config struct {
 	OnOperation   bool // run slow invariants every operation
 	AllInvariants bool // print all failed invariants if a broken invariant is found
 
-	DBBackend string // custom db backend type
+	DBBackend   string // custom db backend type
+	BlockMaxGas int64  // custom max gas for block
 }
diff --git a/x/simulation/params.go b/x/simulation/params.go
index 51dfb6439f10..2d393241bdf3 100644
--- a/x/simulation/params.go
+++ b/x/simulation/params.go
@@ -151,7 +151,11 @@ func (w WeightedProposalContent) ContentSimulatorFn() simulation.ContentSimulato
 // Param change proposals
 
 // randomConsensusParams returns random simulation consensus parameters, it extracts the Evidence from the Staking genesis state.
+<<<<<<< HEAD
 func randomConsensusParams(r *rand.Rand, appState json.RawMessage, cdc codec.JSONCodec) *abci.ConsensusParams {
+=======
+func randomConsensusParams(r *rand.Rand, appState json.RawMessage, cdc codec.JSONCodec, maxGas int64) *cmtproto.ConsensusParams {
+>>>>>>> 9b2fd7bad (feat: add custom max gas for block for sim config (#16656))
 	var genesisState map[string]json.RawMessage
 	err := json.Unmarshal(appState, &genesisState)
 	if err != nil {
@@ -162,7 +166,7 @@ func randomConsensusParams(r *rand.Rand, appState json.RawMessage, cdc codec.JSO
 	consensusParams := &abci.ConsensusParams{
 		Block: &abci.BlockParams{
 			MaxBytes: int64(simulation.RandIntBetween(r, 20000000, 30000000)),
-			MaxGas:   -1,
+			MaxGas:   maxGas,
 		},
 		Validator: &tmproto.ValidatorParams{
 			PubKeyTypes: []string{types.ABCIPubKeyTypeEd25519},
diff --git a/x/simulation/simulate.go b/x/simulation/simulate.go
index e1ee5ffced24..5fd3975815d8 100644
--- a/x/simulation/simulate.go
+++ b/x/simulation/simulate.go
@@ -31,8 +31,12 @@ func initChain(
 	config simulation.Config,
 	cdc codec.JSONCodec,
 ) (mockValidators, time.Time, []simulation.Account, string) {
+	blockMaxGas := int64(-1)
+	if config.BlockMaxGas > 0 {
+		blockMaxGas = config.BlockMaxGas
+	}
 	appState, accounts, chainID, genesisTimestamp := appStateFn(r, accounts, config)
-	consensusParams := randomConsensusParams(r, appState, cdc)
+	consensusParams := randomConsensusParams(r, appState, cdc, blockMaxGas)
 	req := abci.RequestInitChain{
 		AppStateBytes:   appState,
 		ChainId:         chainID,