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.

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

Rename Tendermint to CometBFT: further actions #224

Merged
merged 31 commits into from
Feb 1, 2023
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
4a7605f
rename: Tendermint -> CometBFT in README files
cason Jan 27, 2023
ef2032d
rename: Tendermint -> CometBFT in doc.go files
cason Jan 27, 2023
d28859b
rename: Tendermint -> CometBFT in Go documentation
cason Jan 27, 2023
2b7dc8d
Merge branch 'main' into cason/further-renaming
cason Jan 30, 2023
11fe6f0
Removing unused/outdated CHANGELOGs
cason Jan 30, 2023
afba9bb
rename: using CometBFT in issues and PR templates
cason Jan 30, 2023
bcd4c20
rename: references to tendermin in libs/events
cason Jan 30, 2023
17f53e3
rename: renaming on text files under rpc/ dir
cason Jan 30, 2023
04fed73
rename: Tendermint-go -> CometBFT in proto docs
cason Jan 30, 2023
536818a
rename: Tendermint -> CometBFT in generated go docs
cason Jan 30, 2023
f8e330c
rename: renaming Tendermint -> CometBFT in scripts
cason Jan 30, 2023
f8f42e3
rename: renaming to CometBFT in code comments
cason Jan 30, 2023
6d37881
rename: general script files on repository root
cason Jan 30, 2023
0142be7
rename: using CometBFT in github config files
cason Jan 30, 2023
8cf1808
rename: Go docs in .proto files, pb.go regenerated
cason Jan 31, 2023
384ee73
rename: toml config file generated content
cason Jan 31, 2023
27043f8
rename: avoiding unnecessary TM entries in comments
cason Jan 31, 2023
3a8957f
rename: renaming in log messages and strings
cason Jan 31, 2023
47a985b
rename: upgrading instructions renamed, needs review
cason Jan 31, 2023
db85cff
rename: fixing generated protobuf files
cason Jan 31, 2023
3cb9cb8
rename: fixing generated protobuf files
cason Jan 31, 2023
ce44fbf
rename: fixing broken test, renamed string
cason Jan 31, 2023
ea5b2db
Merge branch 'main' into cason/further-renaming
cason Jan 31, 2023
112a7a0
Merge branch 'main' into cason/further-renaming
cason Jan 31, 2023
284d583
Apply suggestions from code review
cason Feb 1, 2023
e7a9145
Merge branch 'main' into cason/further-renaming
Feb 1, 2023
690f140
Merge branch 'main' into cason/further-renaming
Feb 1, 2023
9ae3181
Update .github/PULL_REQUEST_TEMPLATE.md
cason Feb 1, 2023
e192f3d
Update abci/README.md
cason Feb 1, 2023
4a4d9f1
Update proto/README.md
cason Feb 1, 2023
3137daf
rename: removing unused files on repo root
Feb 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ about: Create a report to help us squash bugs!
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):
**CometBFT version** (use `cometbft version` or `git rev-parse --verify HEAD` if installed from source):


**ABCI app** (name for built-in, URL for self-written if it's publicly available):
Expand Down
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ v without deliberation

<!-- 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
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/proposal.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ v Word of caution: Under-specified proposals may be rejected summarily

<!-- 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
Expand Down
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ 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
cason marked this conversation as resolved.
Show resolved Hide resolved
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

-->

Expand Down
2 changes: 1 addition & 1 deletion .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

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

-->
2 changes: 1 addition & 1 deletion .github/workflows/janitor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Janitor
# Janitor cleans up previous runs of various workflows
# To add more workflows to cancel visit https://api.github.com/repos/tendermint/tendermint/actions/workflows and find the actions name
# To add more workflows to cancel visit https://api.github.com/repos/cometbft/cometbft/actions/workflows and find the actions name
on:
pull_request:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Golang Linter
# Lint runs golangci-lint over the entire Tendermint repository.
# Lint runs golangci-lint over the entire CometBFT repository.
#
# This workflow is run on every pull request and push to main.
#
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
args: build --skip-validate # skip validate skips initial sanity checks in order to be able to fully run

# Link to CHANGELOG_PENDING.md as release notes.
- run: echo https://github.com/tendermint/tendermint/blob/${GITHUB_REF#refs/tags/}/CHANGELOG_PENDING.md > ../release_notes.md
- run: echo https://github.com/cometbft/cometbft/blob/${GITHUB_REF#refs/tags/}/CHANGELOG_PENDING.md > ../release_notes.md

- name: Release
uses: goreleaser/goreleaser-action@v4
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
"type": "section",
"text": {
"type": "mrkdwn",
"text": ":sparkles: New Tendermint pre-release: <${{ env.RELEASE_URL }}|${{ github.ref_name }}>"
"text": ":sparkles: New CometBFT pre-release: <${{ env.RELEASE_URL }}|${{ github.ref_name }}>"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
version: latest
args: build --skip-validate # skip validate skips initial sanity checks in order to be able to fully run

- run: echo https://github.com/tendermint/tendermint/blob/${GITHUB_REF#refs/tags/}/CHANGELOG.md#${GITHUB_REF#refs/tags/} > ../release_notes.md
- run: echo https://github.com/cometbft/cometbft/blob/${GITHUB_REF#refs/tags/}/CHANGELOG.md#${GITHUB_REF#refs/tags/} > ../release_notes.md

- name: Release
uses: goreleaser/goreleaser-action@v4
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
"type": "section",
"text": {
"type": "mrkdwn",
"text": ":rocket: New Tendermint release: <${{ env.RELEASE_URL }}|${{ github.ref_name }}>"
"text": ":rocket: New CometBFT release: <${{ env.RELEASE_URL }}|${{ github.ref_name }}>"
}
}
]
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
.bak
.idea/
.revision
.tendermint
.tendermint-lite
.cometbft
.cometbft-lite
.terraform
Expand All @@ -32,7 +30,6 @@ index.html.md
libs/pubsub/query/fuzz_test/output
profile\.out
remote_dump
rpc/test/.tendermint
rpc/test/.cometbft
scripts/cutWALUntil/cutWALUntil
scripts/wal2json/wal2json
Expand Down
8 changes: 4 additions & 4 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
project_name: tendermint
project_name: cometbft

env:
# Require use of Go modules.
- GO111MODULE=on

builds:
- id: "tendermint"
main: ./cmd/tendermint/main.go
- id: "cometbft"
main: ./cmd/cometbft/main.go
ldflags:
- -s -w -X github.com/tendermint/tendermint/version.TMCoreSemVer={{ .Version }}
- -s -w -X github.com/cometbft/cometbft/version.TMCoreSemVer={{ .Version }}
env:
- CGO_ENABLED=0
goos:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ all: check build test install
include tests.mk

###############################################################################
### Build Tendermint ###
### Build CometBFT ###
###############################################################################

build:
Expand Down
2 changes: 1 addition & 1 deletion UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ This guide provides instructions for upgrading to specific versions of CometBFT.
values, which was inconsistent with the `uint64` varint length delimiters used
in the P2P layer. Both now consistently use `uint64` varint length delimiters.
* Added `AbciVersion` to `RequestInfo`.
Applications should check that Tendermint's ABCI version matches the one they expect
Applications should check that CometBFT's ABCI version matches the one they expect
in order to ensure compatibility.
* The `SetOption` method has been removed from the ABCI `Client` interface.
The corresponding Protobuf types have been deprecated.
Expand Down
8 changes: 4 additions & 4 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@ Vagrant.configure("2") do |config|
echo 'export GOPATH=/home/vagrant/go' >> /home/vagrant/.bash_profile
cason marked this conversation as resolved.
Show resolved Hide resolved
echo 'export PATH=$PATH:$GOROOT/bin:$GOPATH/bin' >> /home/vagrant/.bash_profile
echo 'export LC_ALL=en_US.UTF-8' >> /home/vagrant/.bash_profile
echo 'cd go/src/github.com/tendermint/tendermint' >> /home/vagrant/.bash_profile
echo 'cd go/src/github.com/cometbft/cometbft' >> /home/vagrant/.bash_profile

mkdir -p /home/vagrant/go/bin
mkdir -p /home/vagrant/go/src/github.com/tendermint
ln -s /vagrant /home/vagrant/go/src/github.com/tendermint/tendermint
mkdir -p /home/vagrant/go/src/github.com/cometbft
ln -s /vagrant /home/vagrant/go/src/github.com/cometbft/cometbft

chown -R vagrant:vagrant /home/vagrant/go
chown vagrant:vagrant /home/vagrant/.bash_profile

# get all deps and tools, ready to install/test
su - vagrant -c 'source /home/vagrant/.bash_profile'
su - vagrant -c 'cd /home/vagrant/go/src/github.com/tendermint/tendermint && make tools'
su - vagrant -c 'cd /home/vagrant/go/src/github.com/cometbft/cometbft && make tools'
SHELL
end
4 changes: 2 additions & 2 deletions abci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ can manage an application state running in another.

Previously, the ABCI was referred to as TMSP.

The community has provided a number of additional implementations, see the [Tendermint Ecosystem](https://github.com/tendermint/awesome#ecosystem)
The community has provided a number of additional implementations, see the [Ecosystem](https://github.com/tendermint/awesome#ecosystem)
cason marked this conversation as resolved.
Show resolved Hide resolved


## Installation & Usage
Expand All @@ -19,7 +19,7 @@ To get up and running quickly, see the [getting started guide](../docs/app-dev/g

A detailed description of the ABCI methods and message types is contained in:

- [The main spec](https://github.com/tendermint/tendermint/blob/main/spec/abci/README.md)
- [The main spec](https://github.com/cometbft/cometbft/blob/main/spec/abci/README.md)
- [A protobuf file](../proto/tendermint/types/types.proto)
- [A Go interface](./types/application.go)

Expand Down
2 changes: 1 addition & 1 deletion abci/example/kvstore/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The app has no replay protection (other than what the mempool provides).
The PersistentKVStoreApplication wraps the KVStoreApplication
and provides two additional features:

1) persistence of state across app restarts (using Tendermint's ABCI-Handshake mechanism)
1) persistence of state across app restarts (using CometBFT's ABCI-Handshake mechanism)
2) validator set changes

The state is persisted in leveldb along with the last block committed,
Expand Down
2 changes: 1 addition & 1 deletion abci/types/application.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type Application interface {
CheckTx(RequestCheckTx) ResponseCheckTx // Validate a tx for the mempool

// Consensus Connection
InitChain(RequestInitChain) ResponseInitChain // Initialize blockchain w validators/other info from TendermintCore
InitChain(RequestInitChain) ResponseInitChain // Initialize blockchain w validators/other info from CometBFT
PrepareProposal(RequestPrepareProposal) ResponsePrepareProposal
ProcessProposal(RequestProcessProposal) ResponseProcessProposal
BeginBlock(RequestBeginBlock) ResponseBeginBlock // Signals the beginning of a block
Expand Down
2 changes: 1 addition & 1 deletion abci/types/mocks/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (m BaseMock) CheckTx(input types.RequestCheckTx) types.ResponseCheckTx {
}

// Consensus Connection
// Initialize blockchain w validators/other info from TendermintCore
// Initialize blockchain w validators/other info from CometBFT
func (m BaseMock) InitChain(input types.RequestInitChain) types.ResponseInitChain {
var ret types.ResponseInitChain
defer func() {
Expand Down
2 changes: 1 addition & 1 deletion abci/types/types.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ configuration: Release
platform:
cason marked this conversation as resolved.
Show resolved Hide resolved
- x64
- x86
clone_folder: c:\go\path\src\github.com\tendermint\tendermint
clone_folder: c:\go\path\src\github.com\cometbft\cometbft
before_build:
- cmd: set GOPATH=%GOROOT%\path
- cmd: set PATH=%GOPATH%\bin;%PATH%
Expand Down
4 changes: 2 additions & 2 deletions cmd/cometbft/commands/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ var VersionCmd = &cobra.Command{

if verbose {
values, _ := json.MarshalIndent(struct {
Tendermint string `json:"tendermint"`
CometBFT string `json:"cometbft"`
ABCI string `json:"abci"`
BlockProtocol uint64 `json:"block_protocol"`
P2PProtocol uint64 `json:"p2p_protocol"`
}{
Tendermint: cmtVersion,
CometBFT: cmtVersion,
ABCI: version.ABCISemVer,
BlockProtocol: version.BlockProtocol,
P2PProtocol: version.P2PProtocol,
Expand Down