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

fix: Modify omission of change to change ValidatorSet to VoterSet for maverick #344

Closed
wants to merge 1 commit into from
Closed

fix: Modify omission of change to change ValidatorSet to VoterSet for maverick #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# Changelog

## v1.0.2

*Nov 08, 2021*

* Fix bugs
* Improve crypto/composite key

### BREAKING CHANGES
- Nothing

### FEATURES
- Nothing

### IMPROVEMENTS
- [test] [\#327](https://github.com/line/ostracon/pull/327) Add libsodium test on Github Actions
- [crypto/composite] [\#335](https://github.com/line/ostracon/pull/335) Improve composite key Bytes/FromBytes and make tools
- [security] [\#336](https://github.com/line/ostracon/pull/336) Remove unused package-lock.json
- [bot] [\#337](https://github.com/line/ostracon/pull/337) Improve dependabot

### BUG FIXES
- [test] [\#338](https://github.com/line/ostracon/pull/338) bugfix: wrong binary name
- [consensus] [\#340](https://github.com/line/ostracon/pull/340) Modify omission of change to change ValidatorSet to VoterSet

## v1.0.1

*Sep 30, 2021*
Expand Down
15 changes: 2 additions & 13 deletions p2p/peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,19 +399,8 @@ func createMConnection(
// because msgBytes is on socket receive buffer yet so reactor can read it concurrently
copied := make([]byte, len(msgBytes))
copy(copied, msgBytes)
select {
case ch <- &BufferedMsg{
ChID: chID,
Peer: p,
Msg: copied}:
default:
// if the channel is full, we abandon this message
// Should check `config.Config.XxxBufSize`
p.Logger.Error("Lost the message since BaseReactor.recvMsgBuf is full",
"reactor", reactor,
"msgBytes.len", len(msgBytes), "msgBytes", fmt.Sprintf("%X", msgBytes))
p.metrics.NumAbandonedPeerMsgs.With(labels...).Add(1)
}
// if the channel is full, we are blocking a message until it can send into the channel
ch <- &BufferedMsg{ChID: chID, Peer: p, Msg: copied}
} else {
reactor.Receive(chID, p, msgBytes)
}
Expand Down
2 changes: 1 addition & 1 deletion test/maverick/consensus/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1807,7 +1807,7 @@ func (cs *State) signVote(
return nil, errPubKeyIsNotSet
}
addr := cs.privValidatorPubKey.Address()
valIdx, _ := cs.Validators.GetByAddress(addr)
valIdx, _ := cs.Voters.GetByAddress(addr)

vote := &types.Vote{
ValidatorAddress: addr,
Expand Down