chore: remove state breaking changes (will be included in different PR)

app/upgrades/v1_3/upgrade.go

@@ -1,28 +1,16 @@
 package v1_3
 
 import (
-	bundlesKeeper "github.com/KYVENetwork/chain/x/bundles/keeper"
-	bundlesTypes "github.com/KYVENetwork/chain/x/bundles/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
-func CreateUpgradeHandler(mm *module.Manager, configurator module.Configurator) upgradeTypes.UpgradeHandler {
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradeTypes.UpgradeHandler {
 	return func(ctx sdk.Context, _ upgradeTypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
-		// TODO UpdateBundlesVersionMap(bundlesKeeper, ctx)
-
 		return mm.RunMigrations(ctx, configurator, vm)
 	}
 }
-
-func UpdateBundlesVersionMap(keeper bundlesKeeper.Keeper, ctx sdk.Context) {
-	keeper.SetBundleVersionMap(ctx, bundlesTypes.BundleVersionMap{
-		Versions: []*bundlesTypes.BundleVersionEntry{
-			{
-				Height:  uint64(ctx.BlockHeight()),
-				Version: 2,
-			},
-		},
-	})
-}

proto/kyve/bundles/v1beta1/bundles.proto

@@ -91,8 +91,6 @@ message FinalizedBundle {
   uint32 storage_provider_id = 12;
   // compression_id the id of the compression type with which the data was compressed
   uint32 compression_id = 13;
-  // stake_security
-  StakeSecurity stake_security = 14;
 }
 
 // FinalizedAt ...
@@ -124,3 +122,4 @@ message BundleVersionMap {
   // versions ...
   repeated BundleVersionEntry versions = 1;
 }
+

testutil/integration/checks.go

@@ -2,6 +2,7 @@ package integration
 
 import (
 	"github.com/KYVENetwork/chain/x/bundles"
+	bundlesTypes "github.com/KYVENetwork/chain/x/bundles/types"
 	"github.com/KYVENetwork/chain/x/delegation"
 	delegationtypes "github.com/KYVENetwork/chain/x/delegation/types"
 	globalTypes "github.com/KYVENetwork/chain/x/global/types"
@@ -262,6 +263,23 @@ func (suite *KeeperTestSuite) VerifyStakersGenesisImportExport() {
 // bundles module checks
 // =====================
 
+func checkFinalizedBundle(queryBundle querytypes.FinalizedBundle, rawBundle bundlesTypes.FinalizedBundle) {
+	Expect(queryBundle.Id).To(Equal(rawBundle.Id))
+	Expect(queryBundle.PoolId).To(Equal(rawBundle.PoolId))
+	Expect(queryBundle.StorageId).To(Equal(rawBundle.StorageId))
+	Expect(queryBundle.Uploader).To(Equal(rawBundle.Uploader))
+	Expect(queryBundle.FromIndex).To(Equal(rawBundle.FromIndex))
+	Expect(queryBundle.ToIndex).To(Equal(rawBundle.ToIndex))
+	Expect(queryBundle.ToKey).To(Equal(rawBundle.ToKey))
+	Expect(queryBundle.BundleSummary).To(Equal(rawBundle.BundleSummary))
+	Expect(queryBundle.DataHash).To(Equal(rawBundle.DataHash))
+	Expect(queryBundle.FinalizedAt.Height).To(Equal(rawBundle.FinalizedAt.Height))
+	Expect(queryBundle.FinalizedAt.Timestamp).To(Equal(rawBundle.FinalizedAt.Timestamp))
+	Expect(queryBundle.FromKey).To(Equal(rawBundle.FromKey))
+	Expect(queryBundle.StorageProviderId).To(Equal(uint64(rawBundle.StorageProviderId)))
+	Expect(queryBundle.CompressionId).To(Equal(uint64(rawBundle.CompressionId)))
+}
+
 func (suite *KeeperTestSuite) VerifyBundlesQueries() {
 	pools := suite.App().PoolKeeper.GetAllPools(suite.Ctx())
 
@@ -275,18 +293,15 @@ func (suite *KeeperTestSuite) VerifyBundlesQueries() {
 		Expect(finalizedBundlesQuery.FinalizedBundles).To(HaveLen(len(finalizedBundlesState)))
 
 		for i := range finalizedBundlesState {
-			// TODO adjust tests to support new bundle schema
-			// Expect(finalizedBundlesQuery.FinalizedBundles[i]).To(Equal(finalizedBundlesState[i]))
 
-			finalizedBundleQuery, finalizedBundleQueryErr := suite.App().QueryKeeper.FinalizedBundleQuery(sdk.WrapSDKContext(suite.Ctx()), &querytypes.QueryFinalizedBundleRequest{
+			finalizedBundle, finalizedBundleQueryErr := suite.App().QueryKeeper.FinalizedBundleQuery(sdk.WrapSDKContext(suite.Ctx()), &querytypes.QueryFinalizedBundleRequest{
 				PoolId: pool.Id,
 				Id:     finalizedBundlesState[i].Id,
 			})
 
 			Expect(finalizedBundleQueryErr).To(BeNil())
-			// TODO adjust tests to support new bundle schema
-			_ = finalizedBundleQuery
-			// Expect(finalizedBundleQuery.FinalizedBundles.).To(Equal(finalizedBundlesState[i]))
+
+			checkFinalizedBundle(*finalizedBundle, finalizedBundlesState[i])
 		}
 	}
 }

x/bundles/keeper/getters_bundles.go

@@ -4,8 +4,6 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	cosmossdk_io_math "cosmossdk.io/math"
-
 	queryTypes "github.com/KYVENetwork/chain/x/query/types"
 	storeTypes "github.com/cosmos/cosmos-sdk/store/types"
 
@@ -141,13 +139,9 @@ func RawBundleToQueryBundle(rawFinalizedBundle types.FinalizedBundle, versionMap
 			TotalVotePower: nil,
 		},
 	}
+
 	// Check for version 2
-	if rawFinalizedBundle.FinalizedAt.Height >= versionMap[2] {
-		validPower := cosmossdk_io_math.NewInt(int64(rawFinalizedBundle.StakeSecurity.ValidVotePower))
-		totalPower := cosmossdk_io_math.NewInt(int64(rawFinalizedBundle.StakeSecurity.TotalVotePower))
-		finalizedBundle.StakeSecurity.ValidVotePower = &validPower
-		finalizedBundle.StakeSecurity.TotalVotePower = &totalPower
-	}
+	// TODO will be done by separate PR
 
 	return finalizedBundle
 }

x/bundles/keeper/logic_bundles.go

@@ -340,10 +340,6 @@ func (k Keeper) finalizeCurrentBundleProposal(ctx sdk.Context, poolId uint64, vo
 		DataHash:          bundleProposal.DataHash,
 		StorageProviderId: bundleProposal.StorageProviderId,
 		CompressionId:     bundleProposal.CompressionId,
-		StakeSecurity: &types.StakeSecurity{
-			ValidVotePower: voteDistribution.Valid,
-			TotalVotePower: voteDistribution.Total,
-		},
 	}
 
 	k.SetFinalizedBundle(ctx, finalizedBundle)