From 976bc7dfbf62ac398d738de353e791ba57c4d803 Mon Sep 17 00:00:00 2001 From: CHAMI Rachid Date: Tue, 19 Sep 2023 17:13:39 +0100 Subject: [PATCH] chore(deps): Bump QGB contracts version to v2 (#2544) Removes the `+incompatible` suffix from QGB dependency (cherry picked from commit cc8a3a834011d30fc87718124eab32f5d69ab5b5) # Conflicts: # go.mod # go.sum --- go.mod | 9 +++++++++ go.sum | 7 +++++++ x/qgb/client/verify.go | 2 +- x/qgb/types/abi_consts.go | 2 +- x/qgb/types/valset.go | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 11af01326f..c1f5893d31 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,12 @@ go 1.21 toolchain go1.21.0 require ( +<<<<<<< HEAD github.com/celestiaorg/nmt v0.19.0 github.com/celestiaorg/quantum-gravity-bridge v2.1.0+incompatible +======= + github.com/celestiaorg/nmt v0.20.0 +>>>>>>> cc8a3a8 (chore(deps): Bump QGB contracts version to v2 (#2544)) github.com/ethereum/go-ethereum v1.13.1 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.3 @@ -28,7 +32,12 @@ require ( require ( cosmossdk.io/errors v1.0.0-beta.7 +<<<<<<< HEAD cosmossdk.io/math v1.0.0-rc.0 +======= + cosmossdk.io/math v1.1.2 + github.com/celestiaorg/quantum-gravity-bridge/v2 v2.1.1 +>>>>>>> cc8a3a8 (chore(deps): Bump QGB contracts version to v2 (#2544)) github.com/celestiaorg/rsmt2d v0.11.0 github.com/cosmos/cosmos-proto v1.0.0-alpha8 github.com/cosmos/cosmos-sdk v0.46.14 diff --git a/go.sum b/go.sum index 900ecd6a95..870b334dac 100644 --- a/go.sum +++ b/go.sum @@ -182,10 +182,17 @@ github.com/celestiaorg/cosmos-sdk v1.18.0-sdk-v0.46.14 h1:dDfoQJOlVNj4HufJ1lBLTo 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= +<<<<<<< HEAD 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/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.1 h1:xOBMoRYSh/hnsEW7OLI3bjSJXKlqILfZehjPEK/+3oI= +github.com/celestiaorg/quantum-gravity-bridge/v2 v2.1.1/go.mod h1:NziNBP12grIi+DH3TqIKUUPM2T6Hl9BTyxiK3+p8yeA= +>>>>>>> cc8a3a8 (chore(deps): Bump QGB contracts version to v2 (#2544)) 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/x/qgb/client/verify.go b/x/qgb/client/verify.go index c49f00ea55..ea31793fcf 100644 --- a/x/qgb/client/verify.go +++ b/x/qgb/client/verify.go @@ -12,7 +12,7 @@ import ( "github.com/celestiaorg/celestia-app/pkg/square" "github.com/celestiaorg/celestia-app/x/qgb/types" - wrapper "github.com/celestiaorg/quantum-gravity-bridge/wrappers/QuantumGravityBridge.sol" + wrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.sol" "github.com/ethereum/go-ethereum/ethclient" "github.com/spf13/cobra" tmlog "github.com/tendermint/tendermint/libs/log" diff --git a/x/qgb/types/abi_consts.go b/x/qgb/types/abi_consts.go index 70d9ceb79b..d1e3171480 100644 --- a/x/qgb/types/abi_consts.go +++ b/x/qgb/types/abi_consts.go @@ -4,7 +4,7 @@ import ( "log" "strings" - wrapper "github.com/celestiaorg/quantum-gravity-bridge/wrappers/QuantumGravityBridge.sol" + wrapper "github.com/celestiaorg/quantum-gravity-bridge/v2/wrappers/QuantumGravityBridge.sol" "github.com/ethereum/go-ethereum/accounts/abi" ethcmn "github.com/ethereum/go-ethereum/common" ) diff --git a/x/qgb/types/valset.go b/x/qgb/types/valset.go index acc30d8ff5..4dfdf4b26e 100644 --- a/x/qgb/types/valset.go +++ b/x/qgb/types/valset.go @@ -6,7 +6,7 @@ import ( "time" "cosmossdk.io/errors" - 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" "github.com/ethereum/go-ethereum/crypto" )