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

Apply [email protected] #18

Merged
merged 10 commits into from
Jul 31, 2023
Merged

Apply [email protected] #18

merged 10 commits into from
Jul 31, 2023

Conversation

ulbqb
Copy link
Member

@ulbqb ulbqb commented Jul 27, 2023

Description

Screen Shot 2023-07-27 at 18 26 58 common commit: 48a6ae5

This PR summarizes past PRs(#1 ,#3, #5, #6, #9, #10, #11, #12, #13, #15, #17). This applies finschia-sdk to the latest common commit that all 4+ versions have, and enables to update ibc-go easily for finschia.

474535c mainly modifies the module as follows:

  • "github.com/tendermint/tendermint/crypto" -> "github.com/Finschia/ostracon/crypto"
  • "github.com/tendermint/tendermint/libs/bytes" -> "github.com/Finschia/ostracon/libs/bytes"
  • "github.com/tendermint/tendermint/libs/log" -> "github.com/Finschia/ostracon/libs/log"
  • "github.com/tendermint/tendermint/libs/math" -> "github.com/Finschia/ostracon/libs/math"
  • "github.com/tendermint/tendermint/light" -> "github.com/Finschia/ostracon/light"
  • "github.com/tendermint/tendermint/types" -> "github.com/Finschia/ostracon/types"
  • + ocabci "github.com/Finschia/ostracon/abci/types" for ocabci.RequestBeginBlock
  • cosmos17dtl0mjt3t77kpuhg2edqzjpszulwhgzuj9ljs -> link17dtl0mjt3t77kpuhg2edqzjpszulwhgzfu9afc
  • cosmos1ckgw5d7jfj7wwxjzs9fdrdev9vc8dzcw3n2lht -> link1ckgw5d7jfj7wwxjzs9fdrdev9vc8dzcwya2avr

Motivation and context

A lot of reverting and backporting is required to update current main because upstream history doesn't have finschia path. This PR solves it.

How has this been tested?

Screenshots (if appropriate):

Checklist:

  • I followed the contributing guidelines and code of conduct.
  • I have added a relevant changelog to CHANGELOG.md
  • I have added tests to cover my changes.
  • I have updated the documentation accordingly.
  • I have updated API documentation client/docs/swagger-ui/swagger.yaml

@ulbqb ulbqb self-assigned this Jul 27, 2023
@ulbqb ulbqb added the enhancement New feature or request label Jul 27, 2023
@ulbqb ulbqb marked this pull request as ready for review July 27, 2023 09:28
@ulbqb ulbqb requested a review from zemyblue July 27, 2023 10:53
Copy link
Member

@zemyblue zemyblue left a comment

Choose a reason for hiding this comment

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

I don't know which ibc-go version of cosmos in this pr apply. Please introduce which version applies. also in the changelogs.

@ulbqb
Copy link
Member Author

ulbqb commented Jul 27, 2023

@zemyblue
This PR doesn't apply any version and just modifies the common commit. Supporting v4.3.1 requires backporting cosmos/ibc-go@48a6ae5...cosmos:ibc-go:v4.3.1.

@ulbqb ulbqb requested a review from zemyblue July 27, 2023 12:46
@ulbqb ulbqb merged commit 7176e4e into Finschia:upstream+fnsa Jul 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants