upgrade to v2.0.0-rc.6

Author: keithsue

api/side/dlc/params.pulsar.go

@@ -159,6 +159,7 @@ import (
 
 	upgradev2 "github.com/sideprotocol/side/app/upgrades/v2"
 	upgradev2rc5 "github.com/sideprotocol/side/app/upgrades/v2_rc5"
+	upgradev2rc6 "github.com/sideprotocol/side/app/upgrades/v2_rc6"
 )
 
 const (
@@ -1311,6 +1312,7 @@ func BlockedAddresses() map[string]bool {
 func (app *App) SetUpgradeHandlers() {
 	app.UpgradeKeeper.SetUpgradeHandler(upgradev2.UpgradeName, upgradev2.CreateUpgradeHandler(app.ModuleManager, app.configurator))
 	app.UpgradeKeeper.SetUpgradeHandler(upgradev2rc5.UpgradeName, upgradev2rc5.CreateUpgradeHandler(app.ModuleManager, app.configurator))
+	app.UpgradeKeeper.SetUpgradeHandler(upgradev2rc6.UpgradeName, upgradev2rc6.CreateUpgradeHandler(app.ModuleManager, app.configurator))
 
 	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
 	if err != nil {

app/app.go

@@ -0,0 +1,21 @@
+package v2_rc7
+
+import (
+	"context"
+
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+)
+
+// UpgradeName is the upgrade version name
+const UpgradeName = "v2.0.0-rc.6"
+
+// CreateUpgradeHandler creates the upgrade handler
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}

app/upgrades/v2_rc6/upgrade.go

@@ -16,3 +16,27 @@ message Params {
     uint32 oracle_participant_num = 5;
     uint32 oracle_participant_threshold = 6;
 }
+
+message PricePair {
+    string pair = 1;
+    int32 decimals = 2;
+    string interval = 3 [
+      (cosmos_proto.scalar)  = "cosmos.Dec",
+      (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
+      (gogoproto.nullable)   = false
+    ];
+}
+
+// ParamsV1 defines the v1 parameters for the module.
+message ParamsV1 {
+    uint32 price_event_nonce_queue_size = 1;
+    repeated PricePair price_pairs = 2 [(gogoproto.nullable) = false];
+    uint32 date_event_nonce_queue_size = 3;
+    google.protobuf.Duration date_interval = 4 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true];
+    uint32 lending_event_nonce_queue_size = 5;
+    repeated string allowed_oracle_participants = 6;
+    uint32 oracle_participant_num = 7;
+    uint32 oracle_participant_threshold = 8;
+    uint32 nonce_generation_batch_size = 9;
+    int64 nonce_generation_interval = 10;
+}

proto/side/dlc/params.proto

@@ -0,0 +1,22 @@
+package keeper
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	v2 "github.com/sideprotocol/side/x/dlc/migrations/v2"
+)
+
+// Migrator is a struct for handling in-place store migrations
+type Migrator struct {
+	keeper Keeper
+}
+
+// NewMigrator returns a new Migrator
+func NewMigrator(keeper Keeper) Migrator {
+	return Migrator{keeper: keeper}
+}
+
+// Migrate1to2 migrates from version 1 to 2
+func (m Migrator) Migrate1to2(ctx sdk.Context) error {
+	return v2.MigrateStore(ctx, m.keeper.storeKey, m.keeper.cdc)
+}

x/dlc/keeper/migrations.go

@@ -0,0 +1,88 @@
+package v3
+
+import (
+	storetypes "cosmossdk.io/store/types"
+	"github.com/cosmos/cosmos-sdk/codec"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	"github.com/sideprotocol/side/x/dlc/types"
+)
+
+// MigrateStore migrates the x/dlc module state from the consensus version 1 to
+// version 2
+func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) error {
+	migrateParams(ctx, storeKey, cdc)
+	migrateStore(ctx, storeKey, cdc)
+
+	return nil
+}
+
+// migrateParams performs the params migration
+func migrateParams(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) {
+	store := ctx.KVStore(storeKey)
+
+	// get current params
+	var paramsV1 types.ParamsV1
+	bz := store.Get(types.ParamsKey)
+	cdc.MustUnmarshal(bz, &paramsV1)
+
+	// build new params
+	params := &types.Params{
+		NonceQueueSize:             paramsV1.LendingEventNonceQueueSize,
+		NonceGenerationBatchSize:   paramsV1.NonceGenerationBatchSize,
+		NonceGenerationInterval:    paramsV1.NonceGenerationInterval,
+		AllowedOracleParticipants:  paramsV1.AllowedOracleParticipants,
+		OracleParticipantNum:       paramsV1.OracleParticipantNum,
+		OracleParticipantThreshold: paramsV1.OracleParticipantThreshold,
+	}
+
+	bz = cdc.MustMarshal(params)
+	store.Set(types.ParamsKey, bz)
+
+	for _, participant := range params.AllowedOracleParticipants {
+		liveness := &types.OracleParticipantLiveness{
+			ConsensusPubkey: participant,
+			IsAlive:         true,
+			LastDkgId:       0,
+			LastBlockHeight: 0,
+		}
+
+		bz := cdc.MustMarshal(liveness)
+
+		store.Set(types.OracleParticipantLivenessKey(participant), bz)
+	}
+}
+
+// migrateStore performs the store migration
+func migrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) {
+	store := ctx.KVStore(storeKey)
+
+	// get the current dcm id
+	dcmIdBz := store.Get(types.DCMIdKey)
+
+	// update the current oracle id to the latest dcm id
+	store.Set(types.OracleIdKey, dcmIdBz)
+
+	// update the current dcm id to the latest dcm id
+	iterateDCMs(ctx, storeKey, cdc, func(dcm *types.DCM) (stop bool) {
+		store.Set(types.DCMIdKey, sdk.Uint64ToBigEndian(dcm.Id))
+		return false
+	})
+}
+
+// iterateDCMs iterates through all DCMs
+func iterateDCMs(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec, cb func(dcm *types.DCM) (stop bool)) {
+	store := ctx.KVStore(storeKey)
+
+	iterator := storetypes.KVStorePrefixIterator(store, types.DCMKeyPrefix)
+	defer iterator.Close()
+
+	for ; iterator.Valid(); iterator.Next() {
+		var dcm types.DCM
+		cdc.MustUnmarshal(iterator.Value(), &dcm)
+
+		if cb(&dcm) {
+			break
+		}
+	}
+}

x/dlc/migrations/v2/store.go

@@ -23,6 +23,9 @@ import (
 	"github.com/sideprotocol/side/x/dlc/types"
 )
 
+// ConsensusVersion defines the current x/dlc module consensus version.
+const ConsensusVersion = 2
+
 var (
 	_ module.AppModule      = AppModule{}
 	_ module.AppModuleBasic = AppModuleBasic{}
@@ -118,6 +121,11 @@ func (am AppModule) IsAppModule() {}
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
 	types.RegisterQueryServer(cfg.QueryServer(), am.keeper)
+
+	m := keeper.NewMigrator(am.keeper)
+	if err := cfg.RegisterMigration(types.ModuleName, 1, m.Migrate1to2); err != nil {
+		panic(fmt.Sprintf("failed to migrate x/%s from version 1 to 2: %v", types.ModuleName, err))
+	}
 }
 
 // RegisterInvariants registers the invariants of the module. If an invariant deviates from its predicted value, the InvariantRegistry triggers appropriate logic (most often the chain will be halted)
@@ -141,7 +149,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 }
 
 // ConsensusVersion is a sequence number for state-breaking change of the module. It should be incremented on each consensus-breaking change introduced by the module. To avoid wrong/empty versions, the initial version should be set to 1
-func (AppModule) ConsensusVersion() uint64 { return 1 }
+func (AppModule) ConsensusVersion() uint64 { return ConsensusVersion }
 
 // BeginBlock contains the logic that is automatically triggered at the beginning of each block
 func (am AppModule) BeginBlock(_ context.Context) error {