fix: strv2 migration has been panicking on blocked addresses

Author: Yurist-85

Makefile

@@ -6,7 +6,7 @@ DIFF_TAG=$(shell git rev-list --tags="v*" --max-count=1 --not $(shell git rev-li
 DEFAULT_TAG=$(shell git rev-list --tags="v*" --max-count=1)
 # VERSION ?= $(shell echo $(shell git describe --tags $(or $(DIFF_TAG), $(DEFAULT_TAG))) | sed 's/^v//')
 
-VERSION := "1.8.4"
+VERSION := "1.8.5"
 CBFTVERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')
 COMMIT := $(shell git log -1 --format='%H')
 LEDGER_ENABLED ?= true

app/app.go

@@ -172,7 +172,7 @@ import (
 	v181 "github.com/haqq-network/haqq/app/upgrades/v1.8.1"
 	v182 "github.com/haqq-network/haqq/app/upgrades/v1.8.2"
 	v183 "github.com/haqq-network/haqq/app/upgrades/v1.8.3"
-	v184 "github.com/haqq-network/haqq/app/upgrades/v1.8.4"
+	v185 "github.com/haqq-network/haqq/app/upgrades/v1.8.5"
 
 	// NOTE: override ICS20 keeper to support IBC transfers of ERC20 tokens
 	"github.com/haqq-network/haqq/x/ibc/transfer"
@@ -565,15 +565,11 @@ func NewHaqq(
 
 	epochsKeeper := epochskeeper.NewKeeper(appCodec, keys[epochstypes.StoreKey])
 	app.EpochsKeeper = *epochsKeeper.SetHooks(
-		epochskeeper.NewMultiEpochHooks(
-		// insert epoch hooks receivers here
-		),
+		epochskeeper.NewMultiEpochHooks( /* insert epoch hooks receivers here */ ),
 	)
 
 	app.GovKeeper = *govKeeper.SetHooks(
-		govtypes.NewMultiGovHooks(
-		// insert gov hooks receivers here
-		),
+		govtypes.NewMultiGovHooks( /* insert gov hooks receivers here */ ),
 	)
 
 	// Initialize the packet forward middleware Keeper
@@ -1237,10 +1233,10 @@ func (app *Haqq) setupUpgradeHandlers() {
 		v183.CreateUpgradeHandler(app.mm, app.configurator),
 	)
 
-	// v1.8.4 EVM Precompiles upgrade
+	// v1.8.5 EVM Precompiles upgrade (hot fix applied to strv2 migration)
 	app.UpgradeKeeper.SetUpgradeHandler(
-		v184.UpgradeName,
-		v184.CreateUpgradeHandler(app.mm, app.configurator, app.AccountKeeper, app.BankKeeper, app.Erc20Keeper, app.EvmKeeper),
+		v185.UpgradeName,
+		v185.CreateUpgradeHandler(app.mm, app.configurator, app.AccountKeeper, app.BankKeeper, app.Erc20Keeper, app.EvmKeeper),
 	)
 
 	// When a planned update height is reached, the old binary will panic

app/upgrades/v1.8.4/constants.go app/upgrades/v1.8.5/constants.goapp/upgrades/v1.8.4/constants.go renamed to app/upgrades/v1.8.5/constants.go

@@ -1,6 +1,6 @@
-package v184
+package v185
 
 const (
 	// UpgradeName is the shared upgrade plan name for mainnet
-	UpgradeName = "v1.8.4"
+	UpgradeName = "v1.8.5"
 )

app/upgrades/v1.8.4/convert.go app/upgrades/v1.8.5/convert.goapp/upgrades/v1.8.4/convert.go renamed to app/upgrades/v1.8.5/convert.go

@@ -1,4 +1,4 @@
-package v184
+package v185
 
 import (
 	"fmt"
@@ -48,6 +48,13 @@ func executeConversion(
 		// Create the coin
 		coins := sdk.Coins{sdk.Coin{Denom: tokenPair.Denom, Amount: sdk.NewIntFromBigInt(balance)}}
 
+		if bankKeeper.BlockedAddr(result.address) {
+			// Skip blocked address on balance migration as some Precompiles
+			// and Module accounts are prohibited from receiving coins.
+			ctx.Logger().Info(fmt.Sprintf("skip blocked address - %s, stuck coins: %s", result.address.String(), coins.String()))
+			continue
+		}
+
 		err := bankKeeper.SendCoinsFromModuleToAccount(ctx, erc20types.ModuleName, result.address, coins)
 		if err != nil {
 			return err

app/upgrades/v1.8.4/upgrades.go app/upgrades/v1.8.5/upgrades.goapp/upgrades/v1.8.4/upgrades.go renamed to app/upgrades/v1.8.5/upgrades.go

@@ -1,4 +1,4 @@
-package v184
+package v185
 
 import (
 	errorsmod "cosmossdk.io/errors"