Skip to content

Commit

Permalink
Merge pull request #30 from 0xPolygon/mardizzone/POS-2730
Browse files Browse the repository at this point in the history
Dependencies fixes
  • Loading branch information
marcello33 authored Nov 28, 2024
2 parents 89dc71d + a794ff9 commit fdd7cc3
Show file tree
Hide file tree
Showing 36 changed files with 748 additions and 923 deletions.
26 changes: 14 additions & 12 deletions client/v2/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ require (
cosmossdk.io/api v0.7.5
cosmossdk.io/core v0.11.1
cosmossdk.io/depinject v1.0.0
cosmossdk.io/math v1.3.0
cosmossdk.io/x/tx v0.13.5
cosmossdk.io/math v1.4.0
cosmossdk.io/x/tx v0.13.6
github.com/cockroachdb/errors v1.11.3
github.com/cosmos/cosmos-proto v1.0.0-beta.5
github.com/cosmos/cosmos-sdk v0.50.6
github.com/cosmos/cosmos-sdk v0.50.10
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.35.1
google.golang.org/protobuf v1.35.2
gotest.tools/v3 v3.5.1
sigs.k8s.io/yaml v1.4.0
)
Expand All @@ -25,7 +25,7 @@ require (
cosmossdk.io/log v1.4.1 // indirect
cosmossdk.io/store v1.1.1 // indirect
filippo.io/edwards25519 v1.0.0 // indirect
github.com/0xPolygon/heimdall-v2 v0.0.0-20241122133045-7afed273eb4d // indirect
github.com/0xPolygon/heimdall-v2 v0.0.0-20241127081910-7dda9dcd7b83 // indirect
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/99designs/keyring v1.2.1 // indirect
github.com/BurntSushi/toml v1.4.0 // indirect
Expand All @@ -45,7 +45,7 @@ require (
github.com/cockroachdb/pebble v1.1.2 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cometbft/cometbft v0.38.12 // indirect
github.com/cometbft/cometbft v0.38.15 // indirect
github.com/cometbft/cometbft-db v0.14.1 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.12.1 // indirect
Expand Down Expand Up @@ -183,13 +183,15 @@ require (
// HV2 related packages
replace (
cosmossdk.io/api => github.com/0xPolygon/cosmos-sdk/api v0.7.5
cosmossdk.io/core => github.com/0xPolygon/cosmos-sdk/core v0.11.1
cosmossdk.io/collections => github.com/0xPolygon/cosmos-sdk/collections v0.4.0
cosmossdk.io/core => github.com/0xPolygon/cosmos-sdk/core v0.11.3-0.20241126102051-89dc71d02611
cosmossdk.io/depinject => github.com/0xPolygon/cosmos-sdk/depinject v1.0.0
cosmossdk.io/x/tx => github.com/0xPolygon/cosmos-sdk/x/tx v0.13.5
github.com/cometbft/cometbft => github.com/0xPolygon/cometbft v0.1.1-beta-polygon.0.20241122134501-62005f3af9eb

// TODO HV2: replace with a release version once development is completed
cosmossdk.io/errors => github.com/0xPolygon/cosmos-sdk/errors v1.0.0-beta.7.0.20241126102051-89dc71d02611
cosmossdk.io/log => github.com/0xPolygon/cosmos-sdk/log v1.4.1
cosmossdk.io/math => github.com/0xPolygon/cosmos-sdk/math v1.4.0
cosmossdk.io/store => github.com/0xPolygon/cosmos-sdk/store v1.1.2-0.20241126102051-89dc71d02611
cosmossdk.io/x/tx => github.com/0xPolygon/cosmos-sdk/x/tx v0.13.6-0.20241126102051-89dc71d02611
github.com/cometbft/cometbft => github.com/0xPolygon/cometbft v0.1.2-beta-polygon
github.com/cosmos/cosmos-sdk => ./../../

github.com/ethereum/go-ethereum => github.com/maticnetwork/bor v1.5.2
)
40 changes: 20 additions & 20 deletions client/v2/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,8 @@ cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc=
cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI=
cloud.google.com/go/storage v1.38.0 h1:Az68ZRGlnNTpIBbLjSMIV2BDcwwXYlRlQzis0llkpJg=
cloud.google.com/go/storage v1.38.0/go.mod h1:tlUADB0mAb9BgYls9lq+8MGkfzOXuLrnHXlpHmvFJoY=
cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s=
cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0=
cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U=
cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM=
cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
cosmossdk.io/simapp v0.0.0-20230620040119-e078f1a49e8b h1:gVne6jyHzNoolppqg4kGeA05Shepq6Zfh0Ju30leb94=
cosmossdk.io/simapp v0.0.0-20230620040119-e078f1a49e8b/go.mod h1:zOlUzwIlm0KrgRWeyVQeZBULtn/uBjwtYMa9ZySzntk=
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.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=
Expand All @@ -34,18 +24,28 @@ cosmossdk.io/x/upgrade v0.1.4/go.mod h1:9v0Aj+fs97O+Ztw+tG3/tp5JSlrmT7IcFhAebQHm
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=
github.com/0xPolygon/cometbft v0.1.1-beta-polygon.0.20241122134501-62005f3af9eb h1:z1C8SHjSChVqudUG/tIKm7/TTc7RXuNGipvBM1T+GUo=
github.com/0xPolygon/cometbft v0.1.1-beta-polygon.0.20241122134501-62005f3af9eb/go.mod h1:lixtaAtgMJY6x8w4X2/rtQiLC0bdtzHgPbyHg8ggBJs=
github.com/0xPolygon/cometbft v0.1.2-beta-polygon h1:RCqznvAI7UA7jrsaTuGhxpAudFN1k5vpFDViHxCZ8rQ=
github.com/0xPolygon/cometbft v0.1.2-beta-polygon/go.mod h1:lixtaAtgMJY6x8w4X2/rtQiLC0bdtzHgPbyHg8ggBJs=
github.com/0xPolygon/cosmos-sdk/api v0.7.5 h1:47ceB5Pt9iryYj0W7KEUVYoNNaK6c6E/y5bjaIlQxcw=
github.com/0xPolygon/cosmos-sdk/api v0.7.5/go.mod h1:IcxpYS5fMemZGqyYtErK7OqvdM0C8kdW3dq8Q/XIG38=
github.com/0xPolygon/cosmos-sdk/core v0.11.1 h1:k+zhimNjE6vX1vOgmX66ePmNmYvWdRHSSe/sAu8j4yk=
github.com/0xPolygon/cosmos-sdk/core v0.11.1/go.mod h1:OJzxcdC+RPrgGF8NJZR2uoQr56tc7gfBKhiKeDO7hH0=
github.com/0xPolygon/cosmos-sdk/collections v0.4.0 h1:4IbbwBQLf9eO1/5OgR/AjJafvpZuwLyheyluAAEoq2A=
github.com/0xPolygon/cosmos-sdk/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0=
github.com/0xPolygon/cosmos-sdk/core v0.11.3-0.20241126102051-89dc71d02611 h1:nwnJiMlk8fOpau94man8IUfsWvbv/7uSW5djVsyrzO4=
github.com/0xPolygon/cosmos-sdk/core v0.11.3-0.20241126102051-89dc71d02611/go.mod h1:cFOu6zfBuzarxT9cAsgj7lwpKmKF/p6tFSvBuNPAiFs=
github.com/0xPolygon/cosmos-sdk/depinject v1.0.0 h1:+yH0uuGJ2SBn2oFy6MswWNI//PMO2ojB3bYLaY8QbPo=
github.com/0xPolygon/cosmos-sdk/depinject v1.0.0/go.mod h1:zxK/h3HgHoA/eJVtiSsoaRaRA2D5U4cJ5thIG4ssbB8=
github.com/0xPolygon/cosmos-sdk/x/tx v0.13.5 h1:rBfUOwTKHaAz7ZbxiJqbPlKtMNhMwCZoSHwBypPSKUY=
github.com/0xPolygon/cosmos-sdk/x/tx v0.13.5/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
github.com/0xPolygon/heimdall-v2 v0.0.0-20241122133045-7afed273eb4d h1:JtFWH5L4rpnPAoLfTTMc2tfeBOgZYX++TYvIb1N6mVg=
github.com/0xPolygon/heimdall-v2 v0.0.0-20241122133045-7afed273eb4d/go.mod h1:2WI8ZAL7xleTjuL5xg4J/shudu8yQEfNx0eqBFyNSR8=
github.com/0xPolygon/cosmos-sdk/errors v1.0.0-beta.7.0.20241126102051-89dc71d02611 h1:sCfUifNdHOWVnjWl47EtgtYx1M174xZzkp9BtlnwNfg=
github.com/0xPolygon/cosmos-sdk/errors v1.0.0-beta.7.0.20241126102051-89dc71d02611/go.mod h1:VnIAMKbUTq5YhHockdy2MSB3lXeEwvDYzQpHXeFTsN8=
github.com/0xPolygon/cosmos-sdk/log v1.4.1 h1:sJcqdAqfVCEhsToiZFStWG8ENgyBVvMlFrWXw9Vmx6I=
github.com/0xPolygon/cosmos-sdk/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
github.com/0xPolygon/cosmos-sdk/math v1.4.0 h1:2cXVfURXPAzOvuWbhJseo28QLCnZYnUz9X/LfxBmfGM=
github.com/0xPolygon/cosmos-sdk/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk=
github.com/0xPolygon/cosmos-sdk/store v1.1.2-0.20241126102051-89dc71d02611 h1:aU2c4vQffstBG94t524ep53PsLtnHDA4w2bH+A3A/E4=
github.com/0xPolygon/cosmos-sdk/store v1.1.2-0.20241126102051-89dc71d02611/go.mod h1:pADXCBZJK5hHx5qhx5jsZQWNRPB3a7mEEZBCRfn9dEw=
github.com/0xPolygon/cosmos-sdk/x/tx v0.13.6-0.20241126102051-89dc71d02611 h1:Z1yl7tjFgtjsKgLq5RtrrV3PsIVw4SyPljhsuhHIyFs=
github.com/0xPolygon/cosmos-sdk/x/tx v0.13.6-0.20241126102051-89dc71d02611/go.mod h1:ZCQM9tU2LeW5kIuaq0q02KRHhMWAvNtj4cmVRyLfZmQ=
github.com/0xPolygon/heimdall-v2 v0.0.0-20241127081910-7dda9dcd7b83 h1:IkSt1Vb9D1We6/suvWFnLqnL7mA5ZbmOzKYY0KPn2Ws=
github.com/0xPolygon/heimdall-v2 v0.0.0-20241127081910-7dda9dcd7b83/go.mod h1:2WI8ZAL7xleTjuL5xg4J/shudu8yQEfNx0eqBFyNSR8=
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=
github.com/99designs/keyring v1.2.1 h1:tYLp1ULvO7i3fI5vE21ReQuj99QFSs7lGm0xWyJo87o=
Expand Down Expand Up @@ -1108,8 +1108,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
25 changes: 13 additions & 12 deletions collections/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ require (
)

require (
cosmossdk.io/api v0.7.5 // indirect
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
cosmossdk.io/depinject v1.0.0 // indirect
github.com/DataDog/zstd v1.5.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand All @@ -20,14 +19,14 @@ require (
github.com/cockroachdb/pebble v1.1.0 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
github.com/cosmos/gogoproto v1.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/getsentry/sentry-go v0.27.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/klauspost/compress v1.17.7 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
Expand All @@ -42,19 +41,21 @@ require (
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
github.com/tendermint/go-amino v0.16.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.33.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect
google.golang.org/grpc v1.64.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

// HV2 related packages
replace (
cosmossdk.io/api => github.com/0xPolygon/cosmos-sdk/api v0.7.5
cosmossdk.io/core => github.com/0xPolygon/cosmos-sdk/core v0.11.0
cosmossdk.io/depinject => github.com/0xPolygon/cosmos-sdk/depinject v1.0.0-alpha.4
cosmossdk.io/core => github.com/0xPolygon/cosmos-sdk/core v0.11.3-0.20241126102051-89dc71d02611
cosmossdk.io/depinject => github.com/0xPolygon/cosmos-sdk/depinject v1.0.0
)
Loading

0 comments on commit fdd7cc3

Please sign in to comment.