Skip to content

feat(pbts): migrating to v1.x the new version of the specification (backport #1973)#2544

Merged
sergio-mena merged 1 commit intov1.xfrom
mergify/bp/v1.x/pr-1973
Mar 8, 2024
Merged

feat(pbts): migrating to v1.x the new version of the specification (backport #1973)#2544
sergio-mena merged 1 commit intov1.xfrom
mergify/bp/v1.x/pr-1973

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 8, 2024

This is an automatic backport of pull request #1973 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

This PR cherry-picks a number of commits present in the `master` branch
of this repository.

Some of the commits are from the old `tendermint/spec` repository,
namely:

- tendermint/spec#369
- tendermint/spec#373
- tendermint/spec#375
- tendermint/spec#398
- tendermint/spec#399

This content has then been migrated to the `tendermint/tendermint`
repository, from which follow PRs were considered:

- tendermint/tendermint#7804 (**not cherry-picked**)
- tendermint/tendermint#8018
- tendermint/tendermint#8096

Most of the conflicts and the fixes needed refer to links to content,
that have been updated or referred to old repositories.

The MD files that are currently under
`spec/consensus/proposer-based-timestamp` were moved to the `v1` subdir.
Files with similar names, but the `-002` suffix were added with the new
solution, replacing the old ones.

The differences from the original content, on `master` and the content
of this PR are minimal, as one can check by running

` git diff master spec/consensus/proposer-based-timestamp/`

Finally, the entry point of the added content can be found
[here](https://github.com/cometbft/cometbft/blob/cason/pbts-spec/spec/consensus/proposer-based-timestamp/README.md).

---------

Co-authored-by: Daniel <daniel.cason@usi.ch>
Co-authored-by: Josef Widder <44643235+josef-widder@users.noreply.github.com>
Co-authored-by: William Banfield <4561443+williambanfield@users.noreply.github.com>
Co-authored-by: Kukovec <jure.kukovec@gmail.com>
Co-authored-by: Daniel Cason <cason@gandria>
Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
(cherry picked from commit 84339ef)
@mergify mergify bot requested review from a team as code owners March 8, 2024 19:05
@sergio-mena sergio-mena changed the title PBTS: migrating to main the new version of the specification (backport #1973) feat(pbts): migrating to v1.x the new version of the specification (backport #1973) Mar 8, 2024
@sergio-mena sergio-mena self-assigned this Mar 8, 2024
@sergio-mena sergio-mena merged commit 4f10adf into v1.x Mar 8, 2024
@sergio-mena sergio-mena deleted the mergify/bp/v1.x/pr-1973 branch March 8, 2024 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

1 participant