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

migrate from frozen to more generic host chain fee abs connection status (backport #156) #160

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 8, 2024

This is an automatic backport of pull request #156 done by Mergify.
Cherry-pick of d2b5f20 has failed:

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

You are currently cherry-picking commit d2b5f20.
  (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:   proto/feeabstraction/absfee/v1beta1/epoch.proto
	modified:   proto/feeabstraction/absfee/v1beta1/proposal.proto
	modified:   x/feeabs/client/cli/tx_test.go
	modified:   x/feeabs/keeper/abci.go
	modified:   x/feeabs/keeper/epoch.go
	modified:   x/feeabs/keeper/host_zone_test.go
	modified:   x/feeabs/keeper/keeper_test.go
	new file:   x/feeabs/spec/08_feeabs.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Makefile
	deleted by us:   tests/interchaintest/feeabs/query.go
	deleted by us:   tests/interchaintest/feeabs/tx.go
	deleted by us:   tests/interchaintest/feeabs_test.go
	deleted by us:   tests/interchaintest/host_zone_proposal_test.go
	both modified:   tests/interchaintest/packet_foward_test.go
	deleted by us:   tests/interchaintest/query_osmosis_twap_test.go
	both modified:   tests/interchaintest/setup.go
	both modified:   x/feeabs/ante/decorate.go
	both modified:   x/feeabs/keeper/config.go
	both modified:   x/feeabs/keeper/ibc.go
	deleted by us:   x/feeabs/keeper/ibc_test.go
	both modified:   x/feeabs/keeper/msgserver.go
	both modified:   x/feeabs/keeper/proposal_test.go
	both modified:   x/feeabs/spec/07_ibc.md
	both modified:   x/feeabs/types/epoch.go
	both modified:   x/feeabs/types/epoch.pb.go
	both modified:   x/feeabs/types/errors.go
	both modified:   x/feeabs/types/keys.go
	both modified:   x/feeabs/types/proposal.pb.go

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


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

…tus (#156)

* initial migrate from frozen to more generic host chain fee abs connection status

* more generic set state host zone

* add code for exponential backoff, no test

* add unit test

* linting

* allcaps

* error handling

---------

Co-authored-by: Jacob Gadikian <[email protected]>
(cherry picked from commit d2b5f20)

# Conflicts:
#	Makefile
#	tests/interchaintest/feeabs/query.go
#	tests/interchaintest/feeabs/tx.go
#	tests/interchaintest/feeabs_test.go
#	tests/interchaintest/host_zone_proposal_test.go
#	tests/interchaintest/packet_foward_test.go
#	tests/interchaintest/query_osmosis_twap_test.go
#	tests/interchaintest/setup.go
#	x/feeabs/ante/decorate.go
#	x/feeabs/keeper/config.go
#	x/feeabs/keeper/ibc.go
#	x/feeabs/keeper/ibc_test.go
#	x/feeabs/keeper/msgserver.go
#	x/feeabs/keeper/proposal_test.go
#	x/feeabs/spec/07_ibc.md
#	x/feeabs/types/epoch.go
#	x/feeabs/types/epoch.pb.go
#	x/feeabs/types/errors.go
#	x/feeabs/types/keys.go
#	x/feeabs/types/proposal.pb.go
@mergify mergify bot added the conflicts label Mar 8, 2024
Copy link
Author

mergify bot commented Mar 8, 2024

Cherry-pick of d2b5f20 has failed:

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

You are currently cherry-picking commit d2b5f20.
  (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:   proto/feeabstraction/absfee/v1beta1/epoch.proto
	modified:   proto/feeabstraction/absfee/v1beta1/proposal.proto
	modified:   x/feeabs/client/cli/tx_test.go
	modified:   x/feeabs/keeper/abci.go
	modified:   x/feeabs/keeper/epoch.go
	modified:   x/feeabs/keeper/host_zone_test.go
	modified:   x/feeabs/keeper/keeper_test.go
	new file:   x/feeabs/spec/08_feeabs.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Makefile
	deleted by us:   tests/interchaintest/feeabs/query.go
	deleted by us:   tests/interchaintest/feeabs/tx.go
	deleted by us:   tests/interchaintest/feeabs_test.go
	deleted by us:   tests/interchaintest/host_zone_proposal_test.go
	both modified:   tests/interchaintest/packet_foward_test.go
	deleted by us:   tests/interchaintest/query_osmosis_twap_test.go
	both modified:   tests/interchaintest/setup.go
	both modified:   x/feeabs/ante/decorate.go
	both modified:   x/feeabs/keeper/config.go
	both modified:   x/feeabs/keeper/ibc.go
	deleted by us:   x/feeabs/keeper/ibc_test.go
	both modified:   x/feeabs/keeper/msgserver.go
	both modified:   x/feeabs/keeper/proposal_test.go
	both modified:   x/feeabs/spec/07_ibc.md
	both modified:   x/feeabs/types/epoch.go
	both modified:   x/feeabs/types/epoch.pb.go
	both modified:   x/feeabs/types/errors.go
	both modified:   x/feeabs/types/keys.go
	both modified:   x/feeabs/types/proposal.pb.go

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

@mergify mergify bot deleted the mergify/bp/release/v7.0.x/pr-156 branch March 8, 2024 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant