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

fix: Use bytes instead of string comparison in delete validator queue (backport cosmos/cosmos-sdk#12303) (backport #1301) #1309

Merged
merged 3 commits into from
Mar 29, 2024
Merged

fix: Use bytes instead of string comparison in delete validator queue (backport cosmos/cosmos-sdk#12303) (backport #1301) #1309

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bba9529
fix: Use bytes instead of string comparison in delete validator queue…
0Tech Mar 26, 2024
3133049
Update CHANGELOG.md
0Tech Mar 27, 2024
ff40409
Merge branch 'release/v0.48.x' into mergify/bp/release/v0.48.x/pr-1301
0Tech Mar 29, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (x/collection) [\#1282](https://github.com/Finschia/finschia-sdk/pull/1282) eliminates potential risk for Insufficient Sanity Check of tokenID in Genesis (backport #1276)
* (x/collection) [\#1290](https://github.com/Finschia/finschia-sdk/pull/1290) export x/collection params into genesis (backport #1268)
* (x/foundation) [\#1295](https://github.com/Finschia/finschia-sdk/pull/1295) add missing error handling for migration
* (x/staking) [\#1301](https://github.com/Finschia/finschia-sdk/pull/1301) Use bytes instead of string comparison in delete validator queue (backport cosmos/cosmos-sdk#12303)

### Removed

Expand Down
16 changes: 14 additions & 2 deletions x/staking/keeper/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,9 +375,21 @@
addrs := k.GetUnbondingValidators(ctx, val.UnbondingTime, val.UnbondingHeight)
newAddrs := []string{}

// since address string may change due to Bech32 prefix change, we parse the addresses into bytes
// format for normalization
deletingAddr, err := sdk.ValAddressFromBech32(val.OperatorAddress)
if err != nil {
panic(err)

Check warning on line 382 in x/staking/keeper/validator.go

View check run for this annotation

Codecov / codecov/patch

x/staking/keeper/validator.go#L382 

Added line #L382 was not covered by tests
}

for _, addr := range addrs {
if addr != val.OperatorAddress {
newAddrs = append(newAddrs, addr)
storedAddr, err := sdk.ValAddressFromBech32(addr)
if err != nil {
// even if we don't panic here, it will panic in UnbondAllMatureValidators at unbond time
panic(err)

Check warning on line 389 in x/staking/keeper/validator.go

View check run for this annotation

Codecov / codecov/patch

x/staking/keeper/validator.go#L388-L389 

Added lines #L388 - L389 were not covered by tests
}
if !storedAddr.Equals(deletingAddr) {
newAddrs = append(newAddrs, storedAddr.String())
}
}

Expand Down
Loading