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

R4R: Merge irisnet/v0.27.3-iris branch into master #51

Merged
merged 577 commits into from
Mar 20, 2019
Merged

R4R: Merge irisnet/v0.27.3-iris branch into master #51

merged 577 commits into from
Mar 20, 2019

Conversation

haifengxi
Copy link

  • Bring irisnet/tendermint up to (about) the same level as tendermint/tendermint v0.27.4
  • Add enhancements to support class2 upgrade and class4 export
  • Cherry pick (mostly p2p) bug fixes from tendermint/tendermint v0.28+

alessio and others added 30 commits October 17, 2018 18:54
@alessio
Pass nil to NewValidatorSet() when genesis file's Validators field is…
adf8cea 
… nil (tendermint#2617)

Closes: tendermint#2616
@melekes @alessio
set next validators along with validators while replay (tendermint#2637)
7220167 
Closes tendermint#2634
@alessio
Update CHANGELOG_PENDING.md
1ad379a
@ebuchman
changelog and version
90eda9b
@ebuchman
ADR-016: Add protocol Version to NodeInfo (tendermint#2654)
14c1bae 
* p2p: add protocol Version to NodeInfo

* update node pkg. remove extraneous version files

* update changelog and docs

* fix test

* p2p: Version -> ProtocolVersion; more ValidateBasic and tests
@melekes
add tm-abci python ABCI server (fork of py-abci) (tendermint#2658)
055d7ad 
It utilises async IO -> greater performance.
@ebuchman
ADR-016: Update ABCI Info method for versions (tendermint#2662)
ed4ce5f 
* abci: update RequestInfo for versions

* abci: update ResponseInfo for versions

* compile fix

* fix test

* software_version -> version

* comment fix

* update spec

* add test

* comments and fix test
@ebuchman
adr-016: update int64->uint64; add version to ConsensusParams (tender…
c3384e8 
…mint#2667)
@ebuchman
types: remove Version from CanonicalXxx (tendermint#2666)
e798766
@ebuchman
p2p: Restore OriginalAddr (tendermint#2668)
746d137 
* p2p: bring back OriginalAddr

* p2p: set OriginalAddr

* update changelog
@ebuchman
types: dont use SimpleHashFromMap for header. closes tendermint#1841 (t…
f536089 
…endermint#2670)

* types: dont use SimpleHashFromMap for header. closes tendermint#1841

* changelog and spec

* comments
@ebuchman
Bucky/changelog (tendermint#2673)
7c6519a 
* update changelog, add authors script

* update changelog

* update changelog
@ebuchman
types: first field in Canonical structs is Type (tendermint#2675)
30519e8 
* types: first field in Canonical structs is Type

* fix spec
@ebuchman
crypto: use stdlib crypto/rand. ref tendermint#2099 (tendermint#2669)
9d62bd0 
* crypto: use stdlib crypto/rand. ref tendermint#2099

* comment
@ebuchman
Version bump; Update Upgrading.md; linkify Changelog (tendermint#2679)
f94eb42 
* version bump

* update UPGRADING.md

* add missing pr numbers to changelog pending

* linkify changelog
@wukongcheng
upgrade to version 0.25.1-rc0
c1a7c78
@ebuchman
Set protocol versions in NodeInfo from state (tendermint#2686)
fe1d59a 
* use types.NewValidator

* node: set p2p.ProtocolVersion from state, not globals
@ebuchman
Update to Amino v0.13.0-rc0 (tendermint#2687)
be929ac 
* types: test tm2pm on fully populated header

* upgrade for amino v0.13.0-rc0

* fix lint

* comment out final test
@bluele @melekes
fix RecoverAndLogHandler not to call multiple writeheader (tendermi…
9795e12 
…nt#2688)
@liamsi @ebuchman
Catch up with amino 0.13.0 (tendermint#2690)
6643c5d 
* catch up with amino changes in
tendermint/go-amino#222

* WIP: update to amino v0.13.0

* update to fixed amino release
@WALL-E @melekes
tm-monitor: update health after we added / removed node (tendermint#2694
bbf15b3 
)

Refs tendermint#2693
@melekes
if some process locks a block in round 0, then 0 is valid proposal.PO…
a67ae81 
…LRound in rounds > 0

This condition is really hard to get. Initially, lockedRound and
validRound are set to -1 as we start with round 0.

Refs tendermint#2702
@liamsi @ebuchman
Update to amino 0.14.0 (tendermint#2710)
b6d5b8b 
* WIP: update to amino 0.14.0

* update Changelog

* Update to latest amino version (v0.14.0)
@ebuchman
update changelog pending and readme (tendermint#2725)
b24de1c
@zramsay @ebuchman
add fail-test file instead of dep, closes tendermint#2638 (tendermint…
cdc252b 
…#2728)

original author of this file is @ebuchman:

https://github.com/ebuchman/fail-test
@ValarDragon @ebuchman
Add ValidatorPubkeyTypes as a consensus param (tendermint#2636)
56d7160 
* Add ValidatorPubkeyTypes as a consensus param

Ref tendermint#2414

* update spec

* address anton's comment

* Switch to Validator and Validator Params

* Correct changelog entry

* Address bucky's comments!

* forgot to update changelog

* fix typo

* fix Params naming
@yutianwu @ebuchman
[R4R] libs/log: add year to log format (tendermint#2707)
6043795 
* add year to log format

* update documentation
@liamsi @ebuchman
Align Vote/Proposal fields with canonical order and fields (tendermin…
a530352 
…t#2730)

* reorder fields

* add TestVoteString & update tests

* remove redundant info from Proposal.String()

* update spec

* revert changes on vote.String() -> more human friendly
@ebuchman
Introduce EventValidBlock for informing peers about wanted block (ten…
7a03344 
…dermint#2652)

* Introduce EventValidBlock for informing peer about wanted block

* Merge with develop

* Add isCommit flag to NewValidBlock message

- Add test for the case of +2/3 Precommit from the previous round
@ebuchman
Simplify proposal msg (tendermint#2735)
c590590 
* Align Proposal message with spec

* Update spec
wukongcheng and others added 16 commits February 22, 2019 16:58
@wukongcheng
Merge pull request #43 from chengwenxi/v0.27.3-iris
537e54d 
R4R: Switch fields ordering
Cherry pick from tendermint#3150
a7e5123
Fix mempool reactor goroutine leak
fdbb676
@chengwenxi
Fix consensus round issue
0481372
Merge pull request #45 from chengwenxi/consensus-round
7715be4 
R4R: Fix consensus round issue
Add maximum msg size in CheckTx
9960b25
Remove useless func
2a50634
Add missed cherry pick
3267dd1
Add latest tx to the back of cache list, in case of being removed by …
3079771 
…other tx insertion
@wukongcheng
Merge pull request #47 from HaoyangLiu/fix-LRU-cache-issue
add95d4 
R4R: Add latest tx to the back of cache list
@wukongcheng
Merge pull request #46 from HaoyangLiu/check-maximum-message-size
0315579 
R4R: Add maximum msg size in CheckTx
Cherry pick from tendermint#3232
0a950f9
add stopMtx for FlushStop and OnStop
20afc34
Merge pull request #50 from HaoyangLiu/fix-FlushStop
73e19fe 
R4R: add stopMtx for FlushStop and OnStop
Merge pull request #44 from HaoyangLiu/fix-leak
681a9ff 
R4R: Fix goroutine leak
Merge pull request #48 from HaoyangLiu/infinite-loop-addrbook
facf40e 
R4R: fix infinite loop in addrbook
@haifengxi haifengxi merged commit 6bbd88e into master Mar 20, 2019
This was referenced Apr 19, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chengwenxi chengwenxi chengwenxi approved these changes

@wukongcheng wukongcheng wukongcheng approved these changes

@HaoyangLiu HaoyangLiu HaoyangLiu approved these changes

Assignees

@HaoyangLiu HaoyangLiu

@wukongcheng wukongcheng

@MrXJC MrXJC

@chengwenxi chengwenxi

Labels
release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.