From c994c5643ef3e2229d0cbfadedd05e91b8c7b7bb Mon Sep 17 00:00:00 2001
From: Alexxxxxx <118710506+alexgao001@users.noreply.github.com>
Date: Thu, 25 May 2023 11:10:23 +0800
Subject: [PATCH 1/3] add new msg (#210)

---
 x/gashub/types/genesis.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x/gashub/types/genesis.go b/x/gashub/types/genesis.go
index c7dd044764..4dd77e57b3 100644
--- a/x/gashub/types/genesis.go
+++ b/x/gashub/types/genesis.go
@@ -100,6 +100,7 @@ func DefaultGenesisState() *GenesisState {
 		*NewMsgGasParamsWithFixedGas("/greenfield.storage.MsgDeleteGroup", 1.2e3),
 		*NewMsgGasParamsWithFixedGas("/greenfield.storage.MsgLeaveGroup", 1.2e3),
 		*NewMsgGasParamsWithFixedGas("/greenfield.storage.MsgUpdateGroupMember", 1.2e3),
+		*NewMsgGasParamsWithFixedGas("/greenfield.storage.MsgUpdateGroupExtra", 1.2e3),
 		*NewMsgGasParamsWithFixedGas("/greenfield.storage.MsgMirrorGroup", 1.2e3),
 		*NewMsgGasParamsWithFixedGas("/greenfield.storage.MsgPutPolicy", 2.4e3),
 		*NewMsgGasParamsWithFixedGas("/greenfield.storage.MsgDeletePolicy", 1.2e3),

From 15cab3821d727b3cb2e0a8e562641d41c5d5c943 Mon Sep 17 00:00:00 2001
From: forcodedancing <just.haha.it@gmail.com>
Date: Fri, 26 May 2023 10:09:28 +0800
Subject: [PATCH 2/3] fix: fix blockchain stop to produce blocks (#211)

---
 baseapp/baseapp.go | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index 179584b5a9..4a2a4dcdf1 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -882,10 +882,13 @@ func createEvents(events sdk.Events, msg sdk.Msg) sdk.Events {
 // PrepareProposal state internally will be discarded. <nil, err> will be
 // returned if the transaction cannot be encoded. <bz, nil> will be returned if
 // the transaction is valid, otherwise <bz, err> will be returned.
-func (app *BaseApp) PrepareProposalVerifyTx(tx sdk.Tx) ([]byte, error) {
-	bz, err := app.txEncoder(tx)
-	if err != nil {
-		return nil, err
+func (app *BaseApp) PrepareProposalVerifyTx(tx sdk.Tx, bz []byte) ([]byte, error) {
+	var err error
+	if bz == nil {
+		bz, err = app.txEncoder(tx)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	_, _, _, _, err = app.runTx(runTxPrepareProposal, bz) //nolint:dogsled
@@ -920,7 +923,7 @@ type (
 	// that any custom ABCI PrepareProposal and ProcessProposal handler can use
 	// to verify a transaction.
 	ProposalTxVerifier interface {
-		PrepareProposalVerifyTx(tx sdk.Tx) ([]byte, error)
+		PrepareProposalVerifyTx(tx sdk.Tx, txBz []byte) ([]byte, error)
 		ProcessProposalVerifyTx(txBz []byte) (sdk.Tx, error)
 	}
 
@@ -961,18 +964,24 @@ func NewDefaultProposalHandler(mp mempool.Mempool, txVerifier ProposalTxVerifier
 // FIFO order.
 func (h DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHandler {
 	return func(ctx sdk.Context, req abci.RequestPrepareProposal) abci.ResponsePrepareProposal {
+		var (
+			selectedTxs  [][]byte
+			totalTxBytes int64
+		)
+
 		// If the mempool is nil or a no-op mempool, we simply return the transactions
 		// requested from CometBFT, which, by default, should be in FIFO order.
 		_, isNoOp := h.mempool.(mempool.NoOpMempool)
 		if h.mempool == nil || isNoOp {
-			return abci.ResponsePrepareProposal{Txs: req.Txs}
+			for _, txBz := range req.Txs { // req.MaxTxBytes has been ensured
+				bz, err := h.txVerifier.PrepareProposalVerifyTx(nil, txBz)
+				if err == nil {
+					selectedTxs = append(selectedTxs, bz)
+				}
+			}
+			return abci.ResponsePrepareProposal{Txs: selectedTxs}
 		}
 
-		var (
-			selectedTxs  [][]byte
-			totalTxBytes int64
-		)
-
 		iterator := h.mempool.Select(ctx, req.Txs)
 
 		for iterator != nil {
@@ -982,7 +991,7 @@ func (h DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHand
 			// which calls mempool.Insert, in theory everything in the pool should be
 			// valid. But some mempool implementations may insert invalid txs, so we
 			// check again.
-			bz, err := h.txVerifier.PrepareProposalVerifyTx(memTx)
+			bz, err := h.txVerifier.PrepareProposalVerifyTx(memTx, nil)
 			if err != nil {
 				err := h.mempool.Remove(memTx)
 				if err != nil && !errors.Is(err, mempool.ErrTxNotFound) {

From ced96bd3461a074952c3cadc7e9d1aaf3a6b1bc0 Mon Sep 17 00:00:00 2001
From: Alexxxxxx <118710506+alexgao001@users.noreply.github.com>
Date: Fri, 26 May 2023 10:31:06 +0800
Subject: [PATCH 3/3] doc: add change log (#212)

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfd03e9ed3..c09d85877a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.2.1-alpha.2
+This is a maintenance release.
+
+* [\#210](https://github.com/bnb-chain/greenfield-cosmos-sdk/pull/210) feat: add msg in gashub
+* [\#211](https://github.com/bnb-chain/greenfield-cosmos-sdk/pull/211) fix: fix blockchain stop to produce blocks
+
 ## v0.2.1-alpha.1
 This release enable the support of multiple messages for EIP712.