From dbe90274876dfe7fe092d1ff64ea9a116c60f8e7 Mon Sep 17 00:00:00 2001 From: Luis Carvalho Date: Tue, 1 Oct 2024 18:30:59 +0100 Subject: [PATCH] fix: paloma v2 module import (#446) --- app/app.go | 10 +++++----- chain/evm/client.go | 6 +++--- chain/evm/compass.go | 4 ++-- chain/evm/compass_test.go | 4 ++-- chain/evm/mocks/PalomaClienter.go | 6 +++--- chain/evm/processor.go | 2 +- chain/mocks/Processor.go | 2 +- chain/paloma/client.go | 4 ++-- chain/paloma/client_test.go | 10 +++++----- chain/paloma/query.go | 8 ++++---- chain/paloma/query_test.go | 4 ++-- chain/paloma/skyway.go | 2 +- chain/paloma/statusupdater.go | 4 ++-- chain/paloma/statusupdater_test.go | 4 ++-- chain/paloma/wrappers.go | 2 +- chain/paloma/wrappers_test.go | 4 ++-- chain/relayer.go | 2 +- go.mod | 12 +++++------ go.sum | 32 +++++++++++++++--------------- internal/liblog/context.go | 2 +- internal/traits/traits.go | 2 +- relayer/build_processors.go | 2 +- relayer/build_processors_test.go | 2 +- relayer/health_check_test.go | 2 +- relayer/message_attester_test.go | 2 +- relayer/message_estimator_test.go | 2 +- relayer/message_relayer_test.go | 2 +- relayer/message_signer_test.go | 2 +- relayer/mocks/PalomaClienter.go | 6 +++--- relayer/relayer.go | 6 +++--- relayer/skyway_batch_signer.go | 2 +- relayer/start.go | 2 +- relayer/update_chain_infos_test.go | 2 +- 33 files changed, 79 insertions(+), 79 deletions(-) diff --git a/app/app.go b/app/app.go index c0f21cee..f8670395 100644 --- a/app/app.go +++ b/app/app.go @@ -9,11 +9,11 @@ import ( "github.com/VolumeFi/whoops" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/gogoproto/proto" - consensustypes "github.com/palomachain/paloma/x/consensus/types" - evmtypes "github.com/palomachain/paloma/x/evm/types" - palomatypes "github.com/palomachain/paloma/x/paloma/types" - skywaytypes "github.com/palomachain/paloma/x/skyway/types" - valsettypes "github.com/palomachain/paloma/x/valset/types" + consensustypes "github.com/palomachain/paloma/v2/x/consensus/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" + palomatypes "github.com/palomachain/paloma/v2/x/paloma/types" + skywaytypes "github.com/palomachain/paloma/v2/x/skyway/types" + valsettypes "github.com/palomachain/paloma/v2/x/valset/types" "github.com/palomachain/pigeon/chain/evm" "github.com/palomachain/pigeon/chain/paloma" "github.com/palomachain/pigeon/config" diff --git a/chain/evm/client.go b/chain/evm/client.go index 2479dcc0..8773ed71 100644 --- a/chain/evm/client.go +++ b/chain/evm/client.go @@ -28,9 +28,9 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/event" - "github.com/palomachain/paloma/x/evm/types" - skywaytypes "github.com/palomachain/paloma/x/skyway/types" - valset "github.com/palomachain/paloma/x/valset/types" + "github.com/palomachain/paloma/v2/x/evm/types" + skywaytypes "github.com/palomachain/paloma/v2/x/skyway/types" + valset "github.com/palomachain/paloma/v2/x/valset/types" compassABI "github.com/palomachain/pigeon/chain/evm/abi/compass" feemgrABI "github.com/palomachain/pigeon/chain/evm/abi/feemgr" "github.com/palomachain/pigeon/chain/paloma" diff --git a/chain/evm/compass.go b/chain/evm/compass.go index f2d1f610..2ea175f1 100644 --- a/chain/evm/compass.go +++ b/chain/evm/compass.go @@ -18,8 +18,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/rpc" - evmtypes "github.com/palomachain/paloma/x/evm/types" - skywaytypes "github.com/palomachain/paloma/x/skyway/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" + skywaytypes "github.com/palomachain/paloma/v2/x/skyway/types" "github.com/palomachain/pigeon/chain" cabi "github.com/palomachain/pigeon/chain/evm/abi/compass" "github.com/palomachain/pigeon/internal/ethfilter" diff --git a/chain/evm/compass_test.go b/chain/evm/compass_test.go index a1866713..93c9e25c 100644 --- a/chain/evm/compass_test.go +++ b/chain/evm/compass_test.go @@ -20,8 +20,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/rpc" - "github.com/palomachain/paloma/x/evm/types" - valsettypes "github.com/palomachain/paloma/x/valset/types" + "github.com/palomachain/paloma/v2/x/evm/types" + valsettypes "github.com/palomachain/paloma/v2/x/valset/types" "github.com/palomachain/pigeon/chain" evmmocks "github.com/palomachain/pigeon/chain/evm/mocks" "github.com/palomachain/pigeon/chain/paloma" diff --git a/chain/evm/mocks/PalomaClienter.go b/chain/evm/mocks/PalomaClienter.go index 6ad7ea85..7ccfa9e4 100644 --- a/chain/evm/mocks/PalomaClienter.go +++ b/chain/evm/mocks/PalomaClienter.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - evmtypes "github.com/palomachain/paloma/x/evm/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" mock "github.com/stretchr/testify/mock" @@ -13,9 +13,9 @@ import ( proto "github.com/cosmos/gogoproto/proto" - types "github.com/palomachain/paloma/x/skyway/types" + types "github.com/palomachain/paloma/v2/x/skyway/types" - valsettypes "github.com/palomachain/paloma/x/valset/types" + valsettypes "github.com/palomachain/paloma/v2/x/valset/types" ) // PalomaClienter is an autogenerated mock type for the PalomaClienter type diff --git a/chain/evm/processor.go b/chain/evm/processor.go index cbe1cbb7..ce60b058 100644 --- a/chain/evm/processor.go +++ b/chain/evm/processor.go @@ -9,7 +9,7 @@ import ( "github.com/VolumeFi/whoops" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - skyway "github.com/palomachain/paloma/x/skyway/types" + skyway "github.com/palomachain/paloma/v2/x/skyway/types" "github.com/palomachain/pigeon/chain" pigeonerrors "github.com/palomachain/pigeon/errors" "github.com/palomachain/pigeon/internal/queue" diff --git a/chain/mocks/Processor.go b/chain/mocks/Processor.go index 86ff0855..04b4f31d 100644 --- a/chain/mocks/Processor.go +++ b/chain/mocks/Processor.go @@ -11,7 +11,7 @@ import ( queue "github.com/palomachain/pigeon/internal/queue" - types "github.com/palomachain/paloma/x/skyway/types" + types "github.com/palomachain/paloma/v2/x/skyway/types" ) // Processor is an autogenerated mock type for the Processor type diff --git a/chain/paloma/client.go b/chain/paloma/client.go index 1ffd7bc5..7b38c123 100644 --- a/chain/paloma/client.go +++ b/chain/paloma/client.go @@ -11,8 +11,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/gogoproto/grpc" "github.com/cosmos/gogoproto/proto" - consensus "github.com/palomachain/paloma/x/consensus/types" - valset "github.com/palomachain/paloma/x/valset/types" + consensus "github.com/palomachain/paloma/v2/x/consensus/types" + valset "github.com/palomachain/paloma/v2/x/valset/types" "github.com/palomachain/pigeon/chain" "github.com/palomachain/pigeon/config" "github.com/palomachain/pigeon/util/ion" diff --git a/chain/paloma/client_test.go b/chain/paloma/client_test.go index 58416ba3..7e4f8c53 100644 --- a/chain/paloma/client_test.go +++ b/chain/paloma/client_test.go @@ -8,11 +8,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/gogoproto/proto" - consensus "github.com/palomachain/paloma/x/consensus/types" - consensusmocks "github.com/palomachain/paloma/x/consensus/types/mocks" - valset "github.com/palomachain/paloma/x/valset/types" - valsettypes "github.com/palomachain/paloma/x/valset/types" - valsetmocks "github.com/palomachain/paloma/x/valset/types/mocks" + consensus "github.com/palomachain/paloma/v2/x/consensus/types" + consensusmocks "github.com/palomachain/paloma/v2/x/consensus/types/mocks" + valset "github.com/palomachain/paloma/v2/x/valset/types" + valsettypes "github.com/palomachain/paloma/v2/x/valset/types" + valsetmocks "github.com/palomachain/paloma/v2/x/valset/types/mocks" "github.com/palomachain/pigeon/chain" clientmocks "github.com/palomachain/pigeon/chain/paloma/mocks" "github.com/palomachain/pigeon/types/testdata" diff --git a/chain/paloma/query.go b/chain/paloma/query.go index e5c6068a..9760a53b 100644 --- a/chain/paloma/query.go +++ b/chain/paloma/query.go @@ -9,10 +9,10 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/gogoproto/grpc" - consensus "github.com/palomachain/paloma/x/consensus/types" - evm "github.com/palomachain/paloma/x/evm/types" - skyway "github.com/palomachain/paloma/x/skyway/types" - valset "github.com/palomachain/paloma/x/valset/types" + consensus "github.com/palomachain/paloma/v2/x/consensus/types" + evm "github.com/palomachain/paloma/v2/x/evm/types" + skyway "github.com/palomachain/paloma/v2/x/skyway/types" + valset "github.com/palomachain/paloma/v2/x/valset/types" "github.com/palomachain/pigeon/chain" "github.com/palomachain/pigeon/internal/liblog" "github.com/sirupsen/logrus" diff --git a/chain/paloma/query_test.go b/chain/paloma/query_test.go index 193983a8..58510a8c 100644 --- a/chain/paloma/query_test.go +++ b/chain/paloma/query_test.go @@ -5,8 +5,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - consensus "github.com/palomachain/paloma/x/consensus/types" - consensusmocks "github.com/palomachain/paloma/x/consensus/types/mocks" + consensus "github.com/palomachain/paloma/v2/x/consensus/types" + consensusmocks "github.com/palomachain/paloma/v2/x/consensus/types/mocks" "github.com/palomachain/pigeon/chain" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/chain/paloma/skyway.go b/chain/paloma/skyway.go index 8d293664..cec13b9a 100644 --- a/chain/paloma/skyway.go +++ b/chain/paloma/skyway.go @@ -4,7 +4,7 @@ import ( "context" "encoding/hex" - skyway "github.com/palomachain/paloma/x/skyway/types" + skyway "github.com/palomachain/paloma/v2/x/skyway/types" "github.com/palomachain/pigeon/chain" ) diff --git a/chain/paloma/statusupdater.go b/chain/paloma/statusupdater.go index 2ebd4dc8..c1ca4102 100644 --- a/chain/paloma/statusupdater.go +++ b/chain/paloma/statusupdater.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common/hexutil" - evmtypes "github.com/palomachain/paloma/x/evm/types" - palomatypes "github.com/palomachain/paloma/x/paloma/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" + palomatypes "github.com/palomachain/paloma/v2/x/paloma/types" "github.com/palomachain/pigeon/chain" ) diff --git a/chain/paloma/statusupdater_test.go b/chain/paloma/statusupdater_test.go index d28bd4e2..a7c37389 100644 --- a/chain/paloma/statusupdater_test.go +++ b/chain/paloma/statusupdater_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/ethereum/go-ethereum/common/hexutil" - evmtypes "github.com/palomachain/paloma/x/evm/types" - palomatypes "github.com/palomachain/paloma/x/paloma/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" + palomatypes "github.com/palomachain/paloma/v2/x/paloma/types" "github.com/palomachain/pigeon/chain" "github.com/palomachain/pigeon/chain/paloma/mocks" "github.com/stretchr/testify/mock" diff --git a/chain/paloma/wrappers.go b/chain/paloma/wrappers.go index 7a63a3f9..221b0a32 100644 --- a/chain/paloma/wrappers.go +++ b/chain/paloma/wrappers.go @@ -9,7 +9,7 @@ import ( "github.com/VolumeFi/whoops" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/gogoproto/grpc" - vtypes "github.com/palomachain/paloma/x/valset/types" + vtypes "github.com/palomachain/paloma/v2/x/valset/types" "github.com/palomachain/pigeon/internal/liblog" "github.com/palomachain/pigeon/util/ion" ggrpc "google.golang.org/grpc" diff --git a/chain/paloma/wrappers_test.go b/chain/paloma/wrappers_test.go index 69df01dd..b1888e4b 100644 --- a/chain/paloma/wrappers_test.go +++ b/chain/paloma/wrappers_test.go @@ -7,8 +7,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - palomatypes "github.com/palomachain/paloma/x/paloma/types" - valsettypes "github.com/palomachain/paloma/x/valset/types" + palomatypes "github.com/palomachain/paloma/v2/x/paloma/types" + valsettypes "github.com/palomachain/paloma/v2/x/valset/types" "github.com/palomachain/pigeon/chain/paloma" "github.com/palomachain/pigeon/util/ion" "github.com/stretchr/testify/require" diff --git a/chain/relayer.go b/chain/relayer.go index 8bcf7230..fc182bee 100644 --- a/chain/relayer.go +++ b/chain/relayer.go @@ -5,7 +5,7 @@ import ( "math/big" sdk "github.com/cosmos/cosmos-sdk/types" - skyway "github.com/palomachain/paloma/x/skyway/types" + skyway "github.com/palomachain/paloma/v2/x/skyway/types" "github.com/palomachain/pigeon/health" "github.com/palomachain/pigeon/internal/queue" ) diff --git a/go.mod b/go.mod index c63c7a27..2e3374dc 100644 --- a/go.mod +++ b/go.mod @@ -6,15 +6,15 @@ require ( cosmossdk.io/errors v1.0.1 cosmossdk.io/math v1.3.0 cosmossdk.io/store v1.1.1 - cosmossdk.io/x/feegrant v0.1.0 - cosmossdk.io/x/upgrade v0.1.1 + cosmossdk.io/x/feegrant v0.1.1 + cosmossdk.io/x/upgrade v0.1.4 github.com/VolumeFi/whoops v0.7.2 github.com/avast/retry-go/v4 v4.6.0 github.com/cometbft/cometbft v0.38.12 github.com/cosmos/cosmos-sdk v0.50.10 github.com/cosmos/gogoproto v1.7.0 - github.com/cosmos/ibc-go/modules/capability v1.0.0 - github.com/cosmos/ibc-go/v8 v8.2.0 + github.com/cosmos/ibc-go/modules/capability v1.0.1 + github.com/cosmos/ibc-go/v8 v8.4.0 github.com/ethereum/go-ethereum v1.13.15 github.com/go-resty/resty/v2 v2.13.1 github.com/gorilla/mux v1.8.1 @@ -22,7 +22,7 @@ require ( github.com/jarcoal/httpmock v1.3.1 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 - github.com/palomachain/paloma v1.3.1-next.0.20240912110829-e6db2923ff78 + github.com/palomachain/paloma/v2 v2.0.0-20241001160943-eea138b39129 github.com/roodeag/arbitrum v0.0.0-20230627104516-b95e4c8ebec0 github.com/rs/xid v1.5.0 github.com/sirupsen/logrus v1.9.3 @@ -184,7 +184,7 @@ require ( github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect - github.com/spf13/cast v1.6.0 // indirect + github.com/spf13/cast v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.19.0 // indirect github.com/stretchr/objx v0.5.2 // indirect diff --git a/go.sum b/go.sum index ba9149a8..ad15ced5 100644 --- a/go.sum +++ b/go.sum @@ -200,16 +200,16 @@ cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y= cosmossdk.io/store v1.1.1/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= -cosmossdk.io/x/circuit v0.1.0 h1:IAej8aRYeuOMritczqTlljbUVHq1E85CpBqaCTwYgXs= -cosmossdk.io/x/circuit v0.1.0/go.mod h1:YDzblVE8+E+urPYQq5kq5foRY/IzhXovSYXb4nwd39w= -cosmossdk.io/x/evidence v0.1.0 h1:J6OEyDl1rbykksdGynzPKG5R/zm6TacwW2fbLTW4nCk= -cosmossdk.io/x/evidence v0.1.0/go.mod h1:hTaiiXsoiJ3InMz1uptgF0BnGqROllAN8mwisOMMsfw= -cosmossdk.io/x/feegrant v0.1.0 h1:c7s3oAq/8/UO0EiN1H5BIjwVntujVTkYs35YPvvrdQk= -cosmossdk.io/x/feegrant v0.1.0/go.mod h1:4r+FsViJRpcZif/yhTn+E0E6OFfg4n0Lx+6cCtnZElU= +cosmossdk.io/x/circuit v0.1.1 h1:KPJCnLChWrxD4jLwUiuQaf5mFD/1m7Omyo7oooefBVQ= +cosmossdk.io/x/circuit v0.1.1/go.mod h1:B6f/urRuQH8gjt4eLIXfZJucrbreuYrKh5CSjaOxr+Q= +cosmossdk.io/x/evidence v0.1.1 h1:Ks+BLTa3uftFpElLTDp9L76t2b58htjVbSZ86aoK/E4= +cosmossdk.io/x/evidence v0.1.1/go.mod h1:OoDsWlbtuyqS70LY51aX8FBTvguQqvFrt78qL7UzeNc= +cosmossdk.io/x/feegrant v0.1.1 h1:EKFWOeo/pup0yF0svDisWWKAA9Zags6Zd0P3nRvVvw8= +cosmossdk.io/x/feegrant v0.1.1/go.mod h1:2GjVVxX6G2fta8LWj7pC/ytHjryA6MHAJroBWHFNiEQ= cosmossdk.io/x/tx v0.13.5 h1:FdnU+MdmFWn1pTsbfU0OCf2u6mJ8cqc1H4OMG418MLw= cosmossdk.io/x/tx v0.13.5/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= -cosmossdk.io/x/upgrade v0.1.1 h1:aoPe2gNvH+Gwt/Pgq3dOxxQVU3j5P6Xf+DaUJTDZATc= -cosmossdk.io/x/upgrade v0.1.1/go.mod h1:MNLptLPcIFK9CWt7Ra//8WUZAxweyRDNcbs5nkOcQy0= +cosmossdk.io/x/upgrade v0.1.4 h1:/BWJim24QHoXde8Bc64/2BSEB6W4eTydq0X/2f8+g38= +cosmossdk.io/x/upgrade v0.1.4/go.mod h1:9v0Aj+fs97O+Ztw+tG3/tp5JSlrmT7IcFhAebQHmOPo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= @@ -374,10 +374,10 @@ github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fr github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0= github.com/cosmos/iavl v1.2.0 h1:kVxTmjTh4k0Dh1VNL046v6BXqKziqMDzxo93oh3kOfM= github.com/cosmos/iavl v1.2.0/go.mod h1:HidWWLVAtODJqFD6Hbne2Y0q3SdxByJepHUOeoH4LiI= -github.com/cosmos/ibc-go/modules/capability v1.0.0 h1:r/l++byFtn7jHYa09zlAdSeevo8ci1mVZNO9+V0xsLE= -github.com/cosmos/ibc-go/modules/capability v1.0.0/go.mod h1:D81ZxzjZAe0ZO5ambnvn1qedsFQ8lOwtqicG6liLBco= -github.com/cosmos/ibc-go/v8 v8.2.0 h1:7oCzyy1sZCcgpeQLnHxC56brsSz3KWwQGKXalXwXFzE= -github.com/cosmos/ibc-go/v8 v8.2.0/go.mod h1:wj3qx75iC/XNnsMqbPDCIGs0G6Y3E/lo3bdqCyoCy+8= +github.com/cosmos/ibc-go/modules/capability v1.0.1 h1:ibwhrpJ3SftEEZRxCRkH0fQZ9svjthrX2+oXdZvzgGI= +github.com/cosmos/ibc-go/modules/capability v1.0.1/go.mod h1:rquyOV262nGJplkumH+/LeYs04P3eV8oB7ZM4Ygqk4E= +github.com/cosmos/ibc-go/v8 v8.4.0 h1:K2PfX0AZ+1XKZytHGEMuSjQXG/MZshPb83RSTQt2+cE= +github.com/cosmos/ibc-go/v8 v8.4.0/go.mod h1:zh6x1osR0hNvEcFrC/lhGD08sMfQmr9wHVvZ/mRWMCs= github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU= github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0= github.com/cosmos/ledger-cosmos-go v0.13.3 h1:7ehuBGuyIytsXbd4MP43mLeoN2LTOEnk5nvue4rK+yM= @@ -953,8 +953,8 @@ github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnh github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/palomachain/arb-geth v0.0.0-20230824112942-8e77a580a936 h1:fmQAgxcdYBxCZYczws/uxTVOYHZd4fNrOaoHp35HZMM= github.com/palomachain/arb-geth v0.0.0-20230824112942-8e77a580a936/go.mod h1:B2H2+2I4UiMR4hvAIaGLyYszNfSTYC8fWIw+kgfuFSQ= -github.com/palomachain/paloma v1.3.1-next.0.20240912110829-e6db2923ff78 h1:1795bjnQjinb2pHTM3/8ANnUQK9UdvrRCkkv8MsmTBU= -github.com/palomachain/paloma v1.3.1-next.0.20240912110829-e6db2923ff78/go.mod h1:/Gyvm8s1/4A7+/SLUBJ05tDW4DGYPbIHGGqKVK6Rv+k= +github.com/palomachain/paloma/v2 v2.0.0-20241001160943-eea138b39129 h1:rn1u1p6Ro09uMz1UYJnrjgndSy5Y9rVUunSwCY2OQZs= +github.com/palomachain/paloma/v2 v2.0.0-20241001160943-eea138b39129/go.mod h1:EOa+cqEMAxZXYyvN5BOy0ysDP+3nMDgDUPvIXKzUc4g= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -1066,8 +1066,8 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= -github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w= +github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= diff --git a/internal/liblog/context.go b/internal/liblog/context.go index 19ebe049..4dbc691d 100644 --- a/internal/liblog/context.go +++ b/internal/liblog/context.go @@ -3,7 +3,7 @@ package liblog import ( "context" - "github.com/palomachain/paloma/util/libvalid" + "github.com/palomachain/paloma/v2/util/libvalid" "github.com/rs/xid" ) diff --git a/internal/traits/traits.go b/internal/traits/traits.go index a44a304a..e46447b2 100644 --- a/internal/traits/traits.go +++ b/internal/traits/traits.go @@ -1,7 +1,7 @@ package traits import ( - valsettypes "github.com/palomachain/paloma/x/valset/types" + valsettypes "github.com/palomachain/paloma/v2/x/valset/types" ) type Traits []string diff --git a/relayer/build_processors.go b/relayer/build_processors.go index a6a56d10..01c43dcf 100644 --- a/relayer/build_processors.go +++ b/relayer/build_processors.go @@ -8,7 +8,7 @@ import ( "github.com/VolumeFi/whoops" "github.com/ethereum/go-ethereum/common" - evmtypes "github.com/palomachain/paloma/x/evm/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" "github.com/palomachain/pigeon/chain" "github.com/palomachain/pigeon/errors" "github.com/palomachain/pigeon/internal/liblog" diff --git a/relayer/build_processors_test.go b/relayer/build_processors_test.go index c99d9be1..15d08b25 100644 --- a/relayer/build_processors_test.go +++ b/relayer/build_processors_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/palomachain/paloma/x/evm/types" + "github.com/palomachain/paloma/v2/x/evm/types" "github.com/palomachain/pigeon/chain" chainmocks "github.com/palomachain/pigeon/chain/mocks" "github.com/palomachain/pigeon/config" diff --git a/relayer/health_check_test.go b/relayer/health_check_test.go index 4f4f1bf4..30590f69 100644 --- a/relayer/health_check_test.go +++ b/relayer/health_check_test.go @@ -8,7 +8,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - evmtypes "github.com/palomachain/paloma/x/evm/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" chainmocks "github.com/palomachain/pigeon/chain/mocks" "github.com/palomachain/pigeon/config" "github.com/palomachain/pigeon/relayer/mocks" diff --git a/relayer/message_attester_test.go b/relayer/message_attester_test.go index 3dc28e75..661bd025 100644 --- a/relayer/message_attester_test.go +++ b/relayer/message_attester_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - evmtypes "github.com/palomachain/paloma/x/evm/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" "github.com/palomachain/pigeon/chain" "github.com/palomachain/pigeon/chain/evm" evmmocks "github.com/palomachain/pigeon/chain/evm/mocks" diff --git a/relayer/message_estimator_test.go b/relayer/message_estimator_test.go index 24028209..179e7db8 100644 --- a/relayer/message_estimator_test.go +++ b/relayer/message_estimator_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - evmtypes "github.com/palomachain/paloma/x/evm/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" "github.com/palomachain/pigeon/chain" "github.com/palomachain/pigeon/chain/evm" evmmocks "github.com/palomachain/pigeon/chain/evm/mocks" diff --git a/relayer/message_relayer_test.go b/relayer/message_relayer_test.go index 96c33fe3..7a5082c9 100644 --- a/relayer/message_relayer_test.go +++ b/relayer/message_relayer_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - evmtypes "github.com/palomachain/paloma/x/evm/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" "github.com/palomachain/pigeon/chain" "github.com/palomachain/pigeon/chain/evm" evmmocks "github.com/palomachain/pigeon/chain/evm/mocks" diff --git a/relayer/message_signer_test.go b/relayer/message_signer_test.go index 9d51b6c6..7e94b1e9 100644 --- a/relayer/message_signer_test.go +++ b/relayer/message_signer_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - evmtypes "github.com/palomachain/paloma/x/evm/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" "github.com/palomachain/pigeon/chain" "github.com/palomachain/pigeon/chain/evm" evmmocks "github.com/palomachain/pigeon/chain/evm/mocks" diff --git a/relayer/mocks/PalomaClienter.go b/relayer/mocks/PalomaClienter.go index b788241d..08c9c404 100644 --- a/relayer/mocks/PalomaClienter.go +++ b/relayer/mocks/PalomaClienter.go @@ -9,7 +9,7 @@ import ( cosmos_sdktypes "github.com/cosmos/cosmos-sdk/types" - evmtypes "github.com/palomachain/paloma/x/evm/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" mock "github.com/stretchr/testify/mock" @@ -17,11 +17,11 @@ import ( proto "github.com/cosmos/gogoproto/proto" - skywaytypes "github.com/palomachain/paloma/x/skyway/types" + skywaytypes "github.com/palomachain/paloma/v2/x/skyway/types" types "github.com/cosmos/cosmos-sdk/x/staking/types" - valsettypes "github.com/palomachain/paloma/x/valset/types" + valsettypes "github.com/palomachain/paloma/v2/x/valset/types" ) // PalomaClienter is an autogenerated mock type for the PalomaClienter type diff --git a/relayer/relayer.go b/relayer/relayer.go index 8fc21576..ad7df9f2 100644 --- a/relayer/relayer.go +++ b/relayer/relayer.go @@ -10,9 +10,9 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" proto "github.com/cosmos/gogoproto/proto" "github.com/ethereum/go-ethereum/common" - evmtypes "github.com/palomachain/paloma/x/evm/types" - skyway "github.com/palomachain/paloma/x/skyway/types" - valset "github.com/palomachain/paloma/x/valset/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" + skyway "github.com/palomachain/paloma/v2/x/skyway/types" + valset "github.com/palomachain/paloma/v2/x/valset/types" "github.com/palomachain/pigeon/chain" "github.com/palomachain/pigeon/chain/paloma" "github.com/palomachain/pigeon/config" diff --git a/relayer/skyway_batch_signer.go b/relayer/skyway_batch_signer.go index e298ed00..e708c053 100644 --- a/relayer/skyway_batch_signer.go +++ b/relayer/skyway_batch_signer.go @@ -4,7 +4,7 @@ import ( "context" "sync" - skyway "github.com/palomachain/paloma/x/skyway/types" + skyway "github.com/palomachain/paloma/v2/x/skyway/types" "github.com/palomachain/pigeon/chain" "github.com/palomachain/pigeon/util/slice" log "github.com/sirupsen/logrus" diff --git a/relayer/start.go b/relayer/start.go index 4dd09f83..78f4a4d9 100644 --- a/relayer/start.go +++ b/relayer/start.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/palomachain/paloma/util/libvalid" + "github.com/palomachain/paloma/v2/util/libvalid" "github.com/palomachain/pigeon/internal/liblog" "github.com/palomachain/pigeon/relayer/heartbeat" log "github.com/sirupsen/logrus" diff --git a/relayer/update_chain_infos_test.go b/relayer/update_chain_infos_test.go index b0cc1cd1..8b221ba7 100644 --- a/relayer/update_chain_infos_test.go +++ b/relayer/update_chain_infos_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - evmtypes "github.com/palomachain/paloma/x/evm/types" + evmtypes "github.com/palomachain/paloma/v2/x/evm/types" "github.com/palomachain/pigeon/chain" "github.com/palomachain/pigeon/chain/evm" evmmocks "github.com/palomachain/pigeon/chain/evm/mocks"