3.0.4 release (sei-protocol#883)

* 3.0.4 release * Bump version * Register mig * fix * fix * Fix tkf * Bump sei-cosmos with reset revert * Update CHANGELOG.md --------- Co-authored-by: Brandon Weng <[email protected]>
Hridoy000368 · Jun 16, 2023 · b0ab562 · b0ab562
1 parent 624eed3
commit b0ab562
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,14 +27,29 @@ Ref: https://keepachangelog.com/en/1.0.0/
 -->
 
 # Changelog
+## 3.0.4
+sei-chain:
+* [#874] (https://github.com/sei-protocol/sei-chain/pull/874) Charge rent after failed Sudo call
+* [#869] (https://github.com/sei-protocol/sei-chain/pull/869) Require fee per byte in order data
+* [#861] (https://github.com/sei-protocol/sei-chain/pull/861) Fix tokenfactory metadata 
+
+sei-cosmos: 
+* [#287] (https://github.com/sei-protocol/sei-cosmos/pull/287) Refactor deferred balance to use memkv
+* [#286] (https://github.com/sei-protocol/sei-cosmos/pull/286) Prevent multisig sign with wrong key
+* [#284] (https://github.com/sei-protocol/sei-cosmos/pull/284) Fix allowed_msg uncapped spend limit
+* [#280] (https://github.com/sei-protocol/sei-cosmos/pull/280) Barberry patch
+
+sei-tendermint:
+* [#148] (https://github.com/sei-protocol/sei-tendermint/pull/148) Add sleep to avoid consensus reactor retrying too quickly
+* 
 ## 3.0.3
 sei-chain: 
 * [#816] (https://github.com/sei-protocol/sei-chain/pull/816) Reenable tx concurrency for non oracle/priority txs
 
 sei-cosmos:
 * [#254] (https://github.com/sei-protocol/sei-cosmos/pull/254) Use sequential searching instead of binary search for coins
 
-sei-tendermint
+sei-tendermint:
 * [#143] (https://github.com/sei-protocol/sei-tendermint/pull/143) Fix cpu leak for simple pq but stopping timer
 * [#140] (https://github.com/sei-protocol/sei-tendermint/pull/140) Add raw logs to tx output
 

diff --git a/app/app.go b/app/app.go
@@ -1080,6 +1080,7 @@ func (app *App) ProcessTxConcurrent(
 	ctx = ctx.WithMsgValidator(
 		sdkacltypes.NewMsgValidator(aclutils.StoreKeyToResourceTypePrefixMap),
 	)
+	ctx = ctx.WithTxIndex(txIndex)
 
 	// Deliver the transaction and store the result in the channel
 	resultChan <- ChannelResult{txIndex, app.DeliverTxWithResult(ctx, txBytes)}

diff --git a/app/upgrades.go b/app/upgrades.go
@@ -53,6 +53,7 @@ var upgradesList = []string{
 	"3.0.1",
 	"3.0.2",
 	"3.0.3",
+	"3.0.4",
 }
 
 func (app App) RegisterUpgradeHandlers() {

diff --git a/go.mod b/go.mod
@@ -274,12 +274,12 @@ require (
 replace (
 	github.com/CosmWasm/wasmd => github.com/sei-protocol/sei-wasmd v0.0.2
 	github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
-	github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.2.44-0.20230614154814-85b0d5f9be0e
+	github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.2.47
 	github.com/cosmos/iavl => github.com/sei-protocol/sei-iavl v0.1.4
 	github.com/cosmos/ibc-go/v3 => github.com/sei-protocol/sei-ibc-go/v3 v3.1.0
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/keybase/go-keychain => github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4
-	github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.2.21
+	github.com/tendermint/tendermint => github.com/sei-protocol/sei-tendermint v0.2.22
 	github.com/tendermint/tm-db => github.com/sei-protocol/tm-db v0.0.4
 	google.golang.org/grpc => google.golang.org/grpc v1.33.2
 )
diff --git a/go.sum b/go.sum
@@ -1075,14 +1075,14 @@ github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod
 github.com/securego/gosec/v2 v2.11.0 h1:+PDkpzR41OI2jrw1q6AdXZCbsNGNGT7pQjal0H0cArI=
 github.com/securego/gosec/v2 v2.11.0/go.mod h1:SX8bptShuG8reGC0XS09+a4H2BoWSJi+fscA+Pulbpo=
 github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY=
-github.com/sei-protocol/sei-cosmos v0.2.44-0.20230614154814-85b0d5f9be0e h1:E85RQhxwJ5IV3YWPRGTbMbOiErzJFRaIdw4wBCqRz7E=
-github.com/sei-protocol/sei-cosmos v0.2.44-0.20230614154814-85b0d5f9be0e/go.mod h1:LSR2ut3T6Sv24d8TkXSh9hQ8fskdpI6PNUjY3NQ3pcA=
+github.com/sei-protocol/sei-cosmos v0.2.47 h1:OB6IzRaeRmaB1b8MuRZEQ+ERO8I/RGcPh4hc2t/Z8H0=
+github.com/sei-protocol/sei-cosmos v0.2.47/go.mod h1:LSR2ut3T6Sv24d8TkXSh9hQ8fskdpI6PNUjY3NQ3pcA=
 github.com/sei-protocol/sei-iavl v0.1.4 h1:lT5doPDTBq/UlbofQbM5iS01FbTSJttmA22+d0PJj5o=
 github.com/sei-protocol/sei-iavl v0.1.4/go.mod h1:7PfkEVT5dcoQE+s/9KWdoXJ8VVVP1QpYYPLdxlkSXFk=
 github.com/sei-protocol/sei-ibc-go/v3 v3.1.0 h1:rFHk2R/3vbG9iNr7cYtVclW/UyEDSRFjNVPz60zZswU=
 github.com/sei-protocol/sei-ibc-go/v3 v3.1.0/go.mod h1:Mb+1NXiPOLd+CPFlOC6BKeAUaxXlhuWenMmRiUiSmwY=
-github.com/sei-protocol/sei-tendermint v0.2.21 h1:Y6WDwgBfjIMA+TXdD89d0jt9qfX3ZMtWk+K3DvzLKcc=
-github.com/sei-protocol/sei-tendermint v0.2.21/go.mod h1:+BtDvAwTkE64BlxzpH9ZP7S6vUYT9wRXiZa/WW8/o4g=
+github.com/sei-protocol/sei-tendermint v0.2.22 h1:efD403gCo/kRUZo/HKe9xPJ3M2HTo2849JOTe4wZFSM=
+github.com/sei-protocol/sei-tendermint v0.2.22/go.mod h1:+BtDvAwTkE64BlxzpH9ZP7S6vUYT9wRXiZa/WW8/o4g=
 github.com/sei-protocol/sei-tm-db v0.0.5 h1:3WONKdSXEqdZZeLuWYfK5hP37TJpfaUa13vAyAlvaQY=
 github.com/sei-protocol/sei-tm-db v0.0.5/go.mod h1:Cpa6rGyczgthq7/0pI31jys2Fw0Nfrc+/jKdP1prVqY=
 github.com/sei-protocol/sei-wasmd v0.0.2 h1:I0FVTMSWWVVssBQtDgwcDAyDF+ZT2+RqT20ItTBYih8=

diff --git a/x/dex/module.go b/x/dex/module.go
@@ -206,6 +206,9 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 	_ = cfg.RegisterMigration(types.ModuleName, 14, func(ctx sdk.Context) error {
 		return migrations.V14ToV15(ctx, am.keeper)
 	})
+	_ = cfg.RegisterMigration(types.ModuleName, 15, func(ctx sdk.Context) error {
+		return migrations.V15ToV16(ctx, am.keeper)
+	})
 }
 
 // RegisterInvariants registers the capability module's invariants.
@@ -230,7 +233,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 }
 
 // ConsensusVersion implements ConsensusVersion.
-func (AppModule) ConsensusVersion() uint64 { return 15 }
+func (AppModule) ConsensusVersion() uint64 { return 16 }
 
 // BeginBlock executes all ABCI BeginBlock logic respective to the capability module.
 func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {

diff --git a/x/tokenfactory/keeper/migrations.go b/x/tokenfactory/keeper/migrations.go
@@ -43,16 +43,19 @@ func (m Migrator) Migrate2to3(ctx sdk.Context) error {
 
 func (m Migrator) Migrate3to4(ctx sdk.Context) error {
 	// Set denom metadata for all denoms
-	m.keeper.bankKeeper.IterateTotalSupply(ctx, func(coin sdk.Coin) bool {
-		fmt.Printf("Migration denom: %s\n", coin.Denom)
-		if denomMetadata, err := m.keeper.bankKeeper.GetDenomMetaData(ctx, coin.Denom); !err {
-			panic(fmt.Errorf("denom %s does not exist", coin.Denom))
+	iter := m.keeper.GetAllDenomsIterator(ctx)
+	defer iter.Close()
+	for ; iter.Valid(); iter.Next() {
+		denom := string(iter.Value())
+		if denomMetadata, err := m.keeper.bankKeeper.GetDenomMetaData(ctx, denom); !err {
+			panic(fmt.Errorf("denom %s does not exist", denom))
 		} else {
+			fmt.Printf("Migrating denom: %s\n", denom)
 			m.SetMetadata(&denomMetadata)
 			m.keeper.bankKeeper.SetDenomMetaData(ctx, denomMetadata)
 		}
-		return true
-	})
+
+	}
 	return nil
 }