Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

(feat) Add possibility to transfer entire balance. (backport #6877) #6920

Merged
merged 5 commits into from
Jul 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 23, 2024

Description

closes: #6567


Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Targeted PR against the correct branch (see CONTRIBUTING.md).
  • Linked to GitHub issue with discussion and accepted design, OR link to spec that describes this work.
  • Code follows the module structure standards and Go style guide.
  • Wrote unit and integration tests.
  • Updated relevant documentation (docs/).
  • Added relevant godoc comments.
  • Provide a conventional commit message to follow the repository standards.
  • Include a descriptive changelog entry when appropriate. This may be left to the discretion of the PR reviewers. (e.g. chores should be omitted from changelog)
  • Re-reviewed Files changed in the GitHub PR explorer.
  • Review SonarCloud Report in the comment section below once CI passes.

This is an automatic backport of pull request #6877 done by [Mergify](https://mergify.com).

* Add possibility to transfer entire balance.

* Added entry to the Changelog.

* Added e2e test

* Added forwarding

* Update modules/apps/transfer/keeper/relay.go

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>

* Move UnboundedSpendLimit to token.go

* add documentation

* add test to compatibility matrices

* PR Feedback.

---------

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
(cherry picked from commit 92e1f38)

# Conflicts:
#	.github/compatibility-test-matrices/release-v9.0.x/transfer-v2-multidenom-chain-a.json
@mergify mergify bot added the conflicts label Jul 23, 2024
@mergify mergify bot requested a review from colin-axner as a code owner July 23, 2024 09:34
Copy link
Contributor Author

mergify bot commented Jul 23, 2024

Cherry-pick of 92e1f38 has failed:

On branch mergify/bp/release/v9.0.x/pr-6877
Your branch is up to date with 'origin/release/v9.0.x'.

You are currently cherry-picking commit 92e1f387.
  (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:   .github/compatibility-test-matrices/main/transfer-v2-chain-a.json
	modified:   .github/compatibility-test-matrices/unreleased/transfer-v2.json
	modified:   CHANGELOG.md
	modified:   docs/docs/02-apps/01-transfer/04-messages.md
	modified:   docs/docs/02-apps/01-transfer/10-ICS20-v1/04-messages.md
	modified:   e2e/tests/transfer/base_test.go
	modified:   modules/apps/transfer/keeper/relay.go
	modified:   modules/apps/transfer/keeper/relay_test.go
	modified:   modules/apps/transfer/types/token.go
	modified:   modules/apps/transfer/types/transfer_authorization.go
	modified:   testing/chain.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/compatibility-test-matrices/release-v9.0.x/transfer-v2-multidenom-chain-a.json

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

@damiannolan
Copy link
Contributor

damiannolan commented Jul 23, 2024

where are the conflicts in this PR? 🤔 was it file deletion?

@DimitrisJim
Copy link
Contributor

DimitrisJim commented Jul 23, 2024

seems so:

CONFLICT (modify/delete): .github/compatibility-test-matrices/release-v9.0.x/transfer-v2-multidenom-chain-a.json deleted in HEAD and modified in 92e1f387b ((feat) Add possibility to transfer entire balance. (#6877)).  Version 92e1f387b ((feat) Add possibility to transfer entire balance. (#6877)) of .github/compatibility-test-matrices/release-v9.0.x/transfer-v2-multidenom-chain-a.json left in tree.

think we can just move forward with it?

Copy link
Contributor

@crodriguezvega crodriguezvega left a comment

Choose a reason for hiding this comment

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

Looks good. I deleted all the e2e I will delete it in a separatePR. Maybe in a separate PR we could also delete compatibility matrices and docs.

This reverts commit 71db49e.
Copy link

@crodriguezvega crodriguezvega merged commit 016be29 into release/v9.0.x Jul 26, 2024
25 checks passed
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v9.0.x/pr-6877 branch July 26, 2024 07:00
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants