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

fix: ensure TxFactory has acc & seq fields when simulating tx in generate-only mode (backport #11313) #11318

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 3, 2022

This is an automatic backport of pull request #11313 done by Mergify.
Cherry-pick of 0a7ad01 has failed:

On branch mergify/bp/release/v0.45.x/pr-11313
Your branch is up to date with 'origin/release/v0.45.x'.

You are currently cherry-picking commit 0a7ad0181.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/tx/factory.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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

…rate-only mode (#11313)

* fix: ensure TxFactory has acc no & seq when simulating tx in generate only mode

* add changelog

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
(cherry picked from commit 0a7ad01)

# Conflicts:
#	client/tx/factory.go
@mergify mergify bot added the conflicts label Mar 3, 2022
@github-actions github-actions bot added the C:CLI label Mar 3, 2022
Copy link
Contributor

@alexanderbez alexanderbez left a comment

Choose a reason for hiding this comment

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

Is BuildUnsignedTx on 0.45.x?

@tac0turtle
Copy link
Member

seems like it is, just in a different location

@alexanderbez
Copy link
Contributor

@clevinson could you address the conflicts here?

@github-actions github-actions bot removed the C:CLI label Mar 15, 2022
@tac0turtle
Copy link
Member

this requires some other changes to get it through. I think we should close this instead of back porting other things

@tac0turtle tac0turtle closed this Mar 15, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.45.x/pr-11313 branch March 15, 2022 16:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants