diff --git a/cmd/qgb/relayer/cmd.go b/cmd/qgb/relayer/cmd.go index bc4eee7b..59ecd263 100644 --- a/cmd/qgb/relayer/cmd.go +++ b/cmd/qgb/relayer/cmd.go @@ -5,7 +5,7 @@ import ( "os" "time" - qgbwrapper "github.com/celestiaorg/quantum-gravity-bridge/wrappers/QuantumGravityBridge.sol" + qgbwrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.sol" evm2 "github.com/celestiaorg/orchestrator-relayer/cmd/qgb/keys/evm" "github.com/celestiaorg/orchestrator-relayer/p2p" diff --git a/e2e/qgb_network.go b/e2e/qgb_network.go index 72369f59..7a53abc8 100644 --- a/e2e/qgb_network.go +++ b/e2e/qgb_network.go @@ -10,7 +10,7 @@ import ( "strings" "time" - qgbwrapper "github.com/celestiaorg/quantum-gravity-bridge/wrappers/QuantumGravityBridge.sol" + qgbwrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.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 23da4890..beb835e1 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/wrappers/ERC1967Proxy.sol" - qgbwrapper "github.com/celestiaorg/quantum-gravity-bridge/wrappers/QuantumGravityBridge.sol" + proxywrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/ERC1967Proxy.sol" + qgbwrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.sol" "github.com/ethereum/go-ethereum/accounts/abi/bind" ) diff --git a/evm/evm_client_test.go b/evm/evm_client_test.go index 8e4c5ff6..cbf30592 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/wrappers/QuantumGravityBridge.sol" + wrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.sol" ethcmn "github.com/ethereum/go-ethereum/common" ) diff --git a/go.mod b/go.mod index a39286af..585945f6 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,8 @@ module github.com/celestiaorg/orchestrator-relayer go 1.21.1 require ( - github.com/celestiaorg/celestia-app v1.0.0-rc15 + github.com/celestiaorg/celestia-app v1.0.0-rc17 github.com/celestiaorg/nmt v0.19.0 // indirect - github.com/celestiaorg/quantum-gravity-bridge v2.1.0+incompatible github.com/ethereum/go-ethereum v1.13.1 github.com/gogo/protobuf v1.3.3 // indirect github.com/golang/protobuf v1.5.3 // indirect @@ -25,6 +24,7 @@ require ( ) require ( + github.com/celestiaorg/quantum-gravity-bridge/v2 v2.1.1 github.com/cosmos/cosmos-sdk v0.46.14 github.com/dgraph-io/badger/v2 v2.2007.4 github.com/ipfs/boxo v0.13.0 @@ -387,11 +387,11 @@ require ( ) replace ( - github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v1.17.0-sdk-v0.46.14 + github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v1.18.0-sdk-v0.46.14 github.com/docker/docker => github.com/docker/docker v23.0.5+incompatible github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.26.2-tm-v0.34.28 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.27.0-tm-v0.34.28 ) // testcontainers required replaces: diff --git a/go.sum b/go.sum index 9346efc7..5559a997 100644 --- a/go.sum +++ b/go.sum @@ -253,18 +253,18 @@ 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/celestia-app v1.0.0-rc15 h1:IKlXEP5TJJUGgFDgCo9sm2Yxfr05Arw7HoIJhF3y+jI= -github.com/celestiaorg/celestia-app v1.0.0-rc15/go.mod h1:3oM4s4cIdh8Nx/A92h9IwOcfrt5NdEt8OFWRuXzqXeo= -github.com/celestiaorg/celestia-core v1.26.2-tm-v0.34.28 h1:2efXQaggLFknz0wQufr4nUEz5G7pSVHS1j7NuJDsvII= -github.com/celestiaorg/celestia-core v1.26.2-tm-v0.34.28/go.mod h1:++dNzzzjP9jYg+NopN9G8sg1HEZ58lv1TPtg71evZ0E= -github.com/celestiaorg/cosmos-sdk v1.17.0-sdk-v0.46.14 h1:PckXGxLJjXv97VO3xS8NPHN5oO83X5nvJLbc/4s8jUM= -github.com/celestiaorg/cosmos-sdk v1.17.0-sdk-v0.46.14/go.mod h1:70Go8qNy7YAb1PUcHCChRHNX2ke7c9jgUIEklUX+Mac= +github.com/celestiaorg/celestia-app v1.0.0-rc17 h1:ak9OIViNJCfDFklopPgxnjRqUx5oKPcctpGpmwmqJy4= +github.com/celestiaorg/celestia-app v1.0.0-rc17/go.mod h1:gDKOpD8xCWHw/PUdcTc0WFYf52Mq0etOFZ1oTkBlFkQ= +github.com/celestiaorg/celestia-core v1.27.0-tm-v0.34.28 h1:BE7JFZ1SYpwM9OfL9cPcjlO5xjIbDPgdFkJNouyl6jA= +github.com/celestiaorg/celestia-core v1.27.0-tm-v0.34.28/go.mod h1:1GT0RfdNqOXvyR3Hq4ROcNBknQNz9E6K5l3Cla9eFFk= +github.com/celestiaorg/cosmos-sdk v1.18.0-sdk-v0.46.14 h1:dDfoQJOlVNj4HufJ1lBLTo2k3/L/255MIiKmEQziDmw= +github.com/celestiaorg/cosmos-sdk v1.18.0-sdk-v0.46.14/go.mod h1:kkdiHo/zG6ar80730+bG1owdMAQXrGp4utFu7mbfADo= github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 h1:CJdIpo8n5MFP2MwK0gSRcOVlDlFdQJO1p+FqdxYzmvc= github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4/go.mod h1:fzuHnhzj1pUygGz+1ZkB3uQbEUL4htqCGJ4Qs2LwMZA= github.com/celestiaorg/nmt v0.19.0 h1:9VXFeI/gt+q8h5HeCE0RjXJhOxsFzxJUjHrkvF9CMYE= github.com/celestiaorg/nmt v0.19.0/go.mod h1:Oz15Ub6YPez9uJV0heoU4WpFctxazuIhKyUtaYNio7E= -github.com/celestiaorg/quantum-gravity-bridge v2.1.0+incompatible h1:KtkdUPsujcFa53b5GXZOGftL76kkk84Mn8Wmq5VTw+Q= -github.com/celestiaorg/quantum-gravity-bridge v2.1.0+incompatible/go.mod h1:6WOajINTDEUXpSj5UZzod16UZ96ZVB/rFNKyM+Mt1gI= +github.com/celestiaorg/quantum-gravity-bridge/v2 v2.1.1 h1:xOBMoRYSh/hnsEW7OLI3bjSJXKlqILfZehjPEK/+3oI= +github.com/celestiaorg/quantum-gravity-bridge/v2 v2.1.1/go.mod h1:NziNBP12grIi+DH3TqIKUUPM2T6Hl9BTyxiK3+p8yeA= 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= diff --git a/relayer/relayer.go b/relayer/relayer.go index 098e36b6..2bb04d31 100644 --- a/relayer/relayer.go +++ b/relayer/relayer.go @@ -23,7 +23,7 @@ import ( "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/wrappers/QuantumGravityBridge.sol" + 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" )