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

chore(deps): replace old qgb contracts repo with blobstream repo (backport #2709) #2720

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 19, 2023

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

On branch mergify/bp/v1.x/pr-2709
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit c517bd2.
  (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:   go.sum
	modified:   x/qgb/types/abi_consts.go
	modified:   x/qgb/types/valset.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   x/qgb/client/verify.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

<!--
Please read and fill out this form before submitting your PR.

Please make sure you have reviewed our contributors guide before
submitting your
first PR.
-->

## Overview

The dependencies part of
#2639

## Checklist

<!--
Please complete the checklist to ensure that the PR is ready to be
reviewed.

IMPORTANT:
PRs should be left in Draft until the below checklist is completed.
-->

- [ ] New and updated code has appropriate documentation
- [ ] New and updated code has new and/or updated testing
- [ ] Required CI checks are passing
- [ ] Visual proof for any user facing features like CLI or
documentation updates
- [ ] Linked issues closed with keywords

(cherry picked from commit c517bd2)

# Conflicts:
#	go.mod
#	x/qgb/client/verify.go
@mergify mergify bot added the conflicts label Oct 19, 2023
@celestia-bot celestia-bot requested a review from a team October 19, 2023 12:49
@github-actions github-actions bot added the bot item was created by a bot label Oct 19, 2023
@rach-id rach-id self-assigned this Oct 19, 2023
@evan-forbes
Copy link
Member

evan-forbes commented Oct 19, 2023

I'm not sure that we sure backport this yet 🤔

the reason being that ideally we never backport any breaking changes, therefore we wouldn't backport the name changes to the vars. If we don't back port those then I'm not sure that we should update the constracts either.

@rach-id
Copy link
Member

rach-id commented Oct 19, 2023

@evan-forbes This is changing only the dependency to depend on blobstream contracts, nothing more. no variable change is done. Also, this isn't breaking as nothing is being persisted or sent over the wire... should we explicitly test that this is not breaking? via running a node

@evan-forbes
Copy link
Member

This is changing only the dependency to depend on blobstream contracts, nothing more. no variable change is done.

yeah that makes sense, but why update the contracts if we're not going to update the names on v1.x is what I'm saying

@rach-id
Copy link
Member

rach-id commented Oct 19, 2023

actually no big reason, just not to have different versions in the app release and in the orchestrators-realyer, and end up with an indirect dependency. Aside from that, doesn't really matter.

I'm fine if we don't need to merge this

@codecov-commenter
Copy link

Codecov Report

Merging #2720 (5aa0801) into v1.x (c79fb45) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v1.x    #2720   +/-   ##
=======================================
  Coverage   20.41%   20.41%           
=======================================
  Files         139      139           
  Lines       15927    15927           
=======================================
  Hits         3252     3252           
  Misses      12367    12367           
  Partials      308      308           
Files Coverage Δ
x/qgb/client/verify.go 0.00% <ø> (ø)
x/qgb/types/abi_consts.go 69.23% <ø> (ø)
x/qgb/types/valset.go 0.00% <ø> (ø)

@rootulp
Copy link
Collaborator

rootulp commented Nov 6, 2023

I'm fine if we don't need to merge this

Please re-open if we want / need this

@rootulp rootulp closed this Nov 6, 2023
@rootulp rootulp deleted the mergify/bp/v1.x/pr-2709 branch November 6, 2023 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants