Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(x/staking): migrate ValidatorUpdates to collections #17062

Merged
merged 6 commits into from
Jul 20, 2023
Merged

refactor(x/staking): migrate ValidatorUpdates to collections #17062

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
adda899
migrate ValidatorUpdates to collections
likhita-809 Jul 19, 2023
0e648ce
Merge branch 'main' of https://github.com/cosmos/cosmos-sdk into likh…
likhita-809 Jul 19, 2023
f6bc275
Merge branch 'main' of https://github.com/cosmos/cosmos-sdk into likh…
likhita-809 Jul 19, 2023
774a06a
add changelog
likhita-809 Jul 19, 2023
c6cb0c0
Merge branch 'main' of https://github.com/cosmos/cosmos-sdk into likh…
likhita-809 Jul 19, 2023
3434a22
address review comment
likhita-809 Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 4 additions & 31 deletions x/staking/keeper/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import (
"context"
"fmt"

abci "github.com/cometbft/cometbft/abci/types"

"cosmossdk.io/collections"
addresscodec "cosmossdk.io/core/address"
storetypes "cosmossdk.io/core/store"
Expand Down Expand Up @@ -34,8 +32,9 @@ type Keeper struct {
validatorAddressCodec addresscodec.Codec
consensusAddressCodec addresscodec.Codec

Schema collections.Schema
LastTotalPower collections.Item[math.Int]
Schema collections.Schema
LastTotalPower collections.Item[math.Int]
ValidatorUpdates collections.Item[types.ValidatorUpdates]
}

// NewKeeper creates a new staking Keeper instance
Expand Down Expand Up @@ -77,6 +76,7 @@ func NewKeeper(
validatorAddressCodec: validatorAddressCodec,
consensusAddressCodec: consensusAddressCodec,
LastTotalPower: collections.NewItem(sb, types.LastTotalPowerKey, "last_total_power", sdk.IntValue),
ValidatorUpdates: collections.NewItem(sb, types.ValidatorUpdatesKey, "validator_updates", codec.CollValue[types.ValidatorUpdates](cdc)),
}

schema, err := sb.Build()
Expand Down Expand Up @@ -127,30 +127,3 @@ func (k Keeper) ValidatorAddressCodec() addresscodec.Codec {
func (k Keeper) ConsensusAddressCodec() addresscodec.Codec {
return k.consensusAddressCodec
}

// SetValidatorUpdates sets the ABCI validator power updates for the current block.
func (k Keeper) SetValidatorUpdates(ctx context.Context, valUpdates []abci.ValidatorUpdate) error {
likhita-809 marked this conversation as resolved.
Show resolved Hide resolved
store := k.storeService.OpenKVStore(ctx)
bz, err := k.cdc.Marshal(&types.ValidatorUpdates{Updates: valUpdates})
if err != nil {
return err
}
return store.Set(types.ValidatorUpdatesKey, bz)
}

// GetValidatorUpdates returns the ABCI validator power updates within the current block.
func (k Keeper) GetValidatorUpdates(ctx context.Context) ([]abci.ValidatorUpdate, error) {
store := k.storeService.OpenKVStore(ctx)
bz, err := store.Get(types.ValidatorUpdatesKey)
if err != nil {
return nil, err
}

var valUpdates types.ValidatorUpdates
err = k.cdc.Unmarshal(bz, &valUpdates)
if err != nil {
return nil, err
}

return valUpdates.Updates, nil
}
5 changes: 4 additions & 1 deletion x/staking/keeper/val_state_change.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,11 @@ func (k Keeper) ApplyAndReturnValidatorSetUpdates(ctx context.Context) (updates
}
}

var valUpdates types.ValidatorUpdates
likhita-809 marked this conversation as resolved.
Show resolved Hide resolved
valUpdates.Updates = updates

// set the list of validator updates
if err = k.SetValidatorUpdates(ctx, updates); err != nil {
if err = k.ValidatorUpdates.Set(ctx, valUpdates); err != nil {
return nil, err
}

Expand Down
4 changes: 2 additions & 2 deletions x/staking/types/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ var (
RedelegationQueueKey = []byte{0x42} // prefix for the timestamps in redelegations queue
ValidatorQueueKey = []byte{0x43} // prefix for the timestamps in validator queue

HistoricalInfoKey = []byte{0x50} // prefix for the historical info
ValidatorUpdatesKey = []byte{0x61} // prefix for the end block validator updates key
HistoricalInfoKey = []byte{0x50} // prefix for the historical info
ValidatorUpdatesKey = collections.NewPrefix(97) // prefix for the end block validator updates key

ParamsKey = []byte{0x51} // prefix for parameters for module x/staking

Expand Down