Extend Vesting Lockup periods (#312)

* revesting upgrade draft

* add test coverage

* chore: add packet forwarding middleware

* fix: remove invalid directive toolchain

* chore: delint code, remove redundant dependencies in tests

* fix duration in tests

* set fixed timestamp in upgrade test setup

* chore: bump version

* chore: add logs

* chore: rewrite for better readability

* chore: rewrite for better readability

* chore: rewrite for better readability

* add liquidvesting genesis export and import functionalities

* fix linter

* fix liquidation schedule shift flow

---------

Co-authored-by: Petr Ivanov <[email protected]>
Co-authored-by: Evgeniy Abramov <[email protected]>

Author: 3 people

Diff for: .github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: technote-space/get-diff-action@v5
         id: git_diff
         with:

Diff for: .github/workflows/goreleaser.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           check-latest: true
       - name: Pull LFS files
         run: git lfs pull

Diff for: .github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v5
         with:

Diff for: .github/workflows/snyk.yml

@@ -2,6 +2,7 @@ name: Snyk check
 
 on: push
 
+
 jobs:
   security:
     runs-on: ubuntu-latest
@@ -10,7 +11,7 @@ jobs:
       - uses: snyk/actions/setup@master
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Snyk monitor
         run: snyk code test
         env:

Diff for: .github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Display Go Version
         run: go version
       - name: Install tparse
@@ -37,7 +37,7 @@ jobs:
       - name: Set up go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Checkout source
         uses: actions/checkout@v4
       - name: Generate LFS file list

Diff for: .golangci.yml

@@ -52,7 +52,7 @@ linters-settings:
   staticcheck:
     checks: ["All", "-SA1019"]
   gofumpt:
-    lang-version: "1.20"
+    lang-version: "1.21"
   gomodguard:
     blocked:
       versions:                                                         # List of blocked module version constraints

Diff for: .snyk

@@ -1,4 +1,6 @@
-version: 1.19.0
+version: v1.25.0
+language-settings: 
+    go: "1.21"
 exclude:
     global:
         - client/export.go

Diff for: 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.7.3"
+VERSION := "1.7.4"
 CBFTVERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')
 COMMIT := $(shell git log -1 --format='%H')
 LEDGER_ENABLED ?= true

Diff for: app/app.go

@@ -114,6 +114,10 @@ import (
 	icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
 	icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
 
+	"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward"
+	packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper"
+	packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
+
 	"github.com/cosmos/cosmos-sdk/x/consensus"
 	consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
 	consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
@@ -162,6 +166,7 @@ import (
 	v171 "github.com/haqq-network/haqq/app/upgrades/v1.7.1"
 	v172 "github.com/haqq-network/haqq/app/upgrades/v1.7.2"
 	v173 "github.com/haqq-network/haqq/app/upgrades/v1.7.3"
+	v174 "github.com/haqq-network/haqq/app/upgrades/v1.7.4"
 
 	// NOTE: override ICS20 keeper to support IBC transfers of ERC20 tokens
 	"github.com/haqq-network/haqq/x/ibc/transfer"
@@ -225,6 +230,7 @@ var (
 		ibc.AppModuleBasic{},
 		ibctm.AppModuleBasic{},
 		ica.AppModuleBasic{},
+		packetforward.AppModuleBasic{},
 		authzmodule.AppModuleBasic{},
 		feegrantmodule.AppModuleBasic{},
 		upgrade.AppModuleBasic{},
@@ -301,6 +307,7 @@ type Haqq struct {
 	AuthzKeeper           authzkeeper.Keeper
 	IBCKeeper             *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
 	ICAHostKeeper         icahostkeeper.Keeper
+	PacketForwardKeeper   *packetforwardkeeper.Keeper
 	EvidenceKeeper        evidencekeeper.Keeper
 	TransferKeeper        transferkeeper.Keeper
 	ConsensusParamsKeeper consensusparamkeeper.Keeper
@@ -383,6 +390,7 @@ func NewHaqq(
 		feegrant.StoreKey, authzkeeper.StoreKey, crisistypes.StoreKey,
 		// ibc keys
 		ibcexported.StoreKey, ibctransfertypes.StoreKey,
+		packetforwardtypes.StoreKey,
 		// ica keys
 		icahosttypes.StoreKey,
 		// ethermint keys
@@ -561,6 +569,19 @@ func NewHaqq(
 		),
 	)
 
+	// Initialize the packet forward middleware Keeper
+	// It's important to note that the PFM Keeper must be initialized before the Transfer Keeper
+	app.PacketForwardKeeper = packetforwardkeeper.NewKeeper(
+		appCodec,
+		keys[packetforwardtypes.StoreKey],
+		nil, // will be zero-value here, reference is set later on with SetTransferKeeper.
+		app.IBCKeeper.ChannelKeeper,
+		app.DistrKeeper,
+		app.BankKeeper,
+		app.IBCKeeper.ChannelKeeper,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+	)
+
 	// Create Transfer Stack
 
 	// SendPacket, since it is originating from the application to core IBC:
@@ -571,12 +592,14 @@ func NewHaqq(
 
 	app.TransferKeeper = transferkeeper.NewKeeper(
 		appCodec, keys[ibctransfertypes.StoreKey], app.GetSubspace(ibctransfertypes.ModuleName),
-		app.IBCKeeper.ChannelKeeper, // ICS4 Wrapper
+		app.PacketForwardKeeper, // ICS4 Wrapper
 		app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper,
 		app.AccountKeeper, app.BankKeeper, scopedTransferKeeper,
 		app.Erc20Keeper, // Add ERC20 Keeper for ERC20 transfers
 	)
 
+	app.PacketForwardKeeper.SetTransferKeeper(app.TransferKeeper)
+
 	transferModule := transfer.NewAppModule(app.TransferKeeper)
 
 	// Create the app.ICAHostKeeper
@@ -595,14 +618,21 @@ func NewHaqq(
 	icaHostIBCModule := icahost.NewIBCModule(app.ICAHostKeeper)
 
 	// transfer stack contains (from top to bottom):
-	// - IBC Firewall Middleware
 	// - Transfer
+	// - Packet Forward Middleware
 	// - ERC20 Middleware
 
 	// create IBC module from bottom to top of stack
 	var transferStack porttypes.IBCModule
 
 	transferStack = transfer.NewIBCModule(app.TransferKeeper)
+	transferStack = packetforward.NewIBCMiddleware(
+		transferStack,
+		app.PacketForwardKeeper,
+		0, // retries on timeout
+		packetforwardkeeper.DefaultForwardTransferPacketTimeoutTimestamp, // forward timeout
+		packetforwardkeeper.DefaultRefundTransferPacketTimeoutTimestamp,  // refund timeout
+	)
 	transferStack = erc20.NewIBCMiddleware(app.Erc20Keeper, transferStack)
 
 	// // Create static IBC router, add transfer route, then set and seal it
@@ -655,6 +685,7 @@ func NewHaqq(
 		ibc.NewAppModule(app.IBCKeeper),
 		ica.NewAppModule(nil, &app.ICAHostKeeper),
 		transferModule,
+		packetforward.NewAppModule(app.PacketForwardKeeper, app.GetSubspace(packetforwardtypes.ModuleName)),
 		// Ethermint app modules
 		evm.NewAppModule(app.EvmKeeper, app.AccountKeeper, app.GetSubspace(evmtypes.ModuleName)),
 		feemarket.NewAppModule(app.FeeMarketKeeper, app.GetSubspace(feemarkettypes.ModuleName)),
@@ -689,6 +720,7 @@ func NewHaqq(
 		ibcexported.ModuleName,
 		// no-op modules
 		ibctransfertypes.ModuleName,
+		packetforwardtypes.ModuleName,
 		icatypes.ModuleName,
 		authtypes.ModuleName,
 		banktypes.ModuleName,
@@ -717,6 +749,7 @@ func NewHaqq(
 		// no-op modules
 		ibcexported.ModuleName,
 		ibctransfertypes.ModuleName,
+		packetforwardtypes.ModuleName,
 		icatypes.ModuleName,
 		capabilitytypes.ModuleName,
 		authtypes.ModuleName,
@@ -765,6 +798,7 @@ func NewHaqq(
 		genutiltypes.ModuleName,
 		evidencetypes.ModuleName,
 		ibctransfertypes.ModuleName,
+		packetforwardtypes.ModuleName,
 		icatypes.ModuleName,
 		authz.ModuleName,
 		feegrant.ModuleName,
@@ -1129,6 +1163,7 @@ func initParamsKeeper(
 	paramsKeeper.Subspace(ibctransfertypes.ModuleName)
 	paramsKeeper.Subspace(ibcexported.ModuleName)
 	paramsKeeper.Subspace(icahosttypes.SubModuleName)
+	paramsKeeper.Subspace(packetforwardtypes.ModuleName).WithKeyTable(packetforwardtypes.ParamKeyTable())
 	// ethermint subspaces
 	paramsKeeper.Subspace(evmtypes.ModuleName).WithKeyTable(evmtypes.ParamKeyTable()) //nolint: staticcheck
 	paramsKeeper.Subspace(feemarkettypes.ModuleName).WithKeyTable(feemarkettypes.ParamKeyTable())
@@ -1227,6 +1262,12 @@ func (app *Haqq) setupUpgradeHandlers() {
 		v173.CreateUpgradeHandler(app.mm, app.configurator),
 	)
 
+	// v1.7.4 Revesting upgrade + Packet Forward Middleware
+	app.UpgradeKeeper.SetUpgradeHandler(
+		v174.UpgradeName,
+		v174.CreateUpgradeHandler(app.mm, app.configurator, app.AccountKeeper, app.LiquidVestingKeeper),
+	)
+
 	// When a planned update height is reached, the old binary will panic
 	// writing on disk the height and name of the update that triggered it
 	// This will read that value, and execute the preparations for the upgrade.
@@ -1261,6 +1302,12 @@ func (app *Haqq) setupUpgradeHandlers() {
 				liquidvestingtypes.ModuleName,
 			},
 		}
+	case v174.UpgradeName:
+		storeUpgrades = &storetypes.StoreUpgrades{
+			Added: []string{
+				packetforwardtypes.ModuleName,
+			},
+		}
 	}
 
 	if storeUpgrades != nil {

Diff for: app/upgrades/v1.7.4/constants.go

@@ -0,0 +1,15 @@
+package v174
+
+const (
+	// UpgradeName is the shared upgrade plan name for mainnet and testnet
+	UpgradeName = "v1.7.4"
+
+	// VestingStretchLength defines new vesting periods length as three years in days
+	VestingStretchLength = 1095
+
+	// LockupLengthThreshold defines threshold parameter as 1767225600 is timestamp for 2026-01-01
+	LockupLengthThreshold = 1767225600
+
+	// One day in seconds
+	OneDayInSeconds = int64(86_400)
+)