bump v4 upgrade

Author: hard-nett

app/upgrades/v4/headstash-patch.go

@@ -1,51 +1,56 @@
 package v4
 
 import (
-	"fmt"
 	"strconv"
 	"strings"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
-
 	"github.com/terpnetwork/terp-core/v2/app/upgrades"
+
+	v3 "github.com/terpnetwork/terp-core/v2/app/upgrades/v3"
 )
 
-	// revert headstash allocation by depositing funds back into community pool 
-	func ReturnFundsToCommunityPool(ctx sdk.Context, dk keepers.DistrKeeper, bk keepers.BankKeeper) error {	
-		
-		headstashes := GetHeadstashPayments()
-
-		nativeDenom := upgrades.GetChainsDenomToken(ctx.ChainID())
-		nativeFeeDenom := upgrades.GetChainsFeeDenomToken(ctx.ChainID())
-
-		for _, headstash := range headstashes {
-			addr, err := sdk.AccAddressFromBech32(headstash[0])
-			if err != nil {
-				panic(err)
-			}
-			// defines the value associated with a given address
-			amount, err := strconv.ParseInt(strings.TrimSpace(headstash[1]), 10, 64)
-			if err != nil {
-				panic(err)
-			}
-			terpcoins := sdk.NewCoins(
-				sdk.NewInt64Coin(nativeDenom, amount),
-			)
-			thiolcoins := sdk.NewCoins(
-				sdk.NewInt64Coin(nativeFeeDenom, amount),
-			)
-			if err := dsk.FundCommunityPool(ctx, terpcoins, addr); err != nil {
-				panic(err)
-			}
-			if err := dsk.FundCommunityPool(ctx, thiolcoins, addr); err != nil {
-				panic(err)
-			}
-			total += amount
-		}
+// revert headstash allocation by depositing funds back into community pool
+func ReturnFundsToCommunityPool(
+	ctx sdk.Context,
+	dk distrkeeper.Keeper,
+	bk bankkeeper.Keeper,
+) {
+
+	headstashes := v3.GetHeadstashPayments()
+	total := int64(0)
+
+	nativeDenom := upgrades.GetChainsDenomToken(ctx.ChainID())
+	nativeFeeDenom := upgrades.GetChainsFeeDenomToken(ctx.ChainID())
 
+	for _, headstash := range headstashes {
+		addr, err := sdk.AccAddressFromBech32(headstash[0])
+		if err != nil {
+			panic(err)
+		}
+		// defines the value associated with a given address
+		amount, err := strconv.ParseInt(strings.TrimSpace(headstash[1]), 10, 64)
+		if err != nil {
+			panic(err)
+		}
+		terpcoins := sdk.NewCoins(
+			sdk.NewInt64Coin(nativeDenom, amount),
+		)
+		thiolcoins := sdk.NewCoins(
+			sdk.NewInt64Coin(nativeFeeDenom, amount),
+		)
+		if err := dk.FundCommunityPool(ctx, terpcoins, addr); err != nil {
+			panic(err)
+		}
+		if err := dk.FundCommunityPool(ctx, thiolcoins, addr); err != nil {
+			panic(err)
+		}
+		total += amount
 	}
 
-	// TODO: handle headstash-patch contract upload & instantiation
+}
+
+// TODO: handle headstash-patch contract upload & instantiation

app/upgrades/v4/upgrade.go

@@ -1,12 +1,16 @@
 package v4
 
 import (
+	"fmt"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
 	"github.com/terpnetwork/terp-core/v2/app/keepers"
+	"github.com/terpnetwork/terp-core/v2/app/upgrades"
 	clocktypes "github.com/terpnetwork/terp-core/v2/x/clock/types"
+	globalfeetypes "github.com/terpnetwork/terp-core/v2/x/globalfee/types"
 )
 
 // CreateUpgradeHandler creates an SDK upgrade handler for v4
@@ -16,7 +20,7 @@ func CreateV4UpgradeHandler(
 	keepers *keepers.AppKeepers,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
-
+		logger := ctx.Logger().With("upgrade", UpgradeName)
 		// x/clock
 		if err := keepers.ClockKeeper.SetParams(ctx, clocktypes.DefaultParams()); err != nil {
 			return nil, err
@@ -38,8 +42,8 @@ func CreateV4UpgradeHandler(
 		}
 		logger.Info(fmt.Sprintf("upgraded global fee params to %s", minGasPrices))
 
-		// revert headstash allocation 
-		ReturnFundsToCommunityPool(ctx, keepers.BankKeeper, keepers.DistrKeeper)
+		// revert headstash allocation
+		ReturnFundsToCommunityPool(ctx, keepers.DistrKeeper, keepers.BankKeeper)
 
 		// TODO: handle deployment & instantiation of headstash patch contract