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.

Sign up for GitHub

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

Jump to bottom

chore: improvements to v4-ics branch #883

Merged
merged 1 commit into from
Nov 30, 2023
Merged

chore: improvements to v4-ics branch #883

merged 1 commit into from
Nov 30, 2023

Conversation

johnletey
Copy link
Contributor

No description provided.

@johnletey johnletey requested a review from a team as a code owner November 23, 2023 13:33
@johnletey johnletey requested a review from misko9 November 23, 2023 13:33
@boojamya
Copy link
Contributor

Should we upstream to the v7 branch?

@Reecepbcups
Copy link
Member

Reecepbcups commented Nov 28, 2023 •
edited
Loading

@boojamya This can be upstreamed to your v7-ics branch, but only the hermes changes to v7 base

(I guess a backport to both, then undo CCV for the v7)

@boojamya
Copy link
Contributor

@Reecepbcups v7 includes ics. There is no separate branch.

There is a separate branch for v4 and v4-ics because the sdk hadn't started including ics in their main branch line yet.

So we should be able to get away upstreaming to v7.

@Reecepbcups
Copy link
Member

Sweet

@boojamya boojamya merged commit cfbca40 into strangelove-ventures:v4-ics Nov 30, 2023
6 checks passed
@boojamya
Copy link
Contributor

@Mergifyio backport v7

@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 30, 2023 •
edited
Loading

backport v7

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Nov 30, 2023
@johnletey @mergify
chore: improvements to v4-ics branch (#883)
4ded9d0 
(cherry picked from commit cfbca40)
@mergify mergify bot mentioned this pull request Nov 30, 2023
Merged
@boojamya
Copy link
Contributor

@Mergifyio backport main

@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 30, 2023 •
edited
Loading

backport main

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Nov 30, 2023
@johnletey @mergify
chore: improvements to v4-ics branch (#883)
bcea912 
(cherry picked from commit cfbca40)

# Conflicts:
#	relayer/hermes/hermes_config.go
#	relayer/hermes/hermes_relayer.go
@mergify mergify bot mentioned this pull request Nov 30, 2023
Merged
boojamya pushed a commit that referenced this pull request Nov 30, 2023
@mergify @johnletey
chore: improvements to v4-ics branch (#883) (#889)
dab539e 
(cherry picked from commit cfbca40)

Co-authored-by: John Letey <[email protected]>
boojamya added a commit that referenced this pull request Nov 30, 2023
@mergify @johnletey @boojamya
chore: improvements to v4-ics branch (backport #883) (#891)
1284cfe 
* chore: improvements to `v4-ics` branch (#883)

(cherry picked from commit cfbca40)

# Conflicts:
#	relayer/hermes/hermes_config.go
#	relayer/hermes/hermes_relayer.go

* conflicts

* remove consumer function

* Hermes: UID:GID

---------

Co-authored-by: John Letey <[email protected]>
Co-authored-by: Dan Kanefsky <[email protected]>
@crodriguezvega crodriguezvega mentioned this pull request Dec 12, 2023
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Reecepbcups Reecepbcups Reecepbcups approved these changes

@misko9 misko9 Awaiting requested review from misko9 misko9 is a code owner automatically assigned from strangelove-ventures/interchaintest-maintainers

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@johnletey @boojamya @Reecepbcups