8000 0.34.x: Rename Tendermint to CometBFT: further actions (backport #224) by mergify[bot] · Pull Request #255 · cometbft/cometbft · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

0.34.x: Rename Tendermint to CometBFT: further actions (backport #224) #255

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

Merged
merged 19 commits into from
Feb 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension 8000


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ version: 2.1
executors:
golang:
docker:
- image: tendermintdev/docker-tendermint-build
working_directory: /go/src/github.com/tendermint/tendermint
- image: cometbftdev/docker-cometbft-build
working_directory: /go/src/github.com/cometbft/cometbft
environment:
GOBIN: /tmp/bin
release:
machine: true
docs:
docker:
- image: tendermintdev/docker-website-deployment
- image: cometbftdev/docker-website-deployment
environment:
AWS_REGION: us-east-1

Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:

# # Test RPC implementation against the swagger documented specs
# contract_tests:
# working_directory: /home/circleci/.go_workspace/src/github.com/tendermint/tendermint
# working_directory: /home/circleci/.go_workspace/src/github.com/cometbft/cometbft
# machine:
# image: circleci/classic:latest
# environment:
Expand All @@ -139,7 +139,7 @@ jobs:
# # install node and dredd
# ./scripts/get_nodejs.sh
# # build the binaries with a proper version of Go
# docker run --rm -v "$PWD":/go/src/github.com/tendermint/tendermint -w /go/src/github.com/tendermint/tendermint golang make build-linux build-contract-tests-hooks
# docker run --rm -v "$PWD":/go/src/github.com/cometbft/cometbft -w /go/src/github.com/cometbft/cometbft golang make build-linux build-contract-tests-hooks
# # This docker image works with go 1.7, we can install here the hook handler that contract-tests is going to use
# go get github.com/snikch/goodman/cmd/goodman
# make contract-tests
Expand All @@ -149,7 +149,7 @@ workflows:
docs:
jobs:
- deploy_docs:
context: tendermint-docs
context: cometbft-docs
filters:
branches:
only:
Expand All @@ -158,7 +158,7 @@ workflows:
only:
- /^v.*/
- deploy_docs:
context: tendermint-docs-staging
context: cometbft-docs-staging
filters:
branches:
only:
Expand Down
10 changes: 7 additions & 3 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@ about: Create a report to help us squash bugs!
<!--
Please fill in as much of the template below as you can.

Be ready for followup questions, and please respond in a timely
manner. We might ask you to provide additional logs and data (tendermint & app).
If you have general questions, please create a new discussion:
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 (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
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Ask a question
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
26 changes: 25 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,29 @@
_Please add a description of the changes that this PR introduces and the files that
are the most critical to review._

Closes: #XXX
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 #cometbft channel. GitHub Discussions is preferred over Discord as it
allows us to keep track of conversations topically.
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/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

2 changes: 1 addition & 1 deletion .github/auto-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ pullRequestOpened: |
- [ ] Applied Appropriate Labels


Thank you for your contribution to Tendermint! :rocket:
Thank you for your contribution to CometBFT! :rocket:
6 changes: 6 additions & 0 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!--

If you want to ask a general question, please create a new discussion instead of
an issue: https://github.com/cometbft/cometbft/discussions

-->
4 changes: 2 additions & 2 deletions .github/workflows/e2e-nightly-34x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
SLACK_CHANNEL: tendermint-internal
SLACK_CHANNEL: cometbft-engineering
SLACK_USERNAME: Nightly E2E Tests
SLACK_ICON_EMOJI: ':skull:'
SLACK_COLOR: danger
Expand All @@ -68,7 +68,7 @@ jobs:
uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
SLACK_CHANNEL: tendermint-internal
SLACK_CHANNEL: cometbft-engineering
SLACK_USERNAME: Nightly E2E Tests
SLACK_ICON_EMOJI: ':white_check_mark:'
SLACK_COLOR: good
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fuzz-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
SLACK_CHANNEL: tendermint-internal
SLACK_CHANNEL: cometbft-engineering
SLACK_USERNAME: Nightly Fuzz Tests
SLACK_ICON_EMOJI: ':firecracker:'
SLACK_COLOR: danger
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/janitor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Janitor
# Janitor cleans up previous runs of various workflows
# To add more workflows to cancel visit https://api.github.com/repos/cometbft/cometbft/actions/workflows and find the actions name
on:
pull_request:

jobs:
cancel:
name: "Cancel Previous Runs"
runs-on: ubuntu-latest
timeout-minutes: 3
steps:
- uses: styfle/cancel-workflow-action@0.11.0
with:
workflow_id: 1041851,1401230,2837803
access_token: ${{ github.token }}
14 changes: 10 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
name: Lint
# Lint runs golangci-lint over the entire Tendermint repository
# This workflow is run on every pull request and push to master
# The `golangci` job will pass without running if no *.{go, mod, sum} files have been modified.
name: Golang Linter
# Lint runs golangci-lint over the entire CometBFT repository.
#
# This workflow is run on every pull request and push to main.
#
# The `golangci` job will pass without running if no *.{go, mod, sum}
# files have been modified.
#
# To run this locally, simply run `make lint` from the root of the repo.

on:
pull_request:
push:
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
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ build/*
.cometbft
.cometbft-lite
rpc/test/.cometbft
rpc/test/.tendermint
.tendermint
remote_dump
.revision
vendor
Expand All @@ -23,6 +21,10 @@ docs/node_modules/
docs/.vuepress/public/rpc
index.html.md

libs/pubsub/query/fuzz_test/output
profile\.out
remote_dump
rpc/test/.cometbft
scripts/wal2json/wal2json
scripts/cutWALUntil/cutWALUntil

Expand All @@ -34,7 +36,6 @@ scripts/cutWALUntil/cutWALUntil
libs/pubsub/query/fuzz_test/output
shunit2

.tendermint-lite
addrbook.json

*/vendor
Expand Down
6 changes: 3 additions & 3 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
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/cometbft/cometbft/version.TMCoreSemVer={{ .Version }}
env:
Expand Down
5 changes: 2 additions & 3 deletions UPGRADING.md
10000
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Upgrading Tendermint Core
# Upgrading CometBFT

This guide provides instructions for upgrading to specific versions of
Tendermint Core.
This guide provides instructions for upgrading to specific versions of CometBFT.

## v0.34.24

Expand Down
66 changes: 0 additions & 66 deletions Vagrantfile

This file was deleted.

3 changes: 1 addition & 2 deletions abci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ 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)


## Installation & Usage
Expand All @@ -19,7 +18,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/v0.34.x/spec/abci/abci.md)
- [The main spec](https://github.com/cometbft/cometbft/blob/v0.34.x/spec/abci/README.md)
- [A protobuf file](./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 @@ -18,7 +18,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
BeginBlock(RequestBeginBlock) ResponseBeginBlock // Signals the beginning of a block
DeliverTx(RequestDeliverTx) ResponseDeliverTx // Deliver a tx for full processing
EndBlock(RequestEndBlock) ResponseEndBlock // Signals the end of a block, returns changes to the validator set
Expand Down
Loading
0