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

Apply Tendermint 0.33.3 #65

Merged
merged 6 commits into from
Apr 21, 2020
Merged

Apply Tendermint 0.33.3 #65

merged 6 commits into from
Apr 21, 2020

Conversation

zemyblue
Copy link
Member

@zemyblue zemyblue commented Apr 20, 2020 •
edited
Loading

Closes: #63

Apply Tendermint 0.33.3

Fix Security Advisory Lavender of Tendermint

The changes is https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0333

For contributor use:

  • Wrote tests
  • Updated CHANGELOG_PENDING.md
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Updated relevant documentation (docs/) and code comments
  • Re-reviewed Files changed in the Github PR explorer

melekes and others added 6 commits March 11, 2020 13:55
@melekes
noop commit (#4553)
2544a5c 
should force CircleCI to update the code cache

Found a cache from build 100135 at go-src-v1-b215e07ecdc6ad5c363c3b420580aa6b52913feb
Size: 65 MiB
Cached paths:
* /go/src/github.com/tendermint/tendermint/.git

because we have v0.33.1-dev3 tag, bump-semver.py script is thinking the
next tag should be v0.33.1, not v0.33.2:

if re.match('[0-9]+$',patch) is None:
  patchfound = re.match('([0-9]+)',patch)
patch = int(patchfound.group(1))
  else:
  patch = int(patch) + 1

  The last tag it finds is v0.33.1-dev3. So it hits the first branch. But
  the first branch only fetches the number, and doesn't increment it, so
  the result is v0.33.1.

  if there exists a patch tag like 1-dev3, then the next version should be
  0.33.1. But in this case, 0.33.1 has already been released.
@tessr @melekes
mempool: reserve IDs in InitPeer instead of AddPeer
0c0cb9f
@melekes
p2p: limit the number of incoming connections
9821af8 
to p2p.max_num_inbound_peers + len(p2p.unconditional_peer_ids)
@melekes
update changelog and version
62c1a13
@alessio
Merge pull request from GHSA-v24h-pjjv-mcp6
13eff7f 
v0.33.3: advisory fix
@zemyblue
Merge commit '13eff7f7ed80bb5deb8d294998dc429b29bf9fe3' into tendermi…
373b978 
…nt_release
@zemyblue zemyblue added the C: enhancement Classification: New feature or its request, or improvement in maintainability of code label Apr 20, 2020
@zemyblue zemyblue self-assigned this Apr 20, 2020
@zemyblue zemyblue changed the title [WIP] Apply Tendermint 0.33.3 Apply Tendermint 0.33.3 Apr 20, 2020
@zemyblue zemyblue merged commit 555de6b into Finschia:tendermint_release Apr 21, 2020
@zemyblue zemyblue deleted the apply_0.33.3 branch April 21, 2020 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@egonspace egonspace egonspace approved these changes

@torao torao Awaiting requested review from torao

Assignees

@zemyblue zemyblue

Labels
C: enhancement Classification: New feature or its request, or improvement in maintainability of code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@zemyblue @egonspace @melekes @tessr @alessio