Add dYdX commits to cosmos v0.47.1 #11
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fix lint/gocritic error * Disable some workflow jobs
![github-actions[bot]](https://github.com/avatars/in/15368?s=60&v=4){kind=small}
Comment on lines
488
to
+494
| // empty/reset the deliver state | ||
| app.deliverState = nil | ||
|
|
||
| if app.commiter != nil { | ||
| app.commiter(app.checkState.ctx) | ||
| } | ||
|
|
There was a problem hiding this comment.
Change potentially affects state.
Call sequence:
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).Commit (baseapp/abci.go:452)
|
You have successfully added a new CodeQL configuration |
|
@jonfung-dydx your pull request is missing a changelog! |
jonfung-dydx
force-pushed
the
jonfung/cherryPick
branch
from
3955a45
to
f1c6c95
Compare
|
Would you be able to squash the last 3 commits into 1 so that it's easier to layer commits next time? |
ttl33
approved these changes
Mar 24, 2023
prettymuchbryce
approved these changes
Mar 24, 2023
| 5. Cherry-pick each dydx-created commit from the current default branch, in order, on to the new `dydx-fork-$VERSION` branch (note: you may want to consider creating multiple PRs for this process if there are difficulties or merge conflicts). For example, `git cherry-pick <commit hash>`. You can verify the first commit by seeing the most recent commit sha for the `$VERSION` (i.e `v0.47.0-alpha2`) tag on the `cosmos/cosmos-sdk` repo, and taking the next commit from that sha. | ||
| 6. Open a PR to merge the second branch (`totoro/dydxCommits`) into the first (`dydx-fork-v0.47.0-alpha2`). Get approval, and merge. | ||
| 7. Update `dydxprotocol/v4` by following the steps in "Making Changes to the fork" above. | ||
| 8. Set `dydx-fork-$VERSION` as the [default branch](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/changing-the-default-branch) in this repository. |
There was a problem hiding this comment.
Should we add a note about the GitHub workflow permissioning and an example of those errors? It requires a GitHub admin to whitelist any new workflows.
prettymuchbryce
approved these changes
Mar 24, 2023
jonfung-dydx
force-pushed
the
jonfung/cherryPick
branch
2 times, most recently
from
c58e5c4
to
0a6795c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following instructions in readme to layer our commits on top of cosmos v0.47.1