refactor(x/staking): use sdk validator updates #19788
There are no files selected for viewing
This file contains 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 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 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 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 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 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 |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| package keeper | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "time" | ||
|
|
||
|
|
@@ -41,6 +42,49 @@ func HistoricalInfoCodec(cdc codec.BinaryCodec) collcodec.ValueCodec[types.Histo | |
| }) | ||
| } | ||
|
|
||
| type moduleValidatorUpdatesCodec struct { | ||
|
There was a problem hiding this comment. @testinginprod, can we generalize that in collection? Like a JSONValueCodec that always does the following? There was a problem hiding this comment. It isn't needed here, but I'll create one now in collections |
||
| cdc codec.BinaryCodec | ||
| } | ||
|
|
||
| // Decode implements codec.ValueCodec. | ||
| func (m moduleValidatorUpdatesCodec) Decode(b []byte) (types.ModuleValidatorUpdates, error) { | ||
| var mvu types.ModuleValidatorUpdates | ||
| if err := json.Unmarshal(b, &mvu); err != nil { | ||
| return types.ModuleValidatorUpdates{}, err | ||
| } | ||
|
|
||
| return mvu, nil | ||
| } | ||
|
|
||
| // DecodeJSON implements codec.ValueCodec. | ||
| func (m moduleValidatorUpdatesCodec) DecodeJSON(b []byte) (types.ModuleValidatorUpdates, error) { | ||
| return m.Decode(b) | ||
| } | ||
|
|
||
| // Encode implements codec.ValueCodec. | ||
| func (m moduleValidatorUpdatesCodec) Encode(value types.ModuleValidatorUpdates) ([]byte, error) { | ||
| return json.Marshal(value) | ||
| } | ||
|
|
||
| // EncodeJSON implements codec.ValueCodec. | ||
| func (m moduleValidatorUpdatesCodec) EncodeJSON(value types.ModuleValidatorUpdates) ([]byte, error) { | ||
| return m.Encode(value) | ||
| } | ||
|
|
||
| // Stringify implements codec.ValueCodec. | ||
| func (m moduleValidatorUpdatesCodec) Stringify(value types.ModuleValidatorUpdates) string { | ||
| return fmt.Sprintf("%v", value) | ||
| } | ||
|
|
||
| // ValueType implements codec.ValueCodec. | ||
| func (m moduleValidatorUpdatesCodec) ValueType() string { | ||
| return "types.ModuleValidatorUpdates" | ||
| } | ||
|
|
||
| func ValidatorUpdateCodec(cdc codec.BinaryCodec) collcodec.ValueCodec[types.ModuleValidatorUpdates] { | ||
| return moduleValidatorUpdatesCodec{cdc} | ||
| } | ||
|
|
||
| type rotationHistoryIndexes struct { | ||
| Block *indexes.Multi[uint64, collections.Pair[[]byte, uint64], types.ConsPubKeyRotationHistory] | ||
| } | ||
|
|
@@ -84,7 +128,7 @@ type Keeper struct { | |
| // LastTotalPower value: LastTotalPower | ||
| LastTotalPower collections.Item[math.Int] | ||
| // ValidatorUpdates value: ValidatorUpdates | ||
| ValidatorUpdates collections.Item[types.ModuleValidatorUpdates] | ||
|
There was a problem hiding this comment. does anyone use this value? seems we only set it There was a problem hiding this comment. That's a good point 👍🏾 Let me ask, we don't use it ourselves indeed. |
||
| // DelegationsByValidator key: valAddr+delAddr | value: none used (index key for delegations by validator index) | ||
| DelegationsByValidator collections.Map[collections.Pair[sdk.ValAddress, sdk.AccAddress], []byte] | ||
| UnbondingID collections.Sequence | ||
|
|
@@ -171,7 +215,7 @@ func NewKeeper( | |
| consensusAddressCodec: consensusAddressCodec, | ||
| LastTotalPower: collections.NewItem(sb, types.LastTotalPowerKey, "last_total_power", sdk.IntValue), | ||
| HistoricalInfo: collections.NewMap(sb, types.HistoricalInfoKey, "historical_info", collections.Uint64Key, HistoricalInfoCodec(cdc)), | ||
| ValidatorUpdates: collections.NewItem(sb, types.ValidatorUpdatesKey, "validator_updates", ValidatorUpdateCodec(cdc)), | ||
| Delegations: collections.NewMap( | ||
| sb, types.DelegationKey, "delegations", | ||
| collections.PairKeyCodec( | ||
|
|
||
This file contains 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 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The update of references from
abci.ValidatorUpdatetoappmodule.ValidatorUpdatein the test file aligns with the PR's goal of standardizing the handling of validator updates. Consider adding more comprehensive tests to ensure that all scenarios involving validator updates are thoroughly covered.Would you like me to help with adding more comprehensive tests to cover these changes?