From 43378d8e9a712ea4c328dd1eb83d301267bc68de Mon Sep 17 00:00:00 2001 From: Marius Poke Date: Mon, 11 Nov 2024 12:51:58 +0100 Subject: [PATCH 01/15] build(deps)!: bump SDK to 0.50.10-lsm, IBC to 8.5.2, and Comet to 0.38.15 (#3370) * bump SDK to 0.50.10-lsm * add changelog entries * bump IBC to v8.5.2 * bump comet to v0.38.15 --- .../dependencies/3370-bump-cometbft.md | 3 + .../dependencies/3370-bump-cosmos-sdk.md | 3 + .../unreleased/dependencies/3370-bump-ibc.md | 3 + .../state-breaking/3370-bump-cometbft.md | 3 + .../state-breaking/3370-bump-cosmos-sdk.md | 3 + .../state-breaking/3370-bump-ibc.md | 3 + go.mod | 56 ++++----- go.sum | 114 +++++++++--------- 8 files changed, 104 insertions(+), 84 deletions(-) create mode 100644 .changelog/unreleased/dependencies/3370-bump-cometbft.md create mode 100644 .changelog/unreleased/dependencies/3370-bump-cosmos-sdk.md create mode 100644 .changelog/unreleased/dependencies/3370-bump-ibc.md create mode 100644 .changelog/unreleased/state-breaking/3370-bump-cometbft.md create mode 100644 .changelog/unreleased/state-breaking/3370-bump-cosmos-sdk.md create mode 100644 .changelog/unreleased/state-breaking/3370-bump-ibc.md diff --git a/.changelog/unreleased/dependencies/3370-bump-cometbft.md b/.changelog/unreleased/dependencies/3370-bump-cometbft.md new file mode 100644 index 00000000000..3ac03d8820b --- /dev/null +++ b/.changelog/unreleased/dependencies/3370-bump-cometbft.md @@ -0,0 +1,3 @@ +- Bump [cometbft](https://github.com/cometbft/cometbft) to + [v0.38.15](https://github.com/cometbft/cometbft/releases/tag/v0.38.15) + ([\#3370](https://github.com/cosmos/gaia/pull/3370)) \ No newline at end of file diff --git a/.changelog/unreleased/dependencies/3370-bump-cosmos-sdk.md b/.changelog/unreleased/dependencies/3370-bump-cosmos-sdk.md new file mode 100644 index 00000000000..264f50066ce --- /dev/null +++ b/.changelog/unreleased/dependencies/3370-bump-cosmos-sdk.md @@ -0,0 +1,3 @@ +- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to + [v0.50.10-lsm](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.10-lsm) + ([\#3370](https://github.com/cosmos/gaia/pull/3370)) \ No newline at end of file diff --git a/.changelog/unreleased/dependencies/3370-bump-ibc.md b/.changelog/unreleased/dependencies/3370-bump-ibc.md new file mode 100644 index 00000000000..bc666dcea79 --- /dev/null +++ b/.changelog/unreleased/dependencies/3370-bump-ibc.md @@ -0,0 +1,3 @@ +- Bump [ibc-go](https://github.com/cosmos/ibc-go) to + [v8.5.2](https://github.com/cosmos/ibc-go/releases/tag/v8.5.2) + ([\#3370](https://github.com/cosmos/gaia/pull/3370)) \ No newline at end of file diff --git a/.changelog/unreleased/state-breaking/3370-bump-cometbft.md b/.changelog/unreleased/state-breaking/3370-bump-cometbft.md new file mode 100644 index 00000000000..3ac03d8820b --- /dev/null +++ b/.changelog/unreleased/state-breaking/3370-bump-cometbft.md @@ -0,0 +1,3 @@ +- Bump [cometbft](https://github.com/cometbft/cometbft) to + [v0.38.15](https://github.com/cometbft/cometbft/releases/tag/v0.38.15) + ([\#3370](https://github.com/cosmos/gaia/pull/3370)) \ No newline at end of file diff --git a/.changelog/unreleased/state-breaking/3370-bump-cosmos-sdk.md b/.changelog/unreleased/state-breaking/3370-bump-cosmos-sdk.md new file mode 100644 index 00000000000..264f50066ce --- /dev/null +++ b/.changelog/unreleased/state-breaking/3370-bump-cosmos-sdk.md @@ -0,0 +1,3 @@ +- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to + [v0.50.10-lsm](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.10-lsm) + ([\#3370](https://github.com/cosmos/gaia/pull/3370)) \ No newline at end of file diff --git a/.changelog/unreleased/state-breaking/3370-bump-ibc.md b/.changelog/unreleased/state-breaking/3370-bump-ibc.md new file mode 100644 index 00000000000..bc666dcea79 --- /dev/null +++ b/.changelog/unreleased/state-breaking/3370-bump-ibc.md @@ -0,0 +1,3 @@ +- Bump [ibc-go](https://github.com/cosmos/ibc-go) to + [v8.5.2](https://github.com/cosmos/ibc-go/releases/tag/v8.5.2) + ([\#3370](https://github.com/cosmos/gaia/pull/3370)) \ No newline at end of file diff --git a/go.mod b/go.mod index 0436069a8d5..a0b99e8c0a9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/cosmos/gaia/v21 -go 1.22.6 +go 1.22.7 + +toolchain go1.22.9 require ( cosmossdk.io/api v0.7.5 @@ -10,7 +12,7 @@ require ( cosmossdk.io/log v1.4.1 cosmossdk.io/math v1.3.0 cosmossdk.io/simapp v0.0.0-20240118210941-3897926e722e - cosmossdk.io/store v1.1.0 + cosmossdk.io/store v1.1.1 cosmossdk.io/tools/confix v0.1.2 cosmossdk.io/tools/rosetta v0.2.1-0.20230613133644-0a778132a60f cosmossdk.io/x/evidence v0.1.1 @@ -18,21 +20,21 @@ require ( cosmossdk.io/x/tx v0.13.5 cosmossdk.io/x/upgrade v0.1.4 github.com/CosmWasm/wasmd v0.53.0 - github.com/cometbft/cometbft v0.38.11 - github.com/cometbft/cometbft-db v0.12.0 + github.com/cometbft/cometbft v0.38.15 + github.com/cometbft/cometbft-db v0.14.1 github.com/cosmos/cosmos-db v1.0.2 - github.com/cosmos/cosmos-sdk v0.50.9 + github.com/cosmos/cosmos-sdk v0.50.10 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogoproto v1.7.0 github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2 github.com/cosmos/ibc-apps/modules/rate-limiting/v8 v8.0.0 github.com/cosmos/ibc-go/modules/capability v1.0.1 - github.com/cosmos/ibc-go/v8 v8.5.1 + github.com/cosmos/ibc-go/v8 v8.5.2 github.com/cosmos/interchain-security/v6 v6.3.0 github.com/google/gofuzz v1.2.0 github.com/gorilla/mux v1.8.1 github.com/ory/dockertest/v3 v3.11.0 - github.com/prometheus/client_golang v1.20.4 + github.com/prometheus/client_golang v1.20.5 github.com/rakyll/statik v0.1.7 github.com/skip-mev/feemarket v1.1.1 github.com/spf13/cast v1.7.0 @@ -75,14 +77,14 @@ require ( github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect github.com/bits-and-blooms/bitset v1.8.0 // indirect - github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect - github.com/cockroachdb/errors v1.11.1 // indirect + github.com/cockroachdb/errors v1.11.3 // indirect + github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v1.1.0 // indirect + github.com/cockroachdb/pebble v1.1.1 // indirect github.com/cockroachdb/redact v1.1.5 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect @@ -98,7 +100,7 @@ require ( github.com/creachadair/tomledit v0.0.26 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect github.com/dgraph-io/badger/v4 v4.2.0 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect @@ -114,7 +116,7 @@ require ( github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/getsentry/sentry-go v0.27.0 // indirect - github.com/go-kit/kit v0.12.0 // indirect + github.com/go-kit/kit v0.13.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-logr/logr v1.4.2 // indirect @@ -126,7 +128,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect - github.com/google/btree v1.1.2 // indirect + github.com/google/btree v1.1.3 // indirect github.com/google/flatbuffers v1.12.1 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/orderedcode v0.0.1 // indirect @@ -136,7 +138,7 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.5 // indirect github.com/gorilla/handlers v1.5.2 // indirect - github.com/gorilla/websocket v1.5.0 // indirect + github.com/gorilla/websocket v1.5.3 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect @@ -168,7 +170,7 @@ require ( github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/minio/highwayhash v1.0.2 // indirect + github.com/minio/highwayhash v1.0.3 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect @@ -183,19 +185,19 @@ require ( github.com/opencontainers/runc v1.1.14 // indirect github.com/oxyno-zeta/gomock-extra-matcher v1.2.0 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect - github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect + github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common v0.60.1 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect - github.com/rs/cors v1.8.3 // indirect + github.com/rs/cors v1.11.1 // indirect github.com/rs/zerolog v1.33.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect - github.com/sasha-s/go-deadlock v0.3.1 // indirect + github.com/sasha-s/go-deadlock v0.3.5 // indirect github.com/shamaton/msgpack/v2 v2.2.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sourcegraph/conc v0.3.0 // indirect @@ -219,19 +221,19 @@ require ( go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.26.0 // indirect + golang.org/x/crypto v0.28.0 // indirect golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect - golang.org/x/net v0.28.0 // indirect - golang.org/x/oauth2 v0.22.0 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/oauth2 v0.23.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/term v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/term v0.25.0 // indirect + golang.org/x/text v0.19.0 // indirect golang.org/x/time v0.5.0 // indirect google.golang.org/api v0.186.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect - google.golang.org/protobuf v1.34.2 // indirect + google.golang.org/protobuf v1.35.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -249,7 +251,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // Use special SDK v0.50.x release with support for both ICS and LSM - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.50.9-lsm + github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.50.10-lsm // TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 diff --git a/go.sum b/go.sum index a6450c56144..de8c7fd9ef3 100644 --- a/go.sum +++ b/go.sum @@ -206,8 +206,8 @@ 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-20240118210941-3897926e722e h1:prrEM8wTWf6Rv0XchutuUtWfWlQHG4G3OylkTYgPlNk= cosmossdk.io/simapp v0.0.0-20240118210941-3897926e722e/go.mod h1:MoWto/xnPVt23TgkMEp5Rssw9Z7sV7VUQb8j5/y+fXY= -cosmossdk.io/store v1.1.0 h1:LnKwgYMc9BInn9PhpTFEQVbL9UK475G2H911CGGnWHk= -cosmossdk.io/store v1.1.0/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng= +cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y= +cosmossdk.io/store v1.1.1/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= cosmossdk.io/tools/confix v0.1.2 h1:2hoM1oFCNisd0ltSAAZw2i4ponARPmlhuNu3yy0VwI4= cosmossdk.io/tools/confix v0.1.2/go.mod h1:7XfcbK9sC/KNgVGxgLM0BrFbVcR/+6Dg7MFfpx7duYo= cosmossdk.io/tools/rosetta v0.2.1-0.20230613133644-0a778132a60f h1:p/pez1Q7Xwh9AiHWMA0uHxsB+XpReABHr6xCyMWdDAg= @@ -264,8 +264,8 @@ github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNu github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= -github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= -github.com/adlio/schema v1.3.3/go.mod h1:1EsRssiv9/Ce2CMzq5DoL7RiMshhuigQxrR4DMV9fHg= +github.com/adlio/schema v1.3.6 h1:k1/zc2jNfeiZBA5aFTRy37jlBIuCkXCm0XmvpzCKI9I= +github.com/adlio/schema v1.3.6/go.mod h1:qkxwLgPBd1FgLRHYVCmQT/rrBr3JH38J9LjmVzWNudg= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= @@ -320,12 +320,11 @@ github.com/btcsuite/btcd v0.21.0-beta.0.20201114000516-e9c7a5ac6401/go.mod h1:Sv github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= -github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= -github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= -github.com/btcsuite/btcd/btcutil v1.1.3 h1:xfbtw8lwpp0G6NwSHb+UE67ryTFHJAiNuipusjXSohQ= -github.com/btcsuite/btcd/btcutil v1.1.3/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0= +github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ= +github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= +github.com/btcsuite/btcd/btcutil v1.1.6 h1:zFL2+c3Lb9gEgqKNzowKUPQNb8jV7v5Oaodi/AYFd6c= +github.com/btcsuite/btcd/btcutil v1.1.6/go.mod h1:9dFymx8HpuLqBnsPELrImQeTQfKBQqzqGbbV3jK55aE= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= -github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= @@ -384,12 +383,14 @@ github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOG github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= -github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= -github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= +github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I= +github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8= +github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4= +github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v1.1.0 h1:pcFh8CdCIt2kmEpK0OIatq67Ln9uGDYY3d5XnE0LJG4= -github.com/cockroachdb/pebble v1.1.0/go.mod h1:sEHm5NOXxyiAoKWhoFxT8xMgd/f3RA6qUqQ1BXKrh2E= +github.com/cockroachdb/pebble v1.1.1 h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw= +github.com/cockroachdb/pebble v1.1.1/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= @@ -398,10 +399,10 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI= github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M= -github.com/cometbft/cometbft v0.38.11 h1:6bNDUB8/xq4uYonYwIfGc9OqK1ZH4NkdaMmR1LZIJqk= -github.com/cometbft/cometbft v0.38.11/go.mod h1:jHPx9vQpWzPHEAiYI/7EDKaB1NXhK6o3SArrrY8ExKc= -github.com/cometbft/cometbft-db v0.12.0 h1:v77/z0VyfSU7k682IzZeZPFZrQAKiQwkqGN0QzAjMi0= -github.com/cometbft/cometbft-db v0.12.0/go.mod h1:aX2NbCrjNVd2ZajYxt1BsiFf/Z+TQ2MN0VxdicheYuw= +github.com/cometbft/cometbft v0.38.15 h1:5veFd8k1uXM27PBg9sMO3hAfRJ3vbh4OmmLf6cVrqXg= +github.com/cometbft/cometbft v0.38.15/go.mod h1:+wh6ap6xctVG+JOHwbl8pPKZ0GeqdPYqISu7F4b43cQ= +github.com/cometbft/cometbft-db v0.14.1 h1:SxoamPghqICBAIcGpleHbmoPqy+crij/++eZz3DlerQ= +github.com/cometbft/cometbft-db v0.14.1/go.mod h1:KHP1YghilyGV/xjD5DP3+2hyigWx0WTp9X+0Gnx0RxQ= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= @@ -420,8 +421,8 @@ github.com/cosmos/cosmos-db v1.0.2 h1:hwMjozuY1OlJs/uh6vddqnk9j7VamLv+0DBlbEXbAK github.com/cosmos/cosmos-db v1.0.2/go.mod h1:Z8IXcFJ9PqKK6BIsVOB3QXtkKoqUOp1vRvPT39kOXEA= github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA= github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= -github.com/cosmos/cosmos-sdk v0.50.9-lsm h1:nYQVX0YinJ3Zu3PHEee36OeZ8yAw42ctE52S2K3MleM= -github.com/cosmos/cosmos-sdk v0.50.9-lsm/go.mod h1:efdTFdUndXfLpSMkE1Kv/ra8pux9l1glcojMIhNreiA= +github.com/cosmos/cosmos-sdk v0.50.10-lsm h1:dG93GkIfZjOyYIDj3jrpFuMjkpiqVqH5CtxSoBqNtvY= +github.com/cosmos/cosmos-sdk v0.50.10-lsm/go.mod h1:EqTlx3pySYLVgM+msOsLPyT0vQ7Q3QMNv+SAc7j/pb4= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= @@ -439,8 +440,8 @@ github.com/cosmos/ibc-go/modules/apps/callbacks v0.2.1-0.20231113120333-342c00b0 github.com/cosmos/ibc-go/modules/apps/callbacks v0.2.1-0.20231113120333-342c00b0f8bd/go.mod h1:JWfpWVKJKiKtd53/KbRoKfxWl8FsT2GPcNezTOk0o5Q= 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.5.1 h1:3JleEMKBjRKa3FeTKt4fjg22za/qygLBo7mDkoYTNBs= -github.com/cosmos/ibc-go/v8 v8.5.1/go.mod h1:P5hkAvq0Qbg0h18uLxDVA9q1kOJ0l36htMsskiNwXbo= +github.com/cosmos/ibc-go/v8 v8.5.2 h1:27s9oeD2AxLQF3e9BQsYt9doONyZ7FwZi/qkBv6Sdks= +github.com/cosmos/ibc-go/v8 v8.5.2/go.mod h1:P5hkAvq0Qbg0h18uLxDVA9q1kOJ0l36htMsskiNwXbo= 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/interchain-security/v6 v6.3.0 h1:AIsfxLUDtUGVfaqJ1WPwnYIOT5AxoSO58469iw9vNH4= @@ -478,8 +479,8 @@ github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnNEcHYvcCuK6dPZSg= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= @@ -577,8 +578,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= -github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= -github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= +github.com/go-kit/kit v0.13.0 h1:OoneCcHKHQ03LfBpoQCUfCluwd2Vt3ohz+kvbJneZAU= +github.com/go-kit/kit v0.13.0/go.mod h1:phqEHMMUbyrCFCTgH48JueqrM3md2HcAZ8N3XE4FKDg= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= @@ -685,8 +686,8 @@ github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= -github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= +github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/flatbuffers v1.12.1 h1:MVlul7pQNoDzWRLTw5imwYsl+usrS1TXG2H4jg6ImGw= github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= @@ -776,8 +777,8 @@ github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWS github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= @@ -988,8 +989,8 @@ github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4f github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= -github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= -github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= +github.com/minio/highwayhash v1.0.3 h1:kbnuUMoHYyVl7szWjSxJnxw11k2U709jqFPPmIUyD6Q= +github.com/minio/highwayhash v1.0.3/go.mod h1:GGYsuwP/fPD6Y9hMiXuapVvlIUEhFhMTh0rxU3ik1LQ= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -1097,9 +1098,8 @@ github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= -github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 h1:jik8PHtAIsPlCRJjJzl4udgEf7hawInF9texMeO2jrU= -github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 h1:Dx7Ovyv/SFnMFw3fD4oEoeorXc6saIiQ23LrGLth0Gw= +github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= @@ -1122,8 +1122,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= -github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1140,8 +1140,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc= +github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -1167,8 +1167,8 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= -github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA= +github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= @@ -1181,8 +1181,8 @@ github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgY github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= -github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= +github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb2NsU= +github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= @@ -1378,8 +1378,8 @@ golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1488,8 +1488,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1515,8 +1515,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= -golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1542,7 +1542,6 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1641,14 +1640,15 @@ golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1659,8 +1659,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1983,8 +1983,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +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= 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= From 67a0201b53f39ce1c114c41b04a48309727ec88d Mon Sep 17 00:00:00 2001 From: violet <158512193+fastfadingviolets@users.noreply.github.com> Date: Thu, 14 Nov 2024 09:34:40 -0500 Subject: [PATCH 02/15] ci: Add interchaintests for config variables (#3414) --- tests/interchain/chainsuite/chain.go | 26 ++ tests/interchain/go.mod | 18 +- tests/interchain/go.sum | 32 +-- tests/interchain/validator/config_test.go | 268 ++++++++++++++++++ .../{ => validator}/feemarket_test.go | 30 +- 5 files changed, 325 insertions(+), 49 deletions(-) create mode 100644 tests/interchain/validator/config_test.go rename tests/interchain/{ => validator}/feemarket_test.go (88%) diff --git a/tests/interchain/chainsuite/chain.go b/tests/interchain/chainsuite/chain.go index cd1e6b5808f..b1ffcea8713 100644 --- a/tests/interchain/chainsuite/chain.go +++ b/tests/interchain/chainsuite/chain.go @@ -455,3 +455,29 @@ func (c *Chain) AddLinkedChain(ctx context.Context, testName interchaintest.Test return chainB, nil } + +func (c *Chain) ModifyConfig(ctx context.Context, testName interchaintest.TestName, configChanges map[string]testutil.Toml) error { + eg := errgroup.Group{} + for _, val := range c.Validators { + val := val + eg.Go(func() error { + for file, changes := range configChanges { + if err := testutil.ModifyTomlConfigFile( + ctx, GetLogger(ctx), + val.DockerClient, testName.Name(), val.VolumeName, + file, changes, + ); err != nil { + return err + } + } + if err := val.StopContainer(ctx); err != nil { + return err + } + return val.StartContainer(ctx) + }) + } + if err := eg.Wait(); err != nil { + return err + } + return nil +} diff --git a/tests/interchain/go.mod b/tests/interchain/go.mod index 6d0d0fdeb04..eac08fcfc0f 100644 --- a/tests/interchain/go.mod +++ b/tests/interchain/go.mod @@ -28,6 +28,8 @@ require ( github.com/docker/docker v27.1.2+incompatible github.com/google/go-github/v62 v62.0.0 github.com/kelseyhightower/envconfig v1.4.0 + github.com/prometheus/client_model v0.6.1 + github.com/prometheus/common v0.60.1 github.com/strangelove-ventures/interchaintest/v8 v8.6.2-0.20240821162827-3ea6fbce13ba github.com/stretchr/testify v1.9.0 github.com/tidwall/gjson v1.17.3 @@ -218,9 +220,7 @@ require ( github.com/pierrec/xxHash v0.1.5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_golang v1.20.1 // indirect - github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/client_golang v1.20.4 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect @@ -259,13 +259,13 @@ require ( go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect - golang.org/x/crypto v0.26.0 // indirect + golang.org/x/crypto v0.27.0 // indirect golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect - golang.org/x/net v0.28.0 // indirect - golang.org/x/oauth2 v0.22.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/term v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/oauth2 v0.23.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/term v0.24.0 // indirect + golang.org/x/text v0.18.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.24.0 // indirect google.golang.org/api v0.193.0 // indirect diff --git a/tests/interchain/go.sum b/tests/interchain/go.sum index b2d2be54de8..19e12a84e88 100644 --- a/tests/interchain/go.sum +++ b/tests/interchain/go.sum @@ -1021,8 +1021,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.20.1 h1:IMJXHOD6eARkQpxo8KkhgEVFlBNm+nkrFUyGlIu7Na8= -github.com/prometheus/client_golang v1.20.1/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= +github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1037,8 +1037,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc= +github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -1249,8 +1249,8 @@ golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1351,8 +1351,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1378,8 +1378,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= -golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1493,13 +1493,13 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1510,8 +1510,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/tests/interchain/validator/config_test.go b/tests/interchain/validator/config_test.go new file mode 100644 index 00000000000..9b4891f3de0 --- /dev/null +++ b/tests/interchain/validator/config_test.go @@ -0,0 +1,268 @@ +package validator_test + +import ( + "bytes" + "context" + "encoding/json" + "fmt" + "net" + "net/url" + "strings" + "testing" + "time" + + "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/gorilla/websocket" + dto "github.com/prometheus/client_model/go" + "github.com/prometheus/common/expfmt" + "github.com/strangelove-ventures/interchaintest/v8" + "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v8/testutil" + "github.com/stretchr/testify/suite" + "golang.org/x/sync/errgroup" +) + +type ConfigSuite struct { + *chainsuite.Suite +} + +func (s *ConfigSuite) TestNoIndexingTransactions() { + txIndex := make(testutil.Toml) + txIndex["indexer"] = "null" + configToml := make(testutil.Toml) + configToml["tx_index"] = txIndex + s.Require().NoError(s.Chain.ModifyConfig( + s.GetContext(), s.T(), + map[string]testutil.Toml{"config/config.toml": configToml}, + )) + + balanceBefore, err := s.Chain.GetBalance(s.GetContext(), + s.Chain.ValidatorWallets[0].Address, + s.Chain.Config().Denom) + s.Require().NoError(err) + amount := 1_000_000 + cmd := s.Chain.GetNode().TxCommand( + interchaintest.FaucetAccountKeyName, "bank", "send", + interchaintest.FaucetAccountKeyName, s.Chain.ValidatorWallets[0].Address, + fmt.Sprintf("%d%s", amount, s.Chain.Config().Denom), + ) + stdout, _, err := s.Chain.GetNode().Exec(s.GetContext(), cmd, nil) + s.Require().NoError(err) + tx := cosmos.CosmosTx{} + s.Require().NoError(json.Unmarshal(stdout, &tx)) + s.Require().NoError(testutil.WaitForBlocks(s.GetContext(), 2, s.Chain)) + + balanceAfter, err := s.Chain.GetBalance(s.GetContext(), + s.Chain.ValidatorWallets[0].Address, + s.Chain.Config().Denom) + s.Require().NoError(err) + s.Require().Equal(balanceBefore.AddRaw(int64(amount)), balanceAfter) + + _, err = s.Chain.GetTransaction(tx.TxHash) + s.Require().Error(err) + s.Require().Contains(err.Error(), "transaction indexing is disabled") +} + +func (s *ConfigSuite) TestPrometheus() { + err := s.enablePrometheus() + s.Require().NoError(err) + metrics, err := s.getPrometheusMetrics(0) + s.Require().NoError(err) + s.Require().Contains(metrics, "go_gc_duration_seconds") +} + +func (s *ConfigSuite) TestPruningEverything() { + appToml := make(testutil.Toml) + appToml["pruning"] = "everything" + statesync := make(testutil.Toml) + statesync["snapshot-interval"] = 0 + appToml["state-sync"] = statesync + s.Require().NoError(s.Chain.ModifyConfig( + s.GetContext(), s.T(), + map[string]testutil.Toml{"config/app.toml": appToml}, + )) + + s.smokeTestTx() +} + +func (s *ConfigSuite) TestPeerLimit() { + err := s.enablePrometheus() + s.Require().NoError(err) + + metrics, err := s.getPrometheusMetrics(0) + s.Require().NoError(err) + s.Require().Equal(float64(3), metrics["cometbft_p2p_peers"].GetMetric()[0].GetGauge().GetValue()) + + peers := s.Chain.Nodes().PeerString(s.GetContext()) + peerList := strings.Split(peers, ",") + for i, node := range s.Chain.Nodes() { + if i > 0 { + s.Require().NoError(node.SetPeers(s.GetContext(), peerList[0])) + } + } + s.Require().NoError(s.Chain.Validators[0].SetPeers(s.GetContext(), "")) + + p2p := make(testutil.Toml) + p2p["max_num_inbound_peers"] = 2 + // disable pex so that we can control the number of peers + // p2p["pex"] = false + configToml := make(testutil.Toml) + configToml["p2p"] = p2p + err = s.Chain.ModifyConfig( + s.GetContext(), s.T(), + map[string]testutil.Toml{"config/config.toml": configToml}, + ) + if err != nil { + // it's okay if one of the nodes has 0 peers and fails to start + s.Require().Contains(err.Error(), "still catching up") + } + + s.Require().NoError(testutil.WaitForBlocks(s.GetContext(), 4, s.Chain)) + + metrics, err = s.getPrometheusMetrics(0) + s.Require().NoError(err) + s.Require().Equal(float64(2), metrics["cometbft_p2p_peers"].GetMetric()[0].GetGauge().GetValue()) + + foundZero := false + for i := 1; i < len(s.Chain.Validators); i++ { + metrics, err = s.getPrometheusMetrics(i) + s.Require().NoError(err) + metric := metrics["cometbft_p2p_peers"].GetMetric() + if (len(metric) == 0 || metric[0].GetGauge().GetValue() == float64(0)) && !foundZero { + // only one node should have 0 peers + foundZero = true + continue + } + s.Require().GreaterOrEqual(len(metric), 1) + s.Require().GreaterOrEqual(metric[0].GetGauge().GetValue(), float64(1)) + } +} + +func (s *ConfigSuite) TestWSConnectionLimit() { + const connectionCount = 20 + u, err := url.Parse(s.Chain.GetHostRPCAddress()) + s.Require().NoError(err) + u.Scheme = "ws" + u.Path = "/websocket" + var canConnect = func() error { + var eg errgroup.Group + tCtx, tCancel := context.WithTimeout(s.GetContext(), 80*time.Second) + defer tCancel() + for i := 0; i < connectionCount; i++ { + var i = i + eg.Go(func() error { + c, _, err := websocket.DefaultDialer.Dial(u.String(), nil) + if err != nil { + return err + } + defer c.Close() + err = c.WriteMessage( + websocket.TextMessage, + []byte(fmt.Sprintf(`{"jsonrpc":"2.0","method":"subscribe","params":["tm.event='NewBlock'"],"id":%d}`, i)), + ) + if err != nil { + return err + } + for tCtx.Err() == nil { + _, _, err = c.ReadMessage() + if err != nil { + return err + } + } + return c.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, "")) + }) + } + return eg.Wait() + } + s.Require().NoError(canConnect()) + + rpc := make(testutil.Toml) + rpc["max_open_connections"] = 10 + configToml := make(testutil.Toml) + configToml["rpc"] = rpc + s.Require().NoError(s.Chain.ModifyConfig( + s.GetContext(), s.T(), + map[string]testutil.Toml{"config/config.toml": configToml}, + )) + + s.Require().Error(canConnect()) +} + +func (s *ConfigSuite) TestDisableAPI() { + _, _, err := s.Chain.Validators[0].Exec(s.GetContext(), []string{"wget", "-O", "-", s.Chain.GetAPIAddress() + "/cosmos/auth/v1beta1/accounts"}, nil) + s.Require().NoError(err) + + apiToml := make(testutil.Toml) + apiToml["enable"] = false + appToml := make(testutil.Toml) + appToml["api"] = apiToml + s.Require().NoError(s.Chain.ModifyConfig( + s.GetContext(), s.T(), + map[string]testutil.Toml{"config/app.toml": appToml}, + )) + + _, _, err = s.Chain.Validators[0].Exec(s.GetContext(), []string{"wget", "-O", "-", s.Chain.GetAPIAddress() + "/cosmos/auth/v1beta1/accounts"}, nil) + s.Require().Error(err) +} + +func TestConfig(t *testing.T) { + nodes := 4 + s := &ConfigSuite{ + Suite: chainsuite.NewSuite(chainsuite.SuiteConfig{ + UpgradeOnSetup: true, + // Chains are gonna be test-scoped so that configuration changes + // don't persist between tests. + Scope: chainsuite.ChainScopeTest, + ChainSpec: &interchaintest.ChainSpec{ + NumValidators: &nodes, + }, + }), + } + suite.Run(t, s) +} + +func (s *ConfigSuite) enablePrometheus() error { + instrumentation := make(testutil.Toml) + instrumentation["prometheus"] = true + configToml := make(testutil.Toml) + configToml["instrumentation"] = instrumentation + return s.Chain.ModifyConfig( + s.GetContext(), s.T(), + map[string]testutil.Toml{"config/config.toml": configToml}, + ) +} + +func (s *ConfigSuite) getPrometheusMetrics(nodeIdx int) (map[string]*dto.MetricFamily, error) { + prometheusHost := s.Chain.Validators[nodeIdx].HostName() + prometheusHost = net.JoinHostPort(prometheusHost, "26660") + stdout, _, err := s.Chain.Validators[nodeIdx].Exec(s.GetContext(), + []string{"wget", "-O", "-", "http://" + prometheusHost}, nil) + if err != nil { + return nil, err + } + + reader := bytes.NewBuffer(stdout) + + var parser expfmt.TextParser + mf, err := parser.TextToMetricFamilies(reader) + if err != nil { + return nil, err + } + + return mf, nil +} + +// smokeTestTx does a basic bank send to verify that the validator is still working. +func (s *ConfigSuite) smokeTestTx() { + txhash, err := s.Chain.GetNode().ExecTx( + s.GetContext(), interchaintest.FaucetAccountKeyName, + "bank", "send", interchaintest.FaucetAccountKeyName, + s.Chain.ValidatorWallets[0].Address, "100"+s.Chain.Config().Denom, + ) + s.Require().NoError(err) + + tx, err := s.Chain.GetTransaction(txhash) + s.Require().NoError(err) + s.Require().Equal(uint32(0), tx.Code) + s.Require().Greater(tx.Height, int64(1)) +} diff --git a/tests/interchain/feemarket_test.go b/tests/interchain/validator/feemarket_test.go similarity index 88% rename from tests/interchain/feemarket_test.go rename to tests/interchain/validator/feemarket_test.go index 06097cb1d6f..aa2d52b1218 100644 --- a/tests/interchain/feemarket_test.go +++ b/tests/interchain/validator/feemarket_test.go @@ -1,4 +1,4 @@ -package interchain_test +package validator_test import ( "encoding/json" @@ -186,29 +186,11 @@ done } func (s *FeemarketSuite) setCommitTimeout(timeout time.Duration) { - eg := errgroup.Group{} - for _, val := range s.Chain.Validators { - val := val - eg.Go(func() error { - configToml := make(testutil.Toml) - consensusToml := make(testutil.Toml) - consensusToml["timeout_commit"] = timeout.String() - configToml["consensus"] = consensusToml - if err := testutil.ModifyTomlConfigFile( - s.GetContext(), chainsuite.GetLogger(s.GetContext()), - val.DockerClient, s.T().Name(), val.VolumeName, - "config/config.toml", configToml, - ); err != nil { - return err - } - if err := val.StopContainer(s.GetContext()); err != nil { - return err - } - return val.StartContainer(s.GetContext()) - }) - } - s.Require().NoError(eg.Wait()) - s.Require().NoError(testutil.WaitForBlocks(s.GetContext(), 1, s.Chain)) + configToml := make(testutil.Toml) + consensusToml := make(testutil.Toml) + consensusToml["timeout_commit"] = timeout.String() + configToml["consensus"] = consensusToml + s.Chain.ModifyConfig(s.GetContext(), s.T(), map[string]testutil.Toml{"config/config.toml": configToml}) } func TestFeemarket(t *testing.T) { From 6159a47e1eed631e614b93595ca23f8783707dc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 09:42:50 +0000 Subject: [PATCH 03/15] chore(deps): Bump cosmossdk.io/math from 1.3.0 to 1.4.0 (#3418) Bumps [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk) from 1.3.0 to 1.4.0.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=cosmossdk.io/math&package-manager=go_modules&previous-version=1.3.0&new-version=1.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/cosmos/gaia/network/alerts).
--- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a0b99e8c0a9..c5c27720a66 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( cosmossdk.io/core v0.11.1 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.1 - cosmossdk.io/math v1.3.0 + cosmossdk.io/math v1.4.0 cosmossdk.io/simapp v0.0.0-20240118210941-3897926e722e cosmossdk.io/store v1.1.1 cosmossdk.io/tools/confix v0.1.2 diff --git a/go.sum b/go.sum index de8c7fd9ef3..fa52cfc2b33 100644 --- a/go.sum +++ b/go.sum @@ -202,8 +202,8 @@ 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/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= +cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= cosmossdk.io/simapp v0.0.0-20240118210941-3897926e722e h1:prrEM8wTWf6Rv0XchutuUtWfWlQHG4G3OylkTYgPlNk= cosmossdk.io/simapp v0.0.0-20240118210941-3897926e722e/go.mod h1:MoWto/xnPVt23TgkMEp5Rssw9Z7sV7VUQb8j5/y+fXY= cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y= From 7aaaf8b965f5aadfd93efc688201b50ffad95844 Mon Sep 17 00:00:00 2001 From: Marius Poke Date: Thu, 28 Nov 2024 16:32:45 +0100 Subject: [PATCH 04/15] bring v21.0.1 changelog to main (#3422) --- .../bug-fixes/3418-bump-cosmossdk-math.md | 5 +++++ .../dependencies/3418-bump-cosmossdk-math.md | 3 +++ .changelog/v21.0.1/summary.md | 2 ++ CHANGELOG.md | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 .changelog/v21.0.1/bug-fixes/3418-bump-cosmossdk-math.md create mode 100644 .changelog/v21.0.1/dependencies/3418-bump-cosmossdk-math.md create mode 100644 .changelog/v21.0.1/summary.md diff --git a/.changelog/v21.0.1/bug-fixes/3418-bump-cosmossdk-math.md b/.changelog/v21.0.1/bug-fixes/3418-bump-cosmossdk-math.md new file mode 100644 index 00000000000..77d28aea7ab --- /dev/null +++ b/.changelog/v21.0.1/bug-fixes/3418-bump-cosmossdk-math.md @@ -0,0 +1,5 @@ +- Bump [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk/tree/main/math) to + [v1.4.0](https://github.com/cosmos/cosmos-sdk/tree/math/v1.4.0) in order to + address the the [ASA-2024-010](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-7225-m954-23v7) + security advisory. + ([\#3418](https://github.com/cosmos/gaia/pull/3418)) \ No newline at end of file diff --git a/.changelog/v21.0.1/dependencies/3418-bump-cosmossdk-math.md b/.changelog/v21.0.1/dependencies/3418-bump-cosmossdk-math.md new file mode 100644 index 00000000000..88d24d5d9bb --- /dev/null +++ b/.changelog/v21.0.1/dependencies/3418-bump-cosmossdk-math.md @@ -0,0 +1,3 @@ +- Bump [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk/tree/main/math) to + [v1.4.0](https://github.com/cosmos/cosmos-sdk/tree/math/v1.4.0) + ([\#3418](https://github.com/cosmos/gaia/pull/3418)) \ No newline at end of file diff --git a/.changelog/v21.0.1/summary.md b/.changelog/v21.0.1/summary.md new file mode 100644 index 00000000000..c520bb8325c --- /dev/null +++ b/.changelog/v21.0.1/summary.md @@ -0,0 +1,2 @@ +*November 21, 2024* + diff --git a/CHANGELOG.md b/CHANGELOG.md index d624db24d33..d3fe6e4c15f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # CHANGELOG +## v21.0.1 + +*November 21, 2024* + +### BUG FIXES + +- Bump [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk/tree/main/math) to + [v1.4.0](https://github.com/cosmos/cosmos-sdk/tree/math/v1.4.0) in order to + address the the [ASA-2024-010](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-7225-m954-23v7) + security advisory. + ([\#3418](https://github.com/cosmos/gaia/pull/3418)) + +### DEPENDENCIES + +- Bump [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk/tree/main/math) to + [v1.4.0](https://github.com/cosmos/cosmos-sdk/tree/math/v1.4.0) + ([\#3418](https://github.com/cosmos/gaia/pull/3418)) + ## v21.0.0 *October 14, 2024* From 7e85d80e46dea30bebbbd22d5657d4dc23ad1317 Mon Sep 17 00:00:00 2001 From: Marius Poke Date: Thu, 28 Nov 2024 16:33:13 +0100 Subject: [PATCH 05/15] chore: bump version to v22 (#3413) * bump version to v22 * add v22 upgrade handler * update upgrade-test * fix: v21 -> v22 in interchaintest --------- Co-authored-by: MSalopek --- .github/workflows/test.yml | 6 ++-- ante/ante.go | 2 +- ante/gov_expedited_ante.go | 2 +- ante/gov_expedited_ante_test.go | 4 +-- ante/gov_vote_ante.go | 2 +- ante/gov_vote_ante_test.go | 4 +-- app/app.go | 10 +++--- app/app_test.go | 4 +-- app/helpers/test_helpers.go | 2 +- app/modules.go | 4 +-- app/post.go | 2 +- app/sim/sim_state.go | 2 +- app/sim/sim_utils.go | 2 +- app/sim_bench_test.go | 4 +-- app/sim_test.go | 6 ++-- app/upgrades/types.go | 2 +- app/upgrades/v19/constants.go | 2 +- app/upgrades/v19/upgrades.go | 2 +- app/upgrades/v20/constants.go | 2 +- app/upgrades/v20/upgrades.go | 2 +- app/upgrades/v20/upgrades_test.go | 4 +-- app/upgrades/v21/constants.go | 2 +- app/upgrades/v21/upgrades.go | 2 +- app/upgrades/v21/upgrades_test.go | 4 +-- app/upgrades/v22/constants.go | 15 +++++++++ app/upgrades/v22/upgrades.go | 33 +++++++++++++++++++ cmd/gaiad/cmd/bech32_convert.go | 2 +- cmd/gaiad/cmd/root.go | 2 +- cmd/gaiad/cmd/root_test.go | 4 +-- cmd/gaiad/cmd/testnet_set_local_validator.go | 2 +- cmd/gaiad/main.go | 4 +-- go.mod | 2 +- tests/e2e/chain.go | 6 ++-- tests/e2e/e2e_bank_test.go | 2 +- tests/e2e/e2e_setup_test.go | 2 +- tests/integration/feemarket_test.go | 4 +-- tests/integration/ibcfee_test.go | 4 +-- tests/integration/interchain_security_test.go | 4 +-- tests/integration/test_utils.go | 2 +- .../consumer_chain/changeover_test.go | 2 +- .../consumer_chain/consumer_launch_test.go | 2 +- .../consumer_modification_test.go | 2 +- .../consumer_chain/mainnet_consumers_test.go | 2 +- .../consumer_chain/unbonding_test.go | 2 +- tests/interchain/delegator/authz_test.go | 4 +-- tests/interchain/delegator/bank_test.go | 4 +-- tests/interchain/delegator/cosmwasm_test.go | 4 +-- tests/interchain/delegator/feegrant_test.go | 4 +-- tests/interchain/delegator/ica_test.go | 4 +-- tests/interchain/delegator/lsm_test.go | 2 +- tests/interchain/delegator/multisig_test.go | 4 +-- tests/interchain/delegator/pfm_test.go | 4 +-- tests/interchain/delegator/staking_test.go | 4 +-- tests/interchain/delegator/suite.go | 2 +- tests/interchain/go.mod | 2 +- tests/interchain/integrator/endpoints_test.go | 2 +- tests/interchain/validator/config_test.go | 2 +- tests/interchain/validator/feemarket_test.go | 2 +- .../validator/inactive_validator_test.go | 2 +- tests/interchain/validator/unbond_test.go | 2 +- x/metaprotocols/module.go | 2 +- 61 files changed, 137 insertions(+), 89 deletions(-) create mode 100644 app/upgrades/v22/constants.go create mode 100644 app/upgrades/v22/upgrades.go diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 54e2fa803c6..780e18ed384 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -163,10 +163,10 @@ jobs: # the old gaiad binary version is hardcoded, need to be updated each major release. - name: Install Old Gaiad run: | - curl -LO https://github.com/cosmos/gaia/releases/download/v20.0.0/gaiad-v20.0.0-linux-amd64 - chmod a+x gaiad-v20.0.0-linux-amd64 + curl -LO https://github.com/cosmos/gaia/releases/download/v21.0.0/gaiad-v21.0.0-linux-amd64 + chmod a+x gaiad-v21.0.0-linux-amd64 mkdir build - mv ./gaiad-v20.0.0-linux-amd64 ./build/gaiadold + mv ./gaiad-v21.0.0-linux-amd64 ./build/gaiadold if: env.GIT_DIFF - name: Install New Gaiad run: | diff --git a/ante/ante.go b/ante/ante.go index 536abf05356..aee2a85a179 100644 --- a/ante/ante.go +++ b/ante/ante.go @@ -22,7 +22,7 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - gaiaerrors "github.com/cosmos/gaia/v21/types/errors" + gaiaerrors "github.com/cosmos/gaia/v22/types/errors" ) // UseFeeMarketDecorator to make the integration testing easier: we can switch off its ante and post decorators with this flag diff --git a/ante/gov_expedited_ante.go b/ante/gov_expedited_ante.go index d9924a0e0f9..f15538fa914 100644 --- a/ante/gov_expedited_ante.go +++ b/ante/gov_expedited_ante.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - gaiaerrors "github.com/cosmos/gaia/v21/types/errors" + gaiaerrors "github.com/cosmos/gaia/v22/types/errors" ) var expeditedPropDecoratorEnabled = true diff --git a/ante/gov_expedited_ante_test.go b/ante/gov_expedited_ante_test.go index 124a5d9ccc7..d1d5928fb95 100644 --- a/ante/gov_expedited_ante_test.go +++ b/ante/gov_expedited_ante_test.go @@ -14,8 +14,8 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/cosmos/gaia/v21/ante" - "github.com/cosmos/gaia/v21/app/helpers" + "github.com/cosmos/gaia/v22/ante" + "github.com/cosmos/gaia/v22/app/helpers" ) func TestGovExpeditedProposalsDecorator(t *testing.T) { diff --git a/ante/gov_vote_ante.go b/ante/gov_vote_ante.go index c00ca8ac624..9465987c702 100644 --- a/ante/gov_vote_ante.go +++ b/ante/gov_vote_ante.go @@ -12,7 +12,7 @@ import ( stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaiaerrors "github.com/cosmos/gaia/v21/types/errors" + gaiaerrors "github.com/cosmos/gaia/v22/types/errors" ) var ( diff --git a/ante/gov_vote_ante_test.go b/ante/gov_vote_ante_test.go index 66a2b1fb6b7..7ce69e723ea 100644 --- a/ante/gov_vote_ante_test.go +++ b/ante/gov_vote_ante_test.go @@ -15,8 +15,8 @@ import ( govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/gaia/v21/ante" - "github.com/cosmos/gaia/v21/app/helpers" + "github.com/cosmos/gaia/v22/ante" + "github.com/cosmos/gaia/v22/app/helpers" ) // Test that the GovVoteDecorator rejects v1beta1 vote messages from accounts with less than 1 atom staked diff --git a/app/app.go b/app/app.go index 1f660e665ec..277970e8ead 100644 --- a/app/app.go +++ b/app/app.go @@ -66,17 +66,17 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - gaiaante "github.com/cosmos/gaia/v21/ante" - "github.com/cosmos/gaia/v21/app/keepers" - "github.com/cosmos/gaia/v21/app/upgrades" - v21 "github.com/cosmos/gaia/v21/app/upgrades/v21" + gaiaante "github.com/cosmos/gaia/v22/ante" + "github.com/cosmos/gaia/v22/app/keepers" + "github.com/cosmos/gaia/v22/app/upgrades" + v22 "github.com/cosmos/gaia/v22/app/upgrades/v22" ) var ( // DefaultNodeHome default home directories for the application daemon DefaultNodeHome string - Upgrades = []upgrades.Upgrade{v21.Upgrade} + Upgrades = []upgrades.Upgrade{v22.Upgrade} ) var ( diff --git a/app/app_test.go b/app/app_test.go index bd300ac0dde..55511df2b7a 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -14,8 +14,8 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - gaia "github.com/cosmos/gaia/v21/app" - gaiahelpers "github.com/cosmos/gaia/v21/app/helpers" + gaia "github.com/cosmos/gaia/v22/app" + gaiahelpers "github.com/cosmos/gaia/v22/app/helpers" ) type EmptyAppOptions struct{} diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index be59014284d..3c341b4a4b7 100644 --- a/app/helpers/test_helpers.go +++ b/app/helpers/test_helpers.go @@ -30,7 +30,7 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - gaiaapp "github.com/cosmos/gaia/v21/app" + gaiaapp "github.com/cosmos/gaia/v22/app" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/modules.go b/app/modules.go index a5aa6b7c69d..59015ba9f7a 100644 --- a/app/modules.go +++ b/app/modules.go @@ -62,8 +62,8 @@ import ( wasm "github.com/CosmWasm/wasmd/x/wasm" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/cosmos/gaia/v21/x/metaprotocols" - metaprotocolstypes "github.com/cosmos/gaia/v21/x/metaprotocols/types" + "github.com/cosmos/gaia/v22/x/metaprotocols" + metaprotocolstypes "github.com/cosmos/gaia/v22/x/metaprotocols/types" ) var maccPerms = map[string][]string{ diff --git a/app/post.go b/app/post.go index 543ec95d0f3..fc9ceaa3f36 100644 --- a/app/post.go +++ b/app/post.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/gaia/v21/ante" + "github.com/cosmos/gaia/v22/ante" ) // PostHandlerOptions are the options required for constructing a FeeMarket PostHandler. diff --git a/app/sim/sim_state.go b/app/sim/sim_state.go index e393d733efd..1c2845eb777 100644 --- a/app/sim/sim_state.go +++ b/app/sim/sim_state.go @@ -22,7 +22,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaia "github.com/cosmos/gaia/v21/app" + gaia "github.com/cosmos/gaia/v22/app" ) // Simulation parameter constants diff --git a/app/sim/sim_utils.go b/app/sim/sim_utils.go index d57f9a96772..98c54124b27 100644 --- a/app/sim/sim_utils.go +++ b/app/sim/sim_utils.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - gaia "github.com/cosmos/gaia/v21/app" + gaia "github.com/cosmos/gaia/v22/app" ) // SimulationOperations retrieves the simulation params from the provided file path diff --git a/app/sim_bench_test.go b/app/sim_bench_test.go index 96dedb81d8d..81eb604241b 100644 --- a/app/sim_bench_test.go +++ b/app/sim_bench_test.go @@ -13,8 +13,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/simulation" simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli" - gaia "github.com/cosmos/gaia/v21/app" - "github.com/cosmos/gaia/v21/app/sim" + gaia "github.com/cosmos/gaia/v22/app" + "github.com/cosmos/gaia/v22/app/sim" ) // Profile with: diff --git a/app/sim_test.go b/app/sim_test.go index 007d53e9cd5..48c36ccc0ba 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -23,11 +23,11 @@ import ( "github.com/cosmos/cosmos-sdk/x/simulation" simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli" - "github.com/cosmos/gaia/v21/ante" - gaia "github.com/cosmos/gaia/v21/app" + "github.com/cosmos/gaia/v22/ante" + gaia "github.com/cosmos/gaia/v22/app" // "github.com/cosmos/gaia/v11/app/helpers" // "github.com/cosmos/gaia/v11/app/params" - "github.com/cosmos/gaia/v21/app/sim" + "github.com/cosmos/gaia/v22/app/sim" ) // AppChainID hardcoded chainID for simulation diff --git a/app/upgrades/types.go b/app/upgrades/types.go index a2a1e50c93d..684aa583e61 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/gaia/v21/app/keepers" + "github.com/cosmos/gaia/v22/app/keepers" ) // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal diff --git a/app/upgrades/v19/constants.go b/app/upgrades/v19/constants.go index 85c4e043390..c3563d4938a 100644 --- a/app/upgrades/v19/constants.go +++ b/app/upgrades/v19/constants.go @@ -1,7 +1,7 @@ package v19 import ( - "github.com/cosmos/gaia/v21/app/upgrades" + "github.com/cosmos/gaia/v22/app/upgrades" ) const ( diff --git a/app/upgrades/v19/upgrades.go b/app/upgrades/v19/upgrades.go index 7042b8ebd98..701888f12d3 100644 --- a/app/upgrades/v19/upgrades.go +++ b/app/upgrades/v19/upgrades.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/gaia/v21/app/keepers" + "github.com/cosmos/gaia/v22/app/keepers" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v20/constants.go b/app/upgrades/v20/constants.go index 3c362c6ec63..3ef7b0bff9e 100644 --- a/app/upgrades/v20/constants.go +++ b/app/upgrades/v20/constants.go @@ -1,7 +1,7 @@ package v20 import ( - "github.com/cosmos/gaia/v21/app/upgrades" + "github.com/cosmos/gaia/v22/app/upgrades" ) const ( diff --git a/app/upgrades/v20/upgrades.go b/app/upgrades/v20/upgrades.go index 70a303828d2..ea80912cd79 100644 --- a/app/upgrades/v20/upgrades.go +++ b/app/upgrades/v20/upgrades.go @@ -23,7 +23,7 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/cosmos/gaia/v21/app/keepers" + "github.com/cosmos/gaia/v22/app/keepers" ) // Constants for the new parameters in the v20 upgrade. diff --git a/app/upgrades/v20/upgrades_test.go b/app/upgrades/v20/upgrades_test.go index 489971551cf..a896cb97470 100644 --- a/app/upgrades/v20/upgrades_test.go +++ b/app/upgrades/v20/upgrades_test.go @@ -21,8 +21,8 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/cosmos/gaia/v21/app/helpers" - v20 "github.com/cosmos/gaia/v21/app/upgrades/v20" + "github.com/cosmos/gaia/v22/app/helpers" + v20 "github.com/cosmos/gaia/v22/app/upgrades/v20" ) func GetTestMsgConsumerAddition() providertypes.MsgConsumerAddition { //nolint:staticcheck diff --git a/app/upgrades/v21/constants.go b/app/upgrades/v21/constants.go index 022e20ff366..673f744e67e 100644 --- a/app/upgrades/v21/constants.go +++ b/app/upgrades/v21/constants.go @@ -1,7 +1,7 @@ package v21 import ( - "github.com/cosmos/gaia/v21/app/upgrades" + "github.com/cosmos/gaia/v22/app/upgrades" ) const ( diff --git a/app/upgrades/v21/upgrades.go b/app/upgrades/v21/upgrades.go index 71f6c2f74a2..983b1a6ea82 100644 --- a/app/upgrades/v21/upgrades.go +++ b/app/upgrades/v21/upgrades.go @@ -18,7 +18,7 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govparams "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/cosmos/gaia/v21/app/keepers" + "github.com/cosmos/gaia/v22/app/keepers" ) // Neutron and Stride denoms that were not whitelisted but the consumer rewards pool contains amounts of those denoms. diff --git a/app/upgrades/v21/upgrades_test.go b/app/upgrades/v21/upgrades_test.go index 88bb4c5a210..5e48c3c8d8f 100644 --- a/app/upgrades/v21/upgrades_test.go +++ b/app/upgrades/v21/upgrades_test.go @@ -9,8 +9,8 @@ import ( govparams "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/cosmos/gaia/v21/app/helpers" - v21 "github.com/cosmos/gaia/v21/app/upgrades/v21" + "github.com/cosmos/gaia/v22/app/helpers" + v21 "github.com/cosmos/gaia/v22/app/upgrades/v21" ) func TestHasExpectedChainIDSanityCheck(t *testing.T) { diff --git a/app/upgrades/v22/constants.go b/app/upgrades/v22/constants.go new file mode 100644 index 00000000000..a207708c927 --- /dev/null +++ b/app/upgrades/v22/constants.go @@ -0,0 +1,15 @@ +package v22 + +import ( + "github.com/cosmos/gaia/v22/app/upgrades" +) + +const ( + // UpgradeName defines the on-chain upgrade name. + UpgradeName = "v22" +) + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateUpgradeHandler, +} diff --git a/app/upgrades/v22/upgrades.go b/app/upgrades/v22/upgrades.go new file mode 100644 index 00000000000..e9b46aea1f1 --- /dev/null +++ b/app/upgrades/v22/upgrades.go @@ -0,0 +1,33 @@ +package v22 + +import ( + "context" + + errorsmod "cosmossdk.io/errors" + upgradetypes "cosmossdk.io/x/upgrade/types" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + + "github.com/cosmos/gaia/v22/app/keepers" +) + +// CreateUpgradeHandler returns an upgrade handler for Gaia v22. +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, + keepers *keepers.AppKeepers, +) upgradetypes.UpgradeHandler { + return func(c context.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + ctx := sdk.UnwrapSDKContext(c) + ctx.Logger().Info("Starting module migrations...") + + vm, err := mm.RunMigrations(ctx, configurator, vm) + if err != nil { + return vm, errorsmod.Wrapf(err, "running module migrations") + } + + ctx.Logger().Info("Upgrade v22 complete") + return vm, nil + } +} diff --git a/cmd/gaiad/cmd/bech32_convert.go b/cmd/gaiad/cmd/bech32_convert.go index 63170133aff..0e51e304380 100644 --- a/cmd/gaiad/cmd/bech32_convert.go +++ b/cmd/gaiad/cmd/bech32_convert.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - addressutil "github.com/cosmos/gaia/v21/pkg/address" + addressutil "github.com/cosmos/gaia/v22/pkg/address" ) var flagBech32Prefix = "prefix" diff --git a/cmd/gaiad/cmd/root.go b/cmd/gaiad/cmd/root.go index fce0ccb2e7b..64d1b40df93 100644 --- a/cmd/gaiad/cmd/root.go +++ b/cmd/gaiad/cmd/root.go @@ -57,7 +57,7 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - gaia "github.com/cosmos/gaia/v21/app" + gaia "github.com/cosmos/gaia/v22/app" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/gaiad/cmd/root_test.go b/cmd/gaiad/cmd/root_test.go index f715564ba0c..ff841d4e7a4 100644 --- a/cmd/gaiad/cmd/root_test.go +++ b/cmd/gaiad/cmd/root_test.go @@ -7,8 +7,8 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - app "github.com/cosmos/gaia/v21/app" - "github.com/cosmos/gaia/v21/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v22/app" + "github.com/cosmos/gaia/v22/cmd/gaiad/cmd" ) func TestRootCmdConfig(t *testing.T) { diff --git a/cmd/gaiad/cmd/testnet_set_local_validator.go b/cmd/gaiad/cmd/testnet_set_local_validator.go index 0532c8483be..1cf041e4d0a 100644 --- a/cmd/gaiad/cmd/testnet_set_local_validator.go +++ b/cmd/gaiad/cmd/testnet_set_local_validator.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cast" "github.com/spf13/cobra" - gaia "github.com/cosmos/gaia/v21/app" + gaia "github.com/cosmos/gaia/v22/app" "cosmossdk.io/log" "github.com/cometbft/cometbft/crypto" diff --git a/cmd/gaiad/main.go b/cmd/gaiad/main.go index b0dcfc74bca..7c22e003d2a 100644 --- a/cmd/gaiad/main.go +++ b/cmd/gaiad/main.go @@ -5,8 +5,8 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - app "github.com/cosmos/gaia/v21/app" - "github.com/cosmos/gaia/v21/cmd/gaiad/cmd" + app "github.com/cosmos/gaia/v22/app" + "github.com/cosmos/gaia/v22/cmd/gaiad/cmd" ) func main() { diff --git a/go.mod b/go.mod index c5c27720a66..6126a648801 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/gaia/v21 +module github.com/cosmos/gaia/v22 go 1.22.7 diff --git a/tests/e2e/chain.go b/tests/e2e/chain.go index 88e9fbae469..bec958ef9c6 100644 --- a/tests/e2e/chain.go +++ b/tests/e2e/chain.go @@ -27,9 +27,9 @@ import ( paramsproptypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gaia "github.com/cosmos/gaia/v21/app" - gaiaparams "github.com/cosmos/gaia/v21/app/params" - metaprotocoltypes "github.com/cosmos/gaia/v21/x/metaprotocols/types" + gaia "github.com/cosmos/gaia/v22/app" + gaiaparams "github.com/cosmos/gaia/v22/app/params" + metaprotocoltypes "github.com/cosmos/gaia/v22/x/metaprotocols/types" ) const ( diff --git a/tests/e2e/e2e_bank_test.go b/tests/e2e/e2e_bank_test.go index 6f064722c4f..697940b09be 100644 --- a/tests/e2e/e2e_bank_test.go +++ b/tests/e2e/e2e_bank_test.go @@ -12,7 +12,7 @@ import ( authTx "github.com/cosmos/cosmos-sdk/x/auth/tx" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - extensiontypes "github.com/cosmos/gaia/v21/x/metaprotocols/types" + extensiontypes "github.com/cosmos/gaia/v22/x/metaprotocols/types" ) func (s *IntegrationTestSuite) testBankTokenTransfer() { diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go index e2dd2307fe4..fec21da34ec 100644 --- a/tests/e2e/e2e_setup_test.go +++ b/tests/e2e/e2e_setup_test.go @@ -43,7 +43,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/gaia/v21/types" + "github.com/cosmos/gaia/v22/types" ) const ( diff --git a/tests/integration/feemarket_test.go b/tests/integration/feemarket_test.go index f90aa48a8b9..c855c6a1ca9 100644 --- a/tests/integration/feemarket_test.go +++ b/tests/integration/feemarket_test.go @@ -14,8 +14,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/gaia/v21/ante" - gaiaApp "github.com/cosmos/gaia/v21/app" + "github.com/cosmos/gaia/v22/ante" + gaiaApp "github.com/cosmos/gaia/v22/app" ) const ( diff --git a/tests/integration/ibcfee_test.go b/tests/integration/ibcfee_test.go index 61766a96ebc..c1717bc420f 100644 --- a/tests/integration/ibcfee_test.go +++ b/tests/integration/ibcfee_test.go @@ -14,8 +14,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gaia/v21/ante" - gaiaApp "github.com/cosmos/gaia/v21/app" + "github.com/cosmos/gaia/v22/ante" + gaiaApp "github.com/cosmos/gaia/v22/app" ) // These integration tests were modified to work with the GaiaApp diff --git a/tests/integration/interchain_security_test.go b/tests/integration/interchain_security_test.go index d4d1ae7abf6..1289c96c9a7 100644 --- a/tests/integration/interchain_security_test.go +++ b/tests/integration/interchain_security_test.go @@ -17,8 +17,8 @@ import ( crysistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/gaia/v21/ante" - gaiaApp "github.com/cosmos/gaia/v21/app" + "github.com/cosmos/gaia/v22/ante" + gaiaApp "github.com/cosmos/gaia/v22/app" ) var ccvSuite *integration.CCVTestSuite diff --git a/tests/integration/test_utils.go b/tests/integration/test_utils.go index ce0573f2b64..f4e1c425ea6 100644 --- a/tests/integration/test_utils.go +++ b/tests/integration/test_utils.go @@ -23,7 +23,7 @@ import ( simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" - gaiaApp "github.com/cosmos/gaia/v21/app" + gaiaApp "github.com/cosmos/gaia/v22/app" ) var app *gaiaApp.GaiaApp diff --git a/tests/interchain/consumer_chain/changeover_test.go b/tests/interchain/consumer_chain/changeover_test.go index 7f88fd23959..219af6ae655 100644 --- a/tests/interchain/consumer_chain/changeover_test.go +++ b/tests/interchain/consumer_chain/changeover_test.go @@ -11,7 +11,7 @@ import ( sdkmath "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" "github.com/strangelove-ventures/interchaintest/v8" diff --git a/tests/interchain/consumer_chain/consumer_launch_test.go b/tests/interchain/consumer_chain/consumer_launch_test.go index 7ea2635300f..ca14672f49b 100644 --- a/tests/interchain/consumer_chain/consumer_launch_test.go +++ b/tests/interchain/consumer_chain/consumer_launch_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/suite" "golang.org/x/mod/semver" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" ) type ConsumerLaunchSuite struct { diff --git a/tests/interchain/consumer_chain/consumer_modification_test.go b/tests/interchain/consumer_chain/consumer_modification_test.go index d4239efa6ca..7dc63df080e 100644 --- a/tests/interchain/consumer_chain/consumer_modification_test.go +++ b/tests/interchain/consumer_chain/consumer_modification_test.go @@ -9,7 +9,7 @@ import ( "time" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" "github.com/strangelove-ventures/interchaintest/v8" diff --git a/tests/interchain/consumer_chain/mainnet_consumers_test.go b/tests/interchain/consumer_chain/mainnet_consumers_test.go index 20188ad87e7..738c3fc5fbe 100644 --- a/tests/interchain/consumer_chain/mainnet_consumers_test.go +++ b/tests/interchain/consumer_chain/mainnet_consumers_test.go @@ -3,7 +3,7 @@ package consumer_chain_test import ( "testing" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/strangelove-ventures/interchaintest/v8" "github.com/stretchr/testify/suite" "golang.org/x/mod/semver" diff --git a/tests/interchain/consumer_chain/unbonding_test.go b/tests/interchain/consumer_chain/unbonding_test.go index 9113d8f0b75..fc10adea408 100644 --- a/tests/interchain/consumer_chain/unbonding_test.go +++ b/tests/interchain/consumer_chain/unbonding_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/ibc" diff --git a/tests/interchain/delegator/authz_test.go b/tests/interchain/delegator/authz_test.go index ef8a01a0069..e493b81eff6 100644 --- a/tests/interchain/delegator/authz_test.go +++ b/tests/interchain/delegator/authz_test.go @@ -7,8 +7,8 @@ import ( "testing" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/stretchr/testify/assert" diff --git a/tests/interchain/delegator/bank_test.go b/tests/interchain/delegator/bank_test.go index b19022c63b4..9a75dbb5d07 100644 --- a/tests/interchain/delegator/bank_test.go +++ b/tests/interchain/delegator/bank_test.go @@ -4,8 +4,8 @@ import ( "testing" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/stretchr/testify/suite" ) diff --git a/tests/interchain/delegator/cosmwasm_test.go b/tests/interchain/delegator/cosmwasm_test.go index 725b29e11c3..a55fefbc160 100644 --- a/tests/interchain/delegator/cosmwasm_test.go +++ b/tests/interchain/delegator/cosmwasm_test.go @@ -6,8 +6,8 @@ import ( "path" "testing" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/stretchr/testify/suite" ) diff --git a/tests/interchain/delegator/feegrant_test.go b/tests/interchain/delegator/feegrant_test.go index e03cc784dce..211eec4e8f5 100644 --- a/tests/interchain/delegator/feegrant_test.go +++ b/tests/interchain/delegator/feegrant_test.go @@ -5,8 +5,8 @@ import ( "time" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/strangelove-ventures/interchaintest/v8/testutil" "github.com/stretchr/testify/suite" ) diff --git a/tests/interchain/delegator/ica_test.go b/tests/interchain/delegator/ica_test.go index d2bf4dfc309..485ab692566 100644 --- a/tests/interchain/delegator/ica_test.go +++ b/tests/interchain/delegator/ica_test.go @@ -7,8 +7,8 @@ import ( "testing" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" diff --git a/tests/interchain/delegator/lsm_test.go b/tests/interchain/delegator/lsm_test.go index 50c32d19da0..4f05e8fbadf 100644 --- a/tests/interchain/delegator/lsm_test.go +++ b/tests/interchain/delegator/lsm_test.go @@ -8,7 +8,7 @@ import ( "time" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/strangelove-ventures/interchaintest/v8/testutil" diff --git a/tests/interchain/delegator/multisig_test.go b/tests/interchain/delegator/multisig_test.go index 478c0b6eba4..7da1b9e04aa 100644 --- a/tests/interchain/delegator/multisig_test.go +++ b/tests/interchain/delegator/multisig_test.go @@ -6,8 +6,8 @@ import ( "testing" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/stretchr/testify/suite" diff --git a/tests/interchain/delegator/pfm_test.go b/tests/interchain/delegator/pfm_test.go index d7a71bd6575..bb861a9929b 100644 --- a/tests/interchain/delegator/pfm_test.go +++ b/tests/interchain/delegator/pfm_test.go @@ -5,8 +5,8 @@ import ( "testing" sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/ibc" diff --git a/tests/interchain/delegator/staking_test.go b/tests/interchain/delegator/staking_test.go index f2c99eb5923..630da166e1a 100644 --- a/tests/interchain/delegator/staking_test.go +++ b/tests/interchain/delegator/staking_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" - "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/delegator" "github.com/stretchr/testify/suite" ) diff --git a/tests/interchain/delegator/suite.go b/tests/interchain/delegator/suite.go index 972482b339d..6e6ce82c64f 100644 --- a/tests/interchain/delegator/suite.go +++ b/tests/interchain/delegator/suite.go @@ -2,7 +2,7 @@ package delegator import ( sdkmath "cosmossdk.io/math" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/ibc" ) diff --git a/tests/interchain/go.mod b/tests/interchain/go.mod index eac08fcfc0f..f544a671594 100644 --- a/tests/interchain/go.mod +++ b/tests/interchain/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/gaia/v21/tests/interchain +module github.com/cosmos/gaia/v22/tests/interchain go 1.22.5 diff --git a/tests/interchain/integrator/endpoints_test.go b/tests/interchain/integrator/endpoints_test.go index 434253423b6..d5d5d6ca5e9 100644 --- a/tests/interchain/integrator/endpoints_test.go +++ b/tests/interchain/integrator/endpoints_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/stretchr/testify/suite" "golang.org/x/mod/semver" ) diff --git a/tests/interchain/validator/config_test.go b/tests/interchain/validator/config_test.go index 9b4891f3de0..25d26fcb913 100644 --- a/tests/interchain/validator/config_test.go +++ b/tests/interchain/validator/config_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/gorilla/websocket" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" diff --git a/tests/interchain/validator/feemarket_test.go b/tests/interchain/validator/feemarket_test.go index aa2d52b1218..d656350b8fc 100644 --- a/tests/interchain/validator/feemarket_test.go +++ b/tests/interchain/validator/feemarket_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/testutil" diff --git a/tests/interchain/validator/inactive_validator_test.go b/tests/interchain/validator/inactive_validator_test.go index 56faff11d84..4185358968e 100644 --- a/tests/interchain/validator/inactive_validator_test.go +++ b/tests/interchain/validator/inactive_validator_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/ibc" "github.com/stretchr/testify/assert" diff --git a/tests/interchain/validator/unbond_test.go b/tests/interchain/validator/unbond_test.go index 19157e45c4e..6a8942244cf 100644 --- a/tests/interchain/validator/unbond_test.go +++ b/tests/interchain/validator/unbond_test.go @@ -6,7 +6,7 @@ import ( "github.com/strangelove-ventures/interchaintest/v8" "github.com/stretchr/testify/suite" - "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v22/tests/interchain/chainsuite" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) diff --git a/x/metaprotocols/module.go b/x/metaprotocols/module.go index ebdab3b03b4..452e6b26701 100644 --- a/x/metaprotocols/module.go +++ b/x/metaprotocols/module.go @@ -15,7 +15,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/gaia/v21/x/metaprotocols/types" + "github.com/cosmos/gaia/v22/x/metaprotocols/types" ) const consensusVersion uint64 = 1 From 137a3b97267a473b3551502dc8bece3e2f806f1e Mon Sep 17 00:00:00 2001 From: violet <158512193+fastfadingviolets@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:02:05 -0500 Subject: [PATCH 06/15] ci: Fixes to get interchaintest to run on v22 (#3433) --- tests/interchain/chainsuite/chain_ics.go | 7 +++++++ tests/interchain/chainsuite/config.go | 2 +- tests/interchain/validator/config_test.go | 9 ++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/interchain/chainsuite/chain_ics.go b/tests/interchain/chainsuite/chain_ics.go index 0036b276489..fb4c9b38312 100644 --- a/tests/interchain/chainsuite/chain_ics.go +++ b/tests/interchain/chainsuite/chain_ics.go @@ -384,6 +384,13 @@ func (p *Chain) DefaultConsumerChainSpec(ctx context.Context, chainID string, co if err != nil { return nil, err } + if chainType == neutronChain || chainType == strideChain { + // Stride and Neutron aren't updated yet to use the consumer ID + b, err = sjson.DeleteBytes(b, "app_state.ccvconsumer.params.consumer_id") + if err != nil { + return nil, err + } + } if chainType == strideChain { b, err = sjson.SetBytes(b, "app_state.epochs.epochs.#(identifier==\"day\").duration", "120s") if err != nil { diff --git a/tests/interchain/chainsuite/config.go b/tests/interchain/chainsuite/config.go index eed5db7c884..67453292636 100644 --- a/tests/interchain/chainsuite/config.go +++ b/tests/interchain/chainsuite/config.go @@ -49,7 +49,7 @@ const ( ChainSpawnWait = 155 * time.Second SlashingWindowConsumer = 20 BlocksPerDistribution = 10 - StrideVersion = "v22.0.0" + StrideVersion = "v24.0.0" NeutronVersion = "v3.0.2" TransferPortID = "transfer" // This is needed because not every ics image is in the default heighliner registry diff --git a/tests/interchain/validator/config_test.go b/tests/interchain/validator/config_test.go index 25d26fcb913..7f731502e8c 100644 --- a/tests/interchain/validator/config_test.go +++ b/tests/interchain/validator/config_test.go @@ -18,6 +18,7 @@ import ( "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/testutil" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "golang.org/x/sync/errgroup" ) @@ -119,9 +120,11 @@ func (s *ConfigSuite) TestPeerLimit() { s.Require().NoError(testutil.WaitForBlocks(s.GetContext(), 4, s.Chain)) - metrics, err = s.getPrometheusMetrics(0) - s.Require().NoError(err) - s.Require().Equal(float64(2), metrics["cometbft_p2p_peers"].GetMetric()[0].GetGauge().GetValue()) + s.Require().EventuallyWithT(func(c *assert.CollectT) { + metrics, err = s.getPrometheusMetrics(0) + assert.NoError(c, err) + assert.Equal(c, float64(2), metrics["cometbft_p2p_peers"].GetMetric()[0].GetGauge().GetValue()) + }, 3*time.Minute, 10*time.Second) foundZero := false for i := 1; i < len(s.Chain.Validators); i++ { From 8c60ccf5b1de3463336476172f446ba3fecaa5df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:54:29 +0100 Subject: [PATCH 07/15] chore(deps): Bump actions/cache from 4.1.1 to 4.2.0 (#3439) Bumps [actions/cache](https://github.com/actions/cache) from 4.1.1 to 4.2.0. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v4.1.1...v4.2.0) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-sims.yml | 8 ++++---- .github/workflows/sim-label.yml | 4 ++-- .github/workflows/sims.yml | 12 ++++++------ .github/workflows/test.yml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release-sims.yml b/.github/workflows/release-sims.yml index 320989b7f6f..87673aee400 100644 --- a/.github/workflows/release-sims.yml +++ b/.github/workflows/release-sims.yml @@ -29,7 +29,7 @@ jobs: go-version: 1.22.x - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -40,7 +40,7 @@ jobs: steps: - name: install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -50,7 +50,7 @@ jobs: needs: [build, install-runsim] steps: - uses: actions/checkout@v4 - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -72,7 +72,7 @@ jobs: **/**.go go.mod go.sum - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary diff --git a/.github/workflows/sim-label.yml b/.github/workflows/sim-label.yml index e51c1a27712..8ba9f510459 100644 --- a/.github/workflows/sim-label.yml +++ b/.github/workflows/sim-label.yml @@ -20,7 +20,7 @@ jobs: go-version: 1.22.x - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -34,7 +34,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: 1.22.x - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml index a8960a1d763..b210c688af0 100644 --- a/.github/workflows/sims.yml +++ b/.github/workflows/sims.yml @@ -24,7 +24,7 @@ jobs: go-version: 1.22.x - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -43,7 +43,7 @@ jobs: **/**.go go.mod go.sum - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -67,7 +67,7 @@ jobs: **/**.go go.mod go.sum - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -85,7 +85,7 @@ jobs: go-version: 1.22.x - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -96,7 +96,7 @@ jobs: steps: - name: install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary @@ -109,7 +109,7 @@ jobs: with: go-version: 1.22.x - uses: actions/checkout@v4 - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: ~/go/bin key: ${{ runner.os }}-go-runsim-binary diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 780e18ed384..0a285a34e17 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,7 +35,7 @@ jobs: **/go.sum **/Makefile Makefile - - uses: actions/cache@v4.1.1 + - uses: actions/cache@v4.2.0 with: path: | ~/.cache/go-build From 8e4dee1c83a967335ad2b9ba1d4e604c6477c820 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:54:45 +0100 Subject: [PATCH 08/15] chore(deps): Bump JamesIves/github-pages-deploy-action (#3438) Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.6.8 to 4.7.2. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](https://github.com/jamesives/github-pages-deploy-action/compare/v4.6.8...v4.7.2) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/deploy-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index c556ad45010..17e1673aac9 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -40,7 +40,7 @@ jobs: make build-docs - name: Deploy 🚀 - uses: JamesIves/github-pages-deploy-action@v4.6.8 + uses: JamesIves/github-pages-deploy-action@v4.7.2 with: branch: gh-pages folder: ~/output From 693da077865ad34e71178c0224e1987fecf6a357 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:56:21 +0100 Subject: [PATCH 09/15] chore(deps): Bump docker/build-push-action from 6.9.0 to 6.10.0 (#3431) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.9.0 to 6.10.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.9.0...v6.10.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docker-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index 66e913a023d..685d6ed2c2c 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -46,7 +46,7 @@ jobs: flavor: "latest=false" - name: Build and push docker image - uses: docker/build-push-action@v6.9.0 + uses: docker/build-push-action@v6.10.0 with: context: . file: Dockerfile From 047c94f0168873fe2ff9d3c068fb64cfdeac3152 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:57:11 +0100 Subject: [PATCH 10/15] chore(deps): Bump docker/metadata-action from 5.5.1 to 5.6.1 (#3427) Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 5.5.1 to 5.6.1. - [Release notes](https://github.com/docker/metadata-action/releases) - [Commits](https://github.com/docker/metadata-action/compare/v5.5.1...v5.6.1) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docker-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index 685d6ed2c2c..63a4a7f0486 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -40,7 +40,7 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@v5.5.1 + uses: docker/metadata-action@v5.6.1 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} flavor: "latest=false" From 61117b89576bd654cf23efd188f4ea185b6c2041 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:57:28 +0100 Subject: [PATCH 11/15] chore(deps): Bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (#3426) Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 6126a648801..efcf7c4ba85 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 ) require ( diff --git a/go.sum b/go.sum index fa52cfc2b33..def492e32f6 100644 --- a/go.sum +++ b/go.sum @@ -1250,8 +1250,9 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= From fa41e2505faafc1e80ddcc2a66458d79798829ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:57:43 +0100 Subject: [PATCH 12/15] chore(deps): Bump github.com/cosmos/cosmos-db from 1.0.2 to 1.1.0 (#3425) Bumps [github.com/cosmos/cosmos-db](https://github.com/cosmos/cosmos-db) from 1.0.2 to 1.1.0. - [Changelog](https://github.com/cosmos/cosmos-db/blob/main/CHANGELOG.md) - [Commits](https://github.com/cosmos/cosmos-db/compare/v1.0.2...v1.1.0) --- updated-dependencies: - dependency-name: github.com/cosmos/cosmos-db dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index efcf7c4ba85..fc5e326dd2d 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/CosmWasm/wasmd v0.53.0 github.com/cometbft/cometbft v0.38.15 github.com/cometbft/cometbft-db v0.14.1 - github.com/cosmos/cosmos-db v1.0.2 + github.com/cosmos/cosmos-db v1.1.0 github.com/cosmos/cosmos-sdk v0.50.10 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogoproto v1.7.0 @@ -84,7 +84,7 @@ require ( github.com/cockroachdb/errors v1.11.3 // indirect github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v1.1.1 // indirect + 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/coinbase/rosetta-sdk-go v0.7.9 // indirect diff --git a/go.sum b/go.sum index def492e32f6..4e1658738ed 100644 --- a/go.sum +++ b/go.sum @@ -389,8 +389,8 @@ github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/e github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v1.1.1 h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw= -github.com/cockroachdb/pebble v1.1.1/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= +github.com/cockroachdb/pebble v1.1.2 h1:CUh2IPtR4swHlEj48Rhfzw6l/d0qA31fItcIszQVIsA= +github.com/cockroachdb/pebble v1.1.2/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= @@ -417,8 +417,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= -github.com/cosmos/cosmos-db v1.0.2 h1:hwMjozuY1OlJs/uh6vddqnk9j7VamLv+0DBlbEXbAKs= -github.com/cosmos/cosmos-db v1.0.2/go.mod h1:Z8IXcFJ9PqKK6BIsVOB3QXtkKoqUOp1vRvPT39kOXEA= +github.com/cosmos/cosmos-db v1.1.0 h1:KLHNVQ73h7vawXTpj9UJ7ZR2IXv51tsEHkQJJ9EBDzI= +github.com/cosmos/cosmos-db v1.1.0/go.mod h1:t7c4A6cfGdpUwwVxrQ0gQLeRQqGUBJu0yvE4F/26REg= github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA= github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= github.com/cosmos/cosmos-sdk v0.50.10-lsm h1:dG93GkIfZjOyYIDj3jrpFuMjkpiqVqH5CtxSoBqNtvY= From a3fe7fcab31461285997fe9f56c73c337ba64962 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:16:12 +0100 Subject: [PATCH 13/15] chore(deps): Bump cosmossdk.io/client/v2 (#3424) Bumps [cosmossdk.io/client/v2](https://github.com/cosmos/cosmos-sdk) from 2.0.0-beta.3 to 2.0.0-beta.6. - [Release notes](https://github.com/cosmos/cosmos-sdk/releases) - [Changelog](https://github.com/cosmos/cosmos-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/cosmos/cosmos-sdk/compare/client/v2.0.0-beta.3...client/v2.0.0-beta.6) --- updated-dependencies: - dependency-name: cosmossdk.io/client/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fc5e326dd2d..2a0afe76ca5 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.9 require ( cosmossdk.io/api v0.7.5 - cosmossdk.io/client/v2 v2.0.0-beta.3 + cosmossdk.io/client/v2 v2.0.0-beta.6 cosmossdk.io/core v0.11.1 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.1 diff --git a/go.sum b/go.sum index 4e1658738ed..67f46d7bc5f 100644 --- a/go.sum +++ b/go.sum @@ -190,8 +190,8 @@ cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuW cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -cosmossdk.io/client/v2 v2.0.0-beta.3 h1:+TTuH0DwQYsUq2JFAl3fDZzKq5gQG7nt3dAattkjFDU= -cosmossdk.io/client/v2 v2.0.0-beta.3/go.mod h1:CZcL41HpJPOOayTCO28j8weNBQprG+SRiKX39votypo= +cosmossdk.io/client/v2 v2.0.0-beta.6 h1:CygEwABxbwFmqgLINBb3WGVwzaN4yRgB9ZtIGQzhRNQ= +cosmossdk.io/client/v2 v2.0.0-beta.6/go.mod h1:4p0P6o0ro+FizakJUYS9SeM94RNbv0thLmkHRw5o5as= cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s= cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0= cosmossdk.io/core v0.11.1 h1:h9WfBey7NAiFfIcUhDVNS503I2P2HdZLebJlUIs8LPA= From 1ba35f56b6c49d6a21dbdc3775d976ddb6310567 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:17:52 +0100 Subject: [PATCH 14/15] chore(deps): Bump cosmossdk.io/math in /tests/interchain (#3419) Bumps [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/cosmos/cosmos-sdk/releases) - [Changelog](https://github.com/cosmos/cosmos-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/cosmos/cosmos-sdk/compare/log/v1.3.0...log/v1.4.0) --- updated-dependencies: - dependency-name: cosmossdk.io/math dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tests/interchain/go.mod | 4 ++-- tests/interchain/go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/interchain/go.mod b/tests/interchain/go.mod index f544a671594..0a9f78b8804 100644 --- a/tests/interchain/go.mod +++ b/tests/interchain/go.mod @@ -20,13 +20,14 @@ replace ( ) require ( - cosmossdk.io/math v1.3.0 + cosmossdk.io/math v1.4.0 github.com/cometbft/cometbft v0.38.11 github.com/cosmos/cosmos-sdk v0.50.9 github.com/cosmos/ibc-go/v8 v8.5.0 github.com/cosmos/interchain-security/v5 v5.1.1 github.com/docker/docker v27.1.2+incompatible github.com/google/go-github/v62 v62.0.0 + github.com/gorilla/websocket v1.5.3 github.com/kelseyhightower/envconfig v1.4.0 github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.60.1 @@ -151,7 +152,6 @@ require ( github.com/googleapis/gax-go/v2 v2.13.0 // indirect github.com/gorilla/handlers v1.5.2 // indirect github.com/gorilla/mux v1.8.1 // indirect - github.com/gorilla/websocket v1.5.3 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect diff --git a/tests/interchain/go.sum b/tests/interchain/go.sum index 19e12a84e88..b463a58705e 100644 --- a/tests/interchain/go.sum +++ b/tests/interchain/go.sum @@ -202,8 +202,8 @@ 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/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= +cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= cosmossdk.io/store v1.1.0 h1:LnKwgYMc9BInn9PhpTFEQVbL9UK475G2H911CGGnWHk= cosmossdk.io/store v1.1.0/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng= cosmossdk.io/x/circuit v0.1.1 h1:KPJCnLChWrxD4jLwUiuQaf5mFD/1m7Omyo7oooefBVQ= From 23f666beff88f14cb11ad47528982cde742d25d6 Mon Sep 17 00:00:00 2001 From: violet <158512193+fastfadingviolets@users.noreply.github.com> Date: Mon, 9 Dec 2024 05:18:51 -0500 Subject: [PATCH 15/15] ci: Add an interchaintest for double signing evidence (#3415) --- tests/interchain/delegator/evidence_test.go | 62 +++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 tests/interchain/delegator/evidence_test.go diff --git a/tests/interchain/delegator/evidence_test.go b/tests/interchain/delegator/evidence_test.go new file mode 100644 index 00000000000..520e0b01f77 --- /dev/null +++ b/tests/interchain/delegator/evidence_test.go @@ -0,0 +1,62 @@ +package delegator_test + +import ( + "testing" + "time" + + "github.com/cosmos/gaia/v21/tests/interchain/chainsuite" + "github.com/cosmos/gaia/v21/tests/interchain/delegator" + "github.com/strangelove-ventures/interchaintest/v8" + "github.com/strangelove-ventures/interchaintest/v8/testutil" + "github.com/stretchr/testify/suite" +) + +type EvidenceSuite struct { + *delegator.Suite +} + +func (s *EvidenceSuite) TestDoubleSigning() { + from, to := 0, 3 + privkey, err := s.Chain.Validators[from].PrivValFileContent(s.GetContext()) + s.Require().NoError(err) + s.Require().NoError(s.Chain.Validators[to].OverwritePrivValFile(s.GetContext(), privkey)) + + s.Require().NoError(s.Chain.StopAllNodes(s.GetContext())) + + s.Require().NoError(s.Chain.Validators[to].CreateNodeContainer(s.GetContext())) + s.Require().NoError(s.Chain.Validators[to].StartContainer(s.GetContext())) + time.Sleep(10 * time.Second) + s.Require().NoError(s.Chain.Validators[from].CreateNodeContainer(s.GetContext())) + s.Require().NoError(s.Chain.Validators[from].StartContainer(s.GetContext())) + time.Sleep(10 * time.Second) + + for i := 0; i < len(s.Chain.Validators); i++ { + if i == from || i == to { + continue + } + s.Require().NoError(s.Chain.Validators[i].CreateNodeContainer(s.GetContext())) + s.Require().NoError(s.Chain.Validators[i].StartContainer(s.GetContext())) + } + s.Require().NoError(testutil.WaitForBlocks(s.GetContext(), 5, s.Chain)) + + evidence, err := s.Chain.QueryJSON(s.GetContext(), "evidence", "evidence", "list") + s.Require().NoError(err) + s.Require().NotEmpty(evidence.Array()) + valcons := evidence.Get("0.value.consensus_address").String() + s.Require().NotEmpty(valcons) + s.Require().Equal(s.Chain.ValidatorWallets[from].ValConsAddress, valcons) +} + +func TestEvidence(t *testing.T) { + nodes := 4 + s := &EvidenceSuite{ + Suite: &delegator.Suite{Suite: chainsuite.NewSuite(chainsuite.SuiteConfig{ + UpgradeOnSetup: true, + ChainSpec: &interchaintest.ChainSpec{ + NumValidators: &nodes, + }, + })}, + } + suite.Run(t, s) + +}