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

docs: disambiguate protocol version #3034

Merged
merged 2 commits into from
May 8, 2024
Merged

docs: disambiguate protocol version #3034

merged 2 commits into from
May 8, 2024

Conversation

melekes
Copy link
Contributor

@melekes melekes commented May 8, 2024

Closes #3030


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments
  • Title follows the Conventional Commits spec

@melekes melekes requested review from a team as code owners May 8, 2024 07:19
@melekes melekes added the backport-to-v1.x Tell Mergify to backport the PR to v1.x label May 8, 2024
@melekes melekes self-assigned this May 8, 2024
@adizere
Copy link
Member

adizere commented May 8, 2024

Tagging @rootulp for a quick check here.

Copy link
Contributor

@rootulp rootulp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for the fast response

@melekes melekes enabled auto-merge May 8, 2024 13:51
Copy link
Collaborator

@cason cason left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

| block_version | uint64 | The CometBFT Block Protocol version | 2 |
| p2p_version | uint64 | The CometBFT P2P Protocol version | 3 |
| block_version | uint64 | The CometBFT Block version | 2 |
| p2p_version | uint64 | The CometBFT P2P version | 3 |
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we keep protocol here?

@@ -42,7 +42,7 @@ title: Methods
|---------------------|--------|-----------------------------------------------------|--------------|---------------|
| data | string | Some arbitrary information | 1 | N/A |
| version | string | The application software semantic version | 2 | N/A |
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the difference between version and app_version here?

@@ -147,10 +147,10 @@ NOTE: that this is more specifically the consensus version and doesn't include i
P2P Version. (TODO: we should write a comprehensive document about
versioning that this can refer to)

| Name | type | Description | Validation |
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we reword the previous paragraph?

Maybe we should only mention that the p2p version is not part of this Version field. The p2p version is only relevant at the p2p communication layer.

@melekes melekes added this pull request to the merge queue May 8, 2024
Merged via the queue into main with commit daa043a May 8, 2024
38 checks passed
@melekes melekes deleted the 3030-protocol-version branch May 8, 2024 14:19
mergify bot pushed a commit that referenced this pull request May 8, 2024
Closes #3030

---

#### PR checklist

- [ ] ~~Tests written/updated~~
- [ ] ~~Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)~~
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

(cherry picked from commit daa043a)
melekes added a commit that referenced this pull request May 8, 2024
Closes #3030


---

#### PR checklist

- [ ] ~~Tests written/updated~~
- [ ] ~~Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)~~
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec
<hr>This is an automatic backport of pull request #3034 done by
[Mergify](https://mergify.com).

Co-authored-by: Anton Kaliaev <[email protected]>
@melekes
Copy link
Contributor Author

melekes commented May 8, 2024

@mergify backport v0.34.x

@melekes
Copy link
Contributor Author

melekes commented May 8, 2024

@mergify backport v0.37.x

Copy link
Contributor

mergify bot commented May 8, 2024

backport v0.34.x

✅ Backports have been created

Copy link
Contributor

mergify bot commented May 8, 2024

backport v0.37.x

✅ Backports have been created

@melekes
Copy link
Contributor Author

melekes commented May 8, 2024

@mergify backport v0.38.x

Copy link
Contributor

mergify bot commented May 8, 2024

backport v0.38.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request May 8, 2024
Closes #3030

---

#### PR checklist

- [ ] ~~Tests written/updated~~
- [ ] ~~Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)~~
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

(cherry picked from commit daa043a)

# Conflicts:
#	spec/abci/abci++_methods.md
#	spec/core/data_structures.md
mergify bot pushed a commit that referenced this pull request May 8, 2024
Closes #3030

---

#### PR checklist

- [ ] ~~Tests written/updated~~
- [ ] ~~Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)~~
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

(cherry picked from commit daa043a)

# Conflicts:
#	spec/abci/abci++_methods.md
#	spec/core/data_structures.md
mergify bot pushed a commit that referenced this pull request May 8, 2024
Closes #3030

---

#### PR checklist

- [ ] ~~Tests written/updated~~
- [ ] ~~Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)~~
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

(cherry picked from commit daa043a)

# Conflicts:
#	spec/core/data_structures.md
melekes added a commit that referenced this pull request May 8, 2024
Closes #3030


---

#### PR checklist

- [ ] ~~Tests written/updated~~
- [ ] ~~Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)~~
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec
<hr>This is an automatic backport of pull request #3034 done by
[Mergify](https://mergify.com).

---------

Co-authored-by: Anton Kaliaev <[email protected]>
melekes added a commit that referenced this pull request May 8, 2024
Closes #3030


---

#### PR checklist

- [ ] ~~Tests written/updated~~
- [ ] ~~Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)~~
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec
<hr>This is an automatic backport of pull request #3034 done by
[Mergify](https://mergify.com).

---------

Co-authored-by: Anton Kaliaev <[email protected]>
melekes added a commit that referenced this pull request May 8, 2024
Closes #3030


---

#### PR checklist

- [ ] ~~Tests written/updated~~
- [ ] ~~Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)~~
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec
<hr>This is an automatic backport of pull request #3034 done by
[Mergify](https://mergify.com).

---------

Co-authored-by: Anton Kaliaev <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-to-v1.x Tell Mergify to backport the PR to v1.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disambiguate protocol version, block version, app version
4 participants