fix(x/market): reverse indexes for bids and leases #2040
+985
−681
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // Package v1_2_0 | ||
| // nolint revive | ||
| package v1_2_0 | ||
|
|
||
| import ( | ||
| mv1 "pkg.akt.dev/go/node/market/v1" | ||
|
|
||
| utypes "pkg.akt.dev/node/upgrades/types" | ||
| ) | ||
|
|
||
| func init() { | ||
| utypes.RegisterUpgrade(UpgradeName, initUpgrade) | ||
|
|
||
| utypes.RegisterMigration(mv1.ModuleName, 7, newMarketMigration) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| // Package v1_2_0 | ||
| // nolint revive | ||
| package v1_2_0 | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "cosmossdk.io/collections" | ||
| storetypes "cosmossdk.io/store/types" | ||
| "github.com/cosmos/cosmos-sdk/codec" | ||
| "github.com/cosmos/cosmos-sdk/runtime" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| sdkmodule "github.com/cosmos/cosmos-sdk/types/module" | ||
|
|
||
| mv1 "pkg.akt.dev/go/node/market/v1" | ||
| mtypes "pkg.akt.dev/go/node/market/v1beta5" | ||
|
|
||
| utypes "pkg.akt.dev/node/upgrades/types" | ||
| mkeeper "pkg.akt.dev/node/x/market/keeper" | ||
| mkeys "pkg.akt.dev/node/x/market/keeper/keys" | ||
| ) | ||
|
|
||
| type marketMigrations struct { | ||
| utypes.Migrator | ||
| } | ||
|
|
||
| func newMarketMigration(m utypes.Migrator) utypes.Migration { | ||
| return marketMigrations{Migrator: m} | ||
| } | ||
|
|
||
| func (m marketMigrations) GetHandler() sdkmodule.MigrationHandler { | ||
| return m.handler | ||
| } | ||
|
|
||
| // handler migrates market from version 7 to 8. | ||
| // Moves orders, bids, and leases from manual KVStore keys to collections.IndexedMap. | ||
| func (m marketMigrations) handler(ctx sdk.Context) error { | ||
| skey := m.StoreKey() | ||
| cdc := m.Codec() | ||
| store := ctx.KVStore(skey) | ||
|
|
||
| // Build IndexedMaps locally (same construction as NewKeeper) | ||
| ssvc := runtime.NewKVStoreService(skey.(*storetypes.KVStoreKey)) | ||
| sb := collections.NewSchemaBuilder(ssvc) | ||
|
|
||
| orderIndexes := mkeeper.NewOrderIndexes(sb) | ||
| orders := collections.NewIndexedMap(sb, collections.NewPrefix(mkeys.OrderPrefixNew), "orders", mkeys.OrderPrimaryKeyCodec, codec.CollValue[mtypes.Order](cdc), orderIndexes) | ||
|
|
||
| bidIndexes := mkeeper.NewBidIndexes(sb) | ||
| bids := collections.NewIndexedMap(sb, collections.NewPrefix(mkeys.BidPrefixNew), "bids", mkeys.BidPrimaryKeyCodec, codec.CollValue[mtypes.Bid](cdc), bidIndexes) | ||
|
|
||
| leaseIndexes := mkeeper.NewLeaseIndexes(sb) | ||
| leases := collections.NewIndexedMap(sb, collections.NewPrefix(mkeys.LeasePrefixNew), "leases", mkeys.LeasePrimaryKeyCodec, codec.CollValue[mv1.Lease](cdc), leaseIndexes) | ||
|
|
||
| if _, err := sb.Build(); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // === Orders === | ||
| oiter := storetypes.KVStorePrefixIterator(store, mkeys.OrderPrefix) | ||
| defer func() { | ||
| _ = oiter.Close() | ||
| }() | ||
|
|
||
| var orderCount int64 | ||
| var bidCount int64 | ||
| var leaseCount int64 | ||
|
|
||
| for ; oiter.Valid(); oiter.Next() { | ||
| var order mtypes.Order | ||
| cdc.MustUnmarshal(oiter.Value(), &order) | ||
|
|
||
| pk := mkeys.OrderIDToKey(order.ID) | ||
| if err := orders.Set(ctx, pk, order); err != nil { | ||
| return fmt.Errorf("failed to migrate order %s: %w", order.ID, err) | ||
| } | ||
|
|
||
| store.Delete(oiter.Key()) | ||
|
|
||
| orderCount++ | ||
| } | ||
|
|
||
| // === Bids === | ||
| biter := storetypes.KVStorePrefixIterator(store, mkeys.BidPrefix) | ||
| defer func() { | ||
| _ = biter.Close() | ||
| }() | ||
|
|
||
| for ; biter.Valid(); biter.Next() { | ||
| var bid mtypes.Bid | ||
| cdc.MustUnmarshal(biter.Value(), &bid) | ||
|
|
||
| pk := mkeys.BidIDToKey(bid.ID) | ||
| if err := bids.Set(ctx, pk, bid); err != nil { | ||
| return fmt.Errorf("failed to migrate bid %s: %w", bid.ID, err) | ||
| } | ||
|
|
||
| store.Delete(biter.Key()) | ||
| bidCount++ | ||
| } | ||
|
|
||
| // Delete old bid reverse keys | ||
| brevIter := storetypes.KVStorePrefixIterator(store, mkeys.BidPrefixReverse) | ||
| defer func() { | ||
| _ = brevIter.Close() | ||
| }() | ||
|
|
||
| for ; brevIter.Valid(); brevIter.Next() { | ||
| store.Delete(brevIter.Key()) | ||
| } | ||
|
|
||
| // === Leases === | ||
| liter := storetypes.KVStorePrefixIterator(store, mkeys.LeasePrefix) | ||
| defer func() { | ||
| _ = liter.Close() | ||
| }() | ||
|
|
||
| for ; liter.Valid(); liter.Next() { | ||
| var lease mv1.Lease | ||
| cdc.MustUnmarshal(liter.Value(), &lease) | ||
|
|
||
| pk := mkeys.LeaseIDToKey(lease.ID) | ||
| if err := leases.Set(ctx, pk, lease); err != nil { | ||
| return fmt.Errorf("failed to migrate lease %s: %w", lease.ID, err) | ||
| } | ||
|
|
||
| store.Delete(liter.Key()) | ||
| leaseCount++ | ||
| } | ||
|
|
||
| // Delete old lease reverse keys | ||
| lrevIter := storetypes.KVStorePrefixIterator(store, mkeys.LeasePrefixReverse) | ||
| defer func() { | ||
| _ = lrevIter.Close() | ||
| }() | ||
|
|
||
| for ; lrevIter.Valid(); lrevIter.Next() { | ||
| store.Delete(lrevIter.Key()) | ||
| } | ||
|
|
||
| ctx.Logger().Info("market store migration complete", | ||
| "orders_migrated", orderCount, | ||
| "bids_migrated", bidCount, | ||
| "leases_migrated", leaseCount, | ||
| ) | ||
|
|
||
| return nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // Package v1_2_0 | ||
| // nolint revive | ||
| package v1_2_0 | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "cosmossdk.io/log" | ||
| storetypes "cosmossdk.io/store/types" | ||
| upgradetypes "cosmossdk.io/x/upgrade/types" | ||
| "github.com/cosmos/cosmos-sdk/types/module" | ||
|
|
||
| apptypes "pkg.akt.dev/node/app/types" | ||
| utypes "pkg.akt.dev/node/upgrades/types" | ||
| ) | ||
|
|
||
| const ( | ||
| UpgradeName = "v1.2.0" | ||
| ) | ||
|
|
||
| type upgrade struct { | ||
| *apptypes.App | ||
| log log.Logger | ||
| } | ||
|
|
||
| var _ utypes.IUpgrade = (*upgrade)(nil) | ||
|
|
||
| func initUpgrade(log log.Logger, app *apptypes.App) (utypes.IUpgrade, error) { | ||
| up := &upgrade{ | ||
| App: app, | ||
| log: log.With("module", fmt.Sprintf("upgrade/%s", UpgradeName)), | ||
| } | ||
|
|
||
| return up, nil | ||
| } | ||
|
|
||
| func (up *upgrade) StoreLoader() *storetypes.StoreUpgrades { | ||
| return &storetypes.StoreUpgrades{} | ||
| } | ||
|
|
||
| func (up *upgrade) UpgradeHandler() upgradetypes.UpgradeHandler { | ||
| return func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { | ||
| toVM, err := up.MM.RunMigrations(ctx, up.Configurator, fromVM) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| up.log.Info(fmt.Sprintf("all migrations have been completed")) | ||
|
|
||
| return toVM, err | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.