From f63888b79a497d7dd8cfc91f8aca5748d690ffd5 Mon Sep 17 00:00:00 2001 From: rachid Date: Thu, 19 Oct 2023 14:44:38 +0100 Subject: [PATCH] chore(deps): depend on blobstream contracts --- cmd/blobstream/relayer/cmd.go | 2 +- e2e/go.mod | 3 ++- e2e/go.sum | 2 ++ e2e/qgb_network.go | 2 +- evm/evm_client.go | 4 ++-- evm/evm_client_test.go | 2 +- go.mod | 3 ++- go.sum | 2 ++ relayer/relayer.go | 2 +- 9 files changed, 14 insertions(+), 8 deletions(-) diff --git a/cmd/blobstream/relayer/cmd.go b/cmd/blobstream/relayer/cmd.go index 4b5e0c83..ee0278ad 100644 --- a/cmd/blobstream/relayer/cmd.go +++ b/cmd/blobstream/relayer/cmd.go @@ -5,7 +5,7 @@ import ( "os" "time" - blobstreamwrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.sol" + blobstreamwrapper "github.com/celestiaorg/blobstream-contracts/v3/wrappers/Blobstream.sol" evm2 "github.com/celestiaorg/orchestrator-relayer/cmd/blobstream/keys/evm" "github.com/celestiaorg/orchestrator-relayer/p2p" diff --git a/e2e/go.mod b/e2e/go.mod index 9f340de6..33ae6b10 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -26,8 +26,8 @@ require ( ) require ( + github.com/celestiaorg/blobstream-contracts/v3 v3.0.0 github.com/celestiaorg/orchestrator-relayer v0.0.0-00010101000000-000000000000 - github.com/celestiaorg/quantum-gravity-bridge/v2 v2.1.2 github.com/cosmos/cosmos-sdk v0.46.14 github.com/libp2p/go-libp2p v0.31.0 github.com/tendermint/tendermint v0.34.28 @@ -75,6 +75,7 @@ require ( github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/buger/goterm v1.0.4 // indirect github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 // indirect + github.com/celestiaorg/quantum-gravity-bridge/v2 v2.1.2 // indirect github.com/celestiaorg/rsmt2d v0.11.0 // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash v1.1.0 // indirect diff --git a/e2e/go.sum b/e2e/go.sum index 9fdd6ce4..2b11f0df 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -397,6 +397,8 @@ github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywR 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-app v1.1.0 h1:8TM/8xnZ+xf7NfEjYZ9XBEGuVG1QT8hPD3uh05RYEsE= github.com/celestiaorg/celestia-app v1.1.0/go.mod h1:1uAaesXbMkV6EwfBfULXBKYhjHP8DGSVpA3BfKM4QUw= github.com/celestiaorg/celestia-core v1.29.0-tm-v0.34.29 h1:Fd7ymPUzExPGNl2gZw4i5S74arMw+iDHLE78M/cCxl4= diff --git a/e2e/qgb_network.go b/e2e/qgb_network.go index a68704df..73d62173 100644 --- a/e2e/qgb_network.go +++ b/e2e/qgb_network.go @@ -19,7 +19,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - blobstreamwrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.sol" + blobstreamwrapper "github.com/celestiaorg/blobstream-contracts/v3/wrappers/Blobstream.sol" "github.com/celestiaorg/celestia-app/app" "github.com/celestiaorg/celestia-app/app/encoding" diff --git a/evm/evm_client.go b/evm/evm_client.go index 1bf41262..68bd8654 100644 --- a/evm/evm_client.go +++ b/evm/evm_client.go @@ -14,8 +14,8 @@ import ( tmlog "github.com/tendermint/tendermint/libs/log" "github.com/celestiaorg/celestia-app/x/qgb/types" - proxywrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/ERC1967Proxy.sol" - blobstreamwrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.sol" + proxywrapper "github.com/celestiaorg/blobstream-contracts/v3/wrappers/ERC1967Proxy.sol" + blobstreamwrapper "github.com/celestiaorg/blobstream-contracts/v3/wrappers/Blobstream.sol" "github.com/ethereum/go-ethereum/accounts/abi/bind" ) diff --git a/evm/evm_client_test.go b/evm/evm_client_test.go index 854bb054..d5ada425 100644 --- a/evm/evm_client_test.go +++ b/evm/evm_client_test.go @@ -9,7 +9,7 @@ import ( celestiatypes "github.com/celestiaorg/celestia-app/x/qgb/types" "github.com/celestiaorg/orchestrator-relayer/evm" "github.com/celestiaorg/orchestrator-relayer/types" - 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" ) diff --git a/go.mod b/go.mod index 0861c602..7f4d4944 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( ) require ( - github.com/celestiaorg/quantum-gravity-bridge/v2 v2.1.2 + github.com/celestiaorg/blobstream-contracts/v3 v3.0.0 github.com/cosmos/cosmos-sdk v0.46.14 github.com/dgraph-io/badger/v2 v2.2007.4 github.com/ipfs/boxo v0.13.1 @@ -63,6 +63,7 @@ require ( github.com/bits-and-blooms/bitset v1.7.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 // indirect + github.com/celestiaorg/quantum-gravity-bridge/v2 v2.1.2 // indirect github.com/celestiaorg/rsmt2d v0.11.0 // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash v1.1.0 // indirect diff --git a/go.sum b/go.sum index 35373aa9..701243b1 100644 --- a/go.sum +++ b/go.sum @@ -340,6 +340,8 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7 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-app v1.1.0 h1:8TM/8xnZ+xf7NfEjYZ9XBEGuVG1QT8hPD3uh05RYEsE= github.com/celestiaorg/celestia-app v1.1.0/go.mod h1:1uAaesXbMkV6EwfBfULXBKYhjHP8DGSVpA3BfKM4QUw= github.com/celestiaorg/celestia-core v1.29.0-tm-v0.34.29 h1:Fd7ymPUzExPGNl2gZw4i5S74arMw+iDHLE78M/cCxl4= diff --git a/relayer/relayer.go b/relayer/relayer.go index 0bfb491d..ea53a2ee 100644 --- a/relayer/relayer.go +++ b/relayer/relayer.go @@ -18,12 +18,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" + wrapper "github.com/celestiaorg/blobstream-contracts/v3/wrappers/Blobstream.sol" celestiatypes "github.com/celestiaorg/celestia-app/x/qgb/types" "github.com/celestiaorg/orchestrator-relayer/evm" "github.com/celestiaorg/orchestrator-relayer/p2p" "github.com/celestiaorg/orchestrator-relayer/rpc" "github.com/celestiaorg/orchestrator-relayer/types" - wrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.sol" ethcmn "github.com/ethereum/go-ethereum/common" tmlog "github.com/tendermint/tendermint/libs/log" )