Skip to content

Commit

Permalink
Merge branch main into feature/abci++vef
Browse files Browse the repository at this point in the history
  • Loading branch information
sergio-mena committed Feb 28, 2023
2 parents cbcdffb + c67d2f7 commit bd9d7e9
Show file tree
Hide file tree
Showing 951 changed files with 9,237 additions and 45,022 deletions.
1 change: 1 addition & 0 deletions .changelog/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
project_url = 'https://github.com/cometbft/cometbft'
11 changes: 11 additions & 0 deletions .changelog/epilogue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---

CometBFT is a fork of [Tendermint Core](https://github.com/tendermint/tendermint) as of late December 2022.

## Bug bounty

Friendly reminder, we have a [bug bounty program](https://hackerone.com/cosmos).

## Previous changes

For changes released before the creation of CometBFT, please refer to the Tendermint Core [CHANGELOG.md](https://github.com/tendermint/tendermint/blob/a9feb1c023e172b542c972605311af83b777855b/CHANGELOG.md).
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- The `TMHOME` environment variable was renamed to `CMTHOME`, and all environment variables starting with `TM_` are instead prefixed with `CMT_`
([\#211](https://github.com/cometbft/cometbft/issues/211))
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- [mempool] Remove priority mempool.
([\#260](https://github.com/cometbft/cometbft/issues/260))
- [config] Remove `Version` field from `MempoolConfig`.
([\#260](https://github.com/cometbft/cometbft/issues/260))
- [protobuf] Remove fields `sender`, `priority`, and `mempool_error` from
`ResponseCheckTx`. ([\#260](https://github.com/cometbft/cometbft/issues/260))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[tools/tm-signer-harness]` Set OS home dir to instead of the hardcoded PATH.
([\#6498](https://github.com/tendermint/tendermint/pull/6498))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[state]` Move pruneBlocks from node/state to state/execution.
([\#6541](https://github.com/tendermint/tendermint/pull/6541))
2 changes: 2 additions & 0 deletions .changelog/unreleased/breaking-changes/9468-finalize-block.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[abci]` Introduce `FinalizeBlock` which condenses `BeginBlock`, `DeliverTx` and `EndBlock` into a single method call (@cmwaters)
([\#9468](https://github.com/tendermint/tendermint/pull/9468))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[p2p]` Remove unused p2p/trust package
([\#9625](https://github.com/tendermint/tendermint/pull/9625))
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- `[inspect]` Add a new `inspect` command for introspecting
the state and block store of a crashed tendermint node.
([\#9655](https://github.com/tendermint/tendermint/pull/9655))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[node]` Move DBContext and DBProvider from the node package to the config
package. ([\#9655](https://github.com/tendermint/tendermint/pull/9655))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[rpc]` Remove global environment and replace with constructor
([\#9655](https://github.com/tendermint/tendermint/pull/9655))
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- `[metrics]` Move state-syncing and block-syncing metrics to
their respective packages. Move labels from block_syncing
-> blocksync_syncing and state_syncing -> statesync_syncing
([\#9682](https://github.com/tendermint/tendermint/pull/9682))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[consensus]` ([\#386](https://github.com/cometbft/cometbft/pull/386)) Short-term fix for the case when `needProofBlock` cannot find previous block meta by defaulting to the creation of a new proof block. (@adizere)
- Special thanks to the [Vega.xyz](https://vega.xyz/) team, and in particular to Zohar (@ze97286), for reporting the problem and working with us to get to a fix.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[consensus]` Fixed a busy loop that happened when sending of a block part failed by sleeping in case of error.
([\#4](https://github.com/informalsystems/tendermint/pull/4))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[docker]` Ensure Docker image uses consistent version of Go.
([\#9462](https://github.com/tendermint/tendermint/pull/9462))
2 changes: 2 additions & 0 deletions .changelog/unreleased/bug-fixes/9717-abci-cli-fix-help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[abci-cli]` Fix broken abci-cli help command.
([\#9717](https://github.com/tendermint/tendermint/pull/9717))
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- `[config]` Introduce `BootstrapPeers` to the config to allow
nodes to list peers to be added to the addressbook upon start up.
([\#9680](https://github.com/tendermint/tendermint/pull/9680))
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- `[proxy]` Introduce `NewUnsyncLocalClientCreator`, which allows local ABCI
clients to have the same concurrency model as remote clients (i.e. one
mutex per client "connection", for each of the four ABCI "connections").
([\#9830](https://github.com/tendermint/tendermint/pull/9830))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[tools/tm-signer-harness]` Remove the folder as it is unused
([\#136](https://github.com/cometbft/cometbft/issues/136))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[e2e]` Add functionality for uncoordinated (minor) upgrades
([\#56](https://github.com/tendermint/tendermint/pull/56))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[crypto/merkle]` Improve HashAlternatives performance
([\#6443](https://github.com/tendermint/tendermint/pull/6443))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[p2p/pex]` Improve addrBook.hash performance
([\#6509](https://github.com/tendermint/tendermint/pull/6509))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[crypto/merkle]` Improve HashAlternatives performance
([\#6513](https://github.com/tendermint/tendermint/pull/6513))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[pubsub]` Performance improvements for the event query API
([\#7319](https://github.com/tendermint/tendermint/pull/7319))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- `[rpc]` Enable caching of RPC responses
([\#9650](https://github.com/tendermint/tendermint/pull/9650))
62 changes: 49 additions & 13 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
---
name: Bug report
about: Create a report to help us squash bugs!

labels: bug, needs-triage
---
<!--
Please fill in as much of the template below as you can.
If you have general questions, please create a new discussion:
https://github.com/tendermint/tendermint/discussions
https://github.com/cometbft/cometbft/discussions
Be ready for followup questions, and please respond in a timely manner. We might
ask you to provide additional logs and data (tendermint & app).
ask you to provide additional logs and data (CometBFT & App).
-->

**Tendermint version** (use `tendermint version` or `git rev-parse --verify HEAD` if installed from source):
## Bug Report

### Setup

**CometBFT version** (use `cometbft version` or `git rev-parse --verify HEAD` if installed from source):

**Have you tried the latest version**: yes/no

**ABCI app** (name for built-in, URL for self-written if it's publicly available):

Expand All @@ -25,23 +30,54 @@ ask you to provide additional logs and data (tendermint & app).
- **Install tools**:
- **Others**:

**node command runtime flags**:

**What happened**:
### Config

<!--
**What you expected to happen**:
You can paste only the changes you've made.
-->

**Have you tried the latest version**: yes/no
### What happened?

**How to reproduce it** (as minimally and precisely as possible):
### What did you expect to happen?

**Logs (paste a small part showing an error (< 10 lines) or link a pastebin, gist, etc. containing more of the log file)**:
### How to reproduce it

**Config (you can paste only the changes you've made)**:
<!--
**node command runtime flags**:
Provide a description here as minimally and precisely as possible as to how to
reproduce the issue. Ideally only using our kvstore application, as debugging
app chains is not within our team's scope.
-->

### Logs

<!--
**Please provide the output from the `http://<ip>:<port>/dump_consensus_state` RPC endpoint for consensus bugs**
Paste a small part showing an error (< 10 lines) or link a pastebin, gist, etc.
containing more of the log file).
-->

### `dump_consensus_state` output

<!--
Please provide the output from the `http://<ip>:<port>/dump_consensus_state` RPC
endpoint for consensus bugs.
-->

### Anything else we need to know

<!--
Is there any additional information not covered by the other sections that would
help us to triage/debug/fix this issue?
-->

**Anything else we need to know**:
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Ask a question
url: https://github.com/tendermint/tendermint/discussions
url: https://github.com/cometbft/cometbft/discussions
about: Please ask and answer questions here
14 changes: 8 additions & 6 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Feature request
about: Create a proposal to request a feature

labels: enhancement, needs-triage
---

<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
Expand All @@ -11,17 +11,19 @@ v Word of caution: poorly thought-out proposals may be rejected
v without deliberation
☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -->

## Summary
## Feature Request

### Summary

<!-- Short, concise description of the proposed feature -->

## Problem Definition
### Problem Definition

<!-- Why do we need this feature?
<!-- Why do we need this feature?
What problems may be addressed by introducing this feature?
What benefits does Tendermint stand to gain by including this feature?
What benefits does CometBFT stand to gain by including this feature?
Are there any disadvantages of including this feature? -->

## Proposal
### Proposal

<!-- Detailed description of requirements of implementation -->
14 changes: 7 additions & 7 deletions .github/ISSUE_TEMPLATE/proposal.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Protocol change proposal
about: Create a proposal to request a change to the protocol

labels: protocol-change, needs-triage
---

<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
Expand All @@ -10,19 +10,19 @@ v Before smashing the submit button please review the template.
v Word of caution: Under-specified proposals may be rejected summarily
☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -->

# Protocol Change Proposal
## Protocol Change Proposal

## Summary
### Summary

<!-- Short, concise description of the proposed change -->

## Problem Definition
### Problem Definition

<!-- Why do we need this change?
<!-- Why do we need this change?
What problems may be addressed by introducing this change?
What benefits does Tendermint stand to gain by including this change?
What benefits does CometBFT stand to gain by including this change?
Are there any disadvantages of including this change? -->

## Proposal
### Proposal

<!-- Detailed description of requirements of implementation -->
13 changes: 6 additions & 7 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,24 @@ If this PR is non-trivial/large/complex, please ensure that you have either
created an issue that the team's had a chance to respond to, or had some
discussion with the team prior to submitting substantial pull requests. The team
can be reached via GitHub Discussions or the Cosmos Network Discord server in
the #tendermint-core channel. GitHub Discussions is preferred over Discord as it
the #cometbft channel. GitHub Discussions is preferred over Discord as it
allows us to keep track of conversations topically.
https://github.com/tendermint/tendermint/discussions
https://github.com/cometbft/cometbft/discussions
If the work in this PR is not aligned with the team's current priorities, please
be advised that it may take some time before it is merged - especially if it has
not yet been discussed with the team.
See the project board for the team's current priorities:
https://github.com/orgs/tendermint/projects/15/views/5
https://github.com/orgs/cometbft/projects/1
-->

---

#### PR checklist

- [ ] Tests written/updated, or no tests needed
- [ ] `CHANGELOG_PENDING.md` updated, or no changelog entry needed
- [ ] Updated relevant documentation (`docs/`) and code comments, or no
documentation updates needed
- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use [unclog](https://github.com/informalsystems/unclog) to manage our changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code comments

25 changes: 0 additions & 25 deletions .github/codecov.yml

This file was deleted.

6 changes: 5 additions & 1 deletion .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
---
labels: needs-triage
---

<!--
If you want to ask a general question, please create a new discussion instead of
an issue: https://github.com/tendermint/tendermint/discussions
an issue: https://github.com/cometbft/cometbft/discussions
-->
7 changes: 4 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: "1.18"
go-version: "1.19"
- uses: actions/checkout@v3
- uses: technote-space/get-diff-action@v6
with:
Expand All @@ -32,6 +32,7 @@ jobs:
go.mod
go.sum
Makefile
- name: install
run: GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} make build
if: "env.GIT_DIFF != ''"
Expand All @@ -43,7 +44,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: "1.18"
go-version: "1.19"
- uses: actions/checkout@v3
- uses: technote-space/get-diff-action@v6
with:
Expand All @@ -65,7 +66,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: "1.18"
go-version: "1.19"
- uses: actions/checkout@v3
- uses: technote-space/get-diff-action@v6
with:
Expand Down
Loading

0 comments on commit bd9d7e9

Please sign in to comment.