Create v1.17 upgrade handler & changelog

Author: cboh4

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+# 1.17.0
+- Fix ASA-2025-001, ASA-2025-002, ASA-2025-004, potential Denial-of-Service condition leading to temporary disability in IBC transfers to the native chain
+
 # 1.16.1
 - Fix panic during `secretcli compute query` call
 - Remove gov v1beta1 endpoints from swagger and openapi

app/app.go

@@ -56,6 +56,7 @@ import (
 	v1_14 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.14"
 	v1_15 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.15"
 	v1_16 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.16"
+	v1_17 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.17"
 	v1_4 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.4"
 	v1_5 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.5"
 	v1_6 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.6"
@@ -127,6 +128,7 @@ var (
 		v1_14.Upgrade,
 		v1_15.Upgrade,
 		v1_16.Upgrade,
+		v1_17.Upgrade,
 	}
 )
 

app/keepers/keepers.go

@@ -416,7 +416,6 @@ func (ak *SecretAppKeepers) InitCustomKeepers(
 		ak.keys[ibcpacketforwardtypes.StoreKey],
 		nil, // transfer keeper will be set later on
 		ak.IbcKeeper.ChannelKeeper,
-		ak.DistrKeeper,
 		ak.BankKeeper,
 		ibcHooksICS4Wrapper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
@@ -496,7 +495,6 @@ func (ak *SecretAppKeepers) InitCustomKeepers(
 		ak.PacketForwardKeeper,
 		0,
 		ibcpacketforwardkeeper.DefaultForwardTransferPacketTimeoutTimestamp, // 10 minutes
-		ibcpacketforwardkeeper.DefaultRefundTransferPacketTimeoutTimestamp,  // 28 days
 	)
 	transferStack = ibcfee.NewIBCMiddleware(transferStack, ak.IbcFeeKeeper)
 	transferStack = ibcswitch.NewIBCMiddleware(transferStack, ak.IbcSwitchKeeper)
@@ -552,7 +550,6 @@ func (ak *SecretAppKeepers) InitCustomKeepers(
 		ak.PacketForwardKeeper,
 		0,
 		ibcpacketforwardkeeper.DefaultForwardTransferPacketTimeoutTimestamp, // 10 minutes
-		ibcpacketforwardkeeper.DefaultRefundTransferPacketTimeoutTimestamp,  // 28 days
 	)
 	computeStack = ibcfee.NewIBCMiddleware(computeStack, ak.IbcFeeKeeper)
 	computeStack = ibcswitch.NewIBCMiddleware(computeStack, ak.IbcSwitchKeeper)
@@ -619,7 +616,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(crisistypes.ModuleName)
 	paramsKeeper.Subspace(compute.ModuleName)
 	paramsKeeper.Subspace(reg.ModuleName)
-	paramsKeeper.Subspace(ibcpacketforwardtypes.ModuleName).WithKeyTable(ibcpacketforwardtypes.ParamKeyTable())
 	paramsKeeper.Subspace(ibcswitch.ModuleName).WithKeyTable(ibcswitchtypes.ParamKeyTable())
 
 	return paramsKeeper

app/upgrades/v1.17/upgrade.go

@@ -0,0 +1,39 @@
+package v1_17
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"cosmossdk.io/log"
+	store "cosmossdk.io/store/types"
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	"github.com/scrtlabs/SecretNetwork/app/keepers"
+	"github.com/scrtlabs/SecretNetwork/app/upgrades"
+)
+
+const upgradeName = "v1.17"
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          upgradeName,
+	CreateUpgradeHandler: createUpgradeHandler,
+	StoreUpgrades:        store.StoreUpgrades{},
+}
+
+func createUpgradeHandler(mm *module.Manager, _ *keepers.SecretAppKeepers, configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		logger := log.NewLogger(os.Stderr)
+		logger.Info(` _    _ _____   _____ _____            _____  ______ `)
+		logger.Info(`| |  | |  __ \ / ____|  __ \     /\   |  __ \|  ____|`)
+		logger.Info(`| |  | | |__) | |  __| |__) |   /  \  | |  | | |__   `)
+		logger.Info(`| |  | |  ___/| | |_ |  _  /   / /\ \ | |  | |  __|  `)
+		logger.Info(`| |__| | |    | |__| | | \ \  / ____ \| |__| | |____ `)
+		logger.Info(` \____/|_|     \_____|_|  \_\/_/    \_\_____/|______|`)
+
+		logger.Info(fmt.Sprintf("Running module migrations for %s...", upgradeName))
+
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}