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

transfer (total escrow): add escrow / unescrow functions (backport #3507) #3550

Merged
merged 2 commits into from
May 4, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 3, 2023

This is an automatic backport of pull request #3507 done by Mergify.
Cherry-pick of 9ebc2f8 has failed:

On branch mergify/bp/release/v7.1.x/pr-3507
Your branch is up to date with 'origin/release/v7.1.x'.

You are currently cherry-picking commit 9ebc2f81.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/transfer/keeper/relay.go

no changes added to commit (use "git add" and/or "git commit -a")

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

* add escrow/unescrow functions

* fix

* fix linter warning

* imp. add more code documentation

* chore. restructure code to match sybling function

---------

Co-authored-by: Colin Axnér <[email protected]>
Co-authored-by: Jim Fasarakis-Hilliard <[email protected]>
(cherry picked from commit 9ebc2f8)

# Conflicts:
#	modules/apps/transfer/keeper/relay.go
@damiannolan damiannolan merged commit 20fddcf into release/v7.1.x May 4, 2023
@damiannolan damiannolan deleted the mergify/bp/release/v7.1.x/pr-3507 branch May 4, 2023 07:47
@faddat faddat mentioned this pull request Jun 23, 2023
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants