Merge pull request #550 from lavanet/CNS-fixation-migration-3To4

CNS-fixation-migration
lavanet · Jun 12, 2023 · 9a045e9 · 9a045e9
2 parents 1ccbfa2 + 43edb5b
commit 9a045e9
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 17 deletions.
diff --git a/app/app.go b/app/app.go
@@ -162,6 +162,7 @@ var Upgrades = []upgrades.Upgrade{
 	upgrades.Upgrade_0_12_0,
 	upgrades.Upgrade_0_12_1,
 	upgrades.Upgrade_0_13_0,
+	upgrades.Upgrade_0_13_1,
 }
 
 // this line is used by starport scaffolding # stargate/wasm/app/enabledProposals

diff --git a/app/upgrades/empty_upgrades.go b/app/upgrades/empty_upgrades.go
@@ -183,3 +183,9 @@ var Upgrade_0_13_0 = Upgrade{
 	CreateUpgradeHandler: defaultUpgradeHandler,
 	StoreUpgrades:        store.StoreUpgrades{},
 }
+
+var Upgrade_0_13_1 = Upgrade{
+	UpgradeName:          "v0.13.1",
+	CreateUpgradeHandler: defaultUpgradeHandler,
+	StoreUpgrades:        store.StoreUpgrades{},
+}
diff --git a/common/fixation_migrate.go b/common/fixation_migrate.go
@@ -24,6 +24,10 @@ var fixationMigrators = map[int]func(sdk.Context, *FixationStore) error{
 // MigrateVerrsion performs pending internal version migration(s), if any.
 func (fs *FixationStore) MigrateVersion(ctx sdk.Context) (err error) {
 	from := fs.getVersion(ctx)
+	return fs.MigrateVersionFrom(ctx, from)
+}
+
+func (fs *FixationStore) MigrateVersionFrom(ctx sdk.Context, from uint64) (err error) {
 	to := FixationVersion()
 
 	for from < to {
@@ -169,6 +173,8 @@ func fixationMigrate3to4(ctx sdk.Context, fs *FixationStore) error {
 			return fmt.Errorf("%s: failed to sanitize index: %s", fs.prefixForErrors(1), index)
 		}
 
+		fs.setEntryIndex(ctx, safeIndex, true)
+
 		blocks := fs.GetAllEntryVersions(ctx, index)
 		if len(blocks) < 1 {
 			return fmt.Errorf("%s: no versions for index: %s", fs.prefixForErrors(1), index)
@@ -184,6 +190,9 @@ func fixationMigrate3to4(ctx sdk.Context, fs *FixationStore) error {
 				key := encodeForTimer(entry.Index, entry.Block, timerStaleEntry)
 				fs.tstore.AddTimerByBlockHeight(ctx, entry.StaleAt, key, []byte{})
 			}
+
+			entry.DeleteAt = math.MaxUint64
+			fs.setEntry(ctx, entry)
 		}
 	}
 

diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml
@@ -31339,9 +31339,6 @@ paths:
                   subscription:
                     type: string
                     title: the subscription address that owns the project
-                  description:
-                    type: string
-                    title: the description of the project for the users convinient
                   enabled:
                     type: boolean
                     title: enabled flag
@@ -31468,9 +31465,6 @@ paths:
                   subscription:
                     type: string
                     title: the subscription address that owns the project
-                  description:
-                    type: string
-                    title: the description of the project for the users convinient
                   enabled:
                     type: boolean
                     title: enabled flag
@@ -56009,9 +56003,6 @@ definitions:
       subscription:
         type: string
         title: the subscription address that owns the project
-      description:
-        type: string
-        title: the description of the project for the users convinient
       enabled:
         type: boolean
         title: enabled flag
@@ -56111,9 +56102,6 @@ definitions:
           subscription:
             type: string
             title: the subscription address that owns the project
-          description:
-            type: string
-            title: the description of the project for the users convinient
           enabled:
             type: boolean
             title: enabled flag
@@ -56208,9 +56196,6 @@ definitions:
           subscription:
             type: string
             title: the subscription address that owns the project
-          description:
-            type: string
-            title: the description of the project for the users convinient
           enabled:
             type: boolean
             title: enabled flag

diff --git a/x/plans/keeper/migrations.go b/x/plans/keeper/migrations.go
@@ -86,3 +86,9 @@ func (m Migrator) Migrate4to5(ctx sdk.Context) error {
 	}
 	return nil
 }
+
+// Migrate5to6 implements store migration from v5 to v6:
+// -- trigger fixation migration, deleteat and live variables
+func (m Migrator) Migrate5to6(ctx sdk.Context) error {
+	return m.keeper.plansFS.MigrateVersionFrom(ctx, 3)
+}
diff --git a/x/plans/module.go b/x/plans/module.go
@@ -148,6 +148,10 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 	if err := cfg.RegisterMigration(types.ModuleName, 4, migrator.Migrate4to5); err != nil {
 		panic(fmt.Errorf("%s: failed to register migration to v5: %w", types.ModuleName, err))
 	}
+	// register v5 -> v6 migration
+	if err := cfg.RegisterMigration(types.ModuleName, 5, migrator.Migrate5to6); err != nil {
+		panic(fmt.Errorf("%s: failed to register migration to v5: %w", types.ModuleName, err))
+	}
 }
 
 // RegisterInvariants registers the capability module's invariants.
@@ -172,7 +176,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 }
 
 // ConsensusVersion implements ConsensusVersion.
-func (AppModule) ConsensusVersion() uint64 { return 5 }
+func (AppModule) ConsensusVersion() uint64 { return 6 }
 
 // BeginBlock executes all ABCI BeginBlock logic respective to the capability module.
 func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {

diff --git a/x/projects/keeper/migrations.go b/x/projects/keeper/migrations.go
@@ -229,3 +229,16 @@ func (m Migrator) Migrate4to5(ctx sdk.Context) error {
 
 	return nil
 }
+
+// Migrate3to4 implements store migration from v5 to v6:
+// -- trigger fixation migration, deleteat and live variables
+func (m Migrator) Migrate5to6(ctx sdk.Context) error {
+	err := m.keeper.developerKeysFS.MigrateVersionFrom(ctx, 3)
+	if err != nil {
+		return err
+	}
+
+	err = m.keeper.projectsFS.MigrateVersionFrom(ctx, 3)
+
+	return err
+}
diff --git a/x/projects/module.go b/x/projects/module.go
@@ -149,6 +149,10 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 	if err := cfg.RegisterMigration(types.ModuleName, 4, migrator.Migrate4to5); err != nil {
 		panic(fmt.Errorf("%s: failed to register migration to v5: %w", types.ModuleName, err))
 	}
+	// register v5 -> v6 migration
+	if err := cfg.RegisterMigration(types.ModuleName, 5, migrator.Migrate5to6); err != nil {
+		panic(fmt.Errorf("%s: failed to register migration to v5: %w", types.ModuleName, err))
+	}
 }
 
 // RegisterInvariants registers the capability module's invariants.
@@ -173,7 +177,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 }
 
 // ConsensusVersion implements ConsensusVersion.
-func (AppModule) ConsensusVersion() uint64 { return 5 }
+func (AppModule) ConsensusVersion() uint64 { return 6 }
 
 // BeginBlock executes all ABCI BeginBlock logic respective to the capability module.
 func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {