Skip to content

Commit

Permalink
chore(deps): replace old qgb contracts repo with blobstream repo (#2709)
Browse files Browse the repository at this point in the history
<!--
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
  • Loading branch information
rach-id authored and mergify[bot] committed Oct 19, 2023
1 parent c79fb45 commit 417a825
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 4 deletions.
4 changes: 4 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@ require (
require (
cosmossdk.io/errors v1.0.0-beta.7
cosmossdk.io/math v1.1.2
<<<<<<< HEAD
github.com/BurntSushi/toml v1.2.1
github.com/celestiaorg/quantum-gravity-bridge/v2 v2.1.2
=======
github.com/celestiaorg/blobstream-contracts/v3 v3.0.0
>>>>>>> c517bd2 (chore(deps): replace old qgb contracts repo with blobstream repo (#2709))
github.com/celestiaorg/rsmt2d v0.11.0
github.com/cosmos/cosmos-proto v1.0.0-alpha8
github.com/cosmos/cosmos-sdk v0.46.14
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ github.com/bufbuild/protocompile v0.1.0/go.mod h1:ix/MMMdsT3fzxfw91dvbfzKW3fRRnu
github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
github.com/celestiaorg/blobstream-contracts/v3 v3.0.0 h1:Qp5+O4g+eUlIG8ZcR8BQcsVclfDEO5UcmVdSVUmAL8U=
github.com/celestiaorg/blobstream-contracts/v3 v3.0.0/go.mod h1:lXPA8/Wvabb3Cr6uaPvuz4cL4OitKFpmYKXH+UEPEDo=
github.com/celestiaorg/celestia-core v1.29.0-tm-v0.34.29 h1:Fd7ymPUzExPGNl2gZw4i5S74arMw+iDHLE78M/cCxl4=
github.com/celestiaorg/celestia-core v1.29.0-tm-v0.34.29/go.mod h1:xrICN0PBhp3AdTaZ8q4wS5Jvi32V02HNjaC2EsWiEKk=
github.com/celestiaorg/cosmos-sdk v1.18.2-sdk-v0.46.14 h1:nIYxJuRt4HtbtSCzSIm7Zy8Y0bqzwHMw9CuobpBq85k=
Expand All @@ -325,8 +327,6 @@ github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 h1:CJdIpo8n
github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4/go.mod h1:fzuHnhzj1pUygGz+1ZkB3uQbEUL4htqCGJ4Qs2LwMZA=
github.com/celestiaorg/nmt v0.20.0 h1:9i7ultZ8Wv5ytt8ZRaxKQ5KOOMo4A2K2T/aPGjIlSas=
github.com/celestiaorg/nmt v0.20.0/go.mod h1:Oz15Ub6YPez9uJV0heoU4WpFctxazuIhKyUtaYNio7E=
github.com/celestiaorg/quantum-gravity-bridge/v2 v2.1.2 h1:Q8nr5SAtDW5gocrBwqwDJcSS/JedqU58WwQA2SP+nXw=
github.com/celestiaorg/quantum-gravity-bridge/v2 v2.1.2/go.mod h1:s/LzLUw0WeYPJ6qdk4q46jKLOq7rc9Z5Mdrxtfpcigw=
github.com/celestiaorg/rsmt2d v0.11.0 h1:lcto/637WyTEZR3dLRoNvyuExfnUbxvdvKi3qz/2V4k=
github.com/celestiaorg/rsmt2d v0.11.0/go.mod h1:6Y580I3gVr0+OVFfW6m2JTwnCCmvW3WfbwSLfuT+HCA=
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
Expand Down
5 changes: 5 additions & 0 deletions x/qgb/client/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/tendermint/tendermint/crypto/merkle"

wrapper "github.com/celestiaorg/blobstream-contracts/v3/wrappers/Blobstream.sol"
"github.com/celestiaorg/celestia-app/pkg/square"
<<<<<<< HEAD:x/qgb/client/verify.go
"github.com/celestiaorg/celestia-app/x/qgb/types"
wrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.sol"
=======
"github.com/celestiaorg/celestia-app/x/blobstream/types"
>>>>>>> c517bd2 (chore(deps): replace old qgb contracts repo with blobstream repo (#2709)):x/blobstream/client/verify.go
"github.com/ethereum/go-ethereum/ethclient"
"github.com/spf13/cobra"
tmlog "github.com/tendermint/tendermint/libs/log"
Expand Down
2 changes: 1 addition & 1 deletion x/qgb/types/abi_consts.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"log"
"strings"

wrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.sol"
wrapper "github.com/celestiaorg/blobstream-contracts/v3/wrappers/Blobstream.sol"
"github.com/ethereum/go-ethereum/accounts/abi"
ethcmn "github.com/ethereum/go-ethereum/common"
)
Expand Down
2 changes: 1 addition & 1 deletion x/qgb/types/valset.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"cosmossdk.io/errors"
wrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.sol"
wrapper "github.com/celestiaorg/blobstream-contracts/v3/wrappers/Blobstream.sol"
ethcmn "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
)
Expand Down

0 comments on commit 417a825

Please sign in to comment.