From 4e54444d1ec6d5f1e23e19dccdcf67b03067b7a2 Mon Sep 17 00:00:00 2001 From: Gjermund Garaba Date: Sat, 25 Jan 2025 10:39:30 +0100 Subject: [PATCH 1/6] chore: bump to sdk v0.52-rc.2 (#7882) * chore: bump to sdk v0.52-rc.2 * lint * lint... --- e2e/go.mod | 61 ++++---- e2e/go.sum | 120 ++++++++-------- go.mod | 65 ++++----- go.sum | 128 ++++++++--------- modules/apps/29-fee/module.go | 1 + modules/apps/callbacks/go.mod | 65 ++++----- modules/apps/callbacks/go.sum | 128 ++++++++--------- modules/light-clients/06-solomachine/proof.go | 3 +- modules/light-clients/08-wasm/go.mod | 64 ++++----- modules/light-clients/08-wasm/go.sum | 132 +++++++++--------- .../08-wasm/testing/simapp/app.go | 4 +- .../08-wasm/testing/simapp/simd/cmd/root.go | 4 +- simapp/app.go | 4 +- simapp/go.mod | 67 +++++---- simapp/go.sum | 132 +++++++++--------- simapp/simd/cmd/root.go | 4 +- 16 files changed, 492 insertions(+), 490 deletions(-) diff --git a/e2e/go.mod b/e2e/go.mod index a68ab517a5b..18688876138 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -5,7 +5,7 @@ go 1.23.4 // needed temporarily for v9. replace ( github.com/misko9/go-substrate-rpc-client/v4 => github.com/DimitrisJim/go-substrate-rpc-client/v4 v4.0.0-20240717100841-406da076c1d5 - github.com/strangelove-ventures/interchaintest/v9 => github.com/DimitrisJim/interchaintest/v9 v9.0.0-20241127135837-285cf3b21950 + github.com/strangelove-ventures/interchaintest/v9 => github.com/gjermundgaraba/interchaintest/v9 v9.0.0-20250124210659-93297de69a64 ) require ( @@ -24,13 +24,13 @@ require ( github.com/stretchr/testify v1.10.0 go.uber.org/zap v1.27.0 golang.org/x/mod v0.22.0 - google.golang.org/grpc v1.69.4 + google.golang.org/grpc v1.70.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1 // indirect - buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1 // indirect + buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1 // indirect + buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 // indirect cosmossdk.io/collections v1.0.0 // indirect cosmossdk.io/core v1.0.0 // indirect cosmossdk.io/depinject v1.1.0 // indirect @@ -97,7 +97,6 @@ require ( github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.3 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/btree v1.1.3 // indirect @@ -151,7 +150,7 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.61.0 // indirect + github.com/prometheus/common v0.62.0 // 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 @@ -193,9 +192,9 @@ require ( golang.org/x/text v0.21.0 // indirect golang.org/x/tools v0.29.0 // indirect google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/protobuf v1.36.4 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.5.1 // indirect @@ -265,6 +264,7 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect + go.uber.org/mock v0.5.0 // indirect golang.org/x/arch v0.12.0 // indirect golang.org/x/oauth2 v0.24.0 // indirect golang.org/x/time v0.6.0 // indirect @@ -287,28 +287,29 @@ replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.2021 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 +//TODO: remove everything below after tags are created replace ( - cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc - cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/group => cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/params => cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc + cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/group => cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/params => cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e // pseudo version lower than the latest tag - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.1.0.20250114081937-a40ade9515cc + github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.2 ) diff --git a/e2e/go.sum b/e2e/go.sum index cfb4eeeb39c..adca9aee259 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -1,7 +1,7 @@ -buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1 h1:72N6FvGkvIAHJFuW6BFXCThbTS2qo/PlzQuw7wSjUi8= -buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1/go.mod h1:UJ1nx2WHcWAvKiaem512kYlHektAZJ/eNU032Pdar70= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1 h1:LFgdGZ+BzNqHWsndyRvvFE1450BBZ2nFtyNEGZ9NOSg= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1/go.mod h1:cuOHNO5SRU1J25UoI8VvPyi8dq9BpZb4gKa01Umx57Y= +buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1 h1:ka493q+UHMpnJHmWS5EqsvVnOQIKrCdO/2Jpzht4drc= +buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1/go.mod h1:mvIvtXjrqo1Rmpf+OUuHIVQpA6f9bezvxtZ1c1uo3a8= +buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 h1:t5a3Rfm5y1+U3gqSq9fd728bj7kL9Rq1oBBXgx2iaaE= +buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1/go.mod h1:tUkfiDbobvvm/uysw5gXCf0I+2eFtlo7pBTy+OTnzZc= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -194,8 +194,8 @@ cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1V cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= cosmossdk.io/api v0.8.2 h1:klzA1RODd9tTawJ2CbBd/34RV/cB9qtd9oJN6rcRqqg= cosmossdk.io/api v0.8.2/go.mod h1:XJUwQrihIDjErzs3+jm1zO/9KRzKf4HMjRzXC+l+Cio= -cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc h1:kdVRV1nKiiZjqhX81ex7oy5X+WLpmlJUp1MLOUZfhHo= -cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc/go.mod h1:o5kHjrWXvmFTLx6+ObaNWPyCAG7R6gmOXIm6ks9LE1c= +cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e h1:/ablega07LmBWeIZSGL/LnIKQw4s3gHxTNvpeJZchGk= +cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e/go.mod h1:aS+VVIJTrrpn70VqUA2c1DEiT93DVi63U7K26yXmQ68= cosmossdk.io/collections v1.0.0 h1:YCYIe/pIMtc1iLDD0OrVdfWCnIkpwdy7k9NSQpaR5mg= cosmossdk.io/collections v1.0.0/go.mod h1:mFfLxnYT1fV+B3Lx9GLap1qxmffIPqQCND4xBExerps= cosmossdk.io/core v1.0.0 h1:e7XBbISOytLBOXMVwpRPixThXqEkeLGlg8no/qpgS8U= @@ -214,50 +214,50 @@ cosmossdk.io/schema v1.0.0 h1:/diH4XJjpV1JQwuIozwr+A4uFuuwanFdnw2kKeiXwwQ= cosmossdk.io/schema v1.0.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43 h1:glZ6MpmD+5AhwJYV4jzx+rn7cgUB2owHgk9o+93luz0= cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43/go.mod h1:XCWpgfueHSBY+B7Cf2Aq/CcsU+6XoFH+EmseCKglFrU= -cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc h1:Goq6Yr8uc50qZpfqp5MpyEaTuCHQMK4BqeEQVjYYZAI= -cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc/go.mod h1:Da8bWbfy9n79GpD+uJmp2Tr9yVJMnW6ZsBFEV320LGA= +cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:uoN0jzr2RnlYa+JadOoBplSyZn5P+Gzg9X0h3n1Sslk= +cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:MV20QZ/hl80WF47E0YgRgInqswja+J5KN60mryo0uy0= cosmossdk.io/x/accounts/defaults/base v0.2.0-rc.1 h1:sVAOVQLbdmzLmjnWLhAhIN65HTmSMGBIwU2uTeSCEp0= cosmossdk.io/x/accounts/defaults/base v0.2.0-rc.1/go.mod h1:52PyilJMRraVwNcG58q4t7OSzSHApqNfJheq+mNB+qw= -cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc h1:FzZeSHquVbGt1jVWMoMbSzezACWYTqc2/IF1TBgy5Tw= -cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc/go.mod h1:EhCK34cu8/3xq2QhTiZHlOwNhogDdkRYsGPUVd+dJbE= -cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc h1:IxhkYAAsgNtsp7w/8IXfSRp9surZvC3Ufwvkgj7bJUU= -cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc/go.mod h1:WJRWc2MhW6sXZmUfXtKWD+iv+EEqHPd7n49BJ5I0Wkg= -cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc h1:bf1KqfINZ9Q53CFHq2UOfUunE/DoWaEsoDSf7fHbDLY= -cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc/go.mod h1:N8DGrZIqnkARCQbHVvqh8u7T+Hd1xD/bkrsNGdPxvE0= -cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc h1:20B2FnKP1Ai2AMVSRsMEraZByZGEsNM5WE0Pjw3TRYc= -cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc/go.mod h1:NLt9NZx5klYpumddH0OsWgiGuI34GZsrA/8i0ZbxCb4= -cosmossdk.io/x/circuit v0.0.0-20250114081937-a40ade9515cc h1:5ZcVmyrIvT4Xm0XAGD2plePRrwsIR43mMW3xMLvqfqY= -cosmossdk.io/x/circuit v0.0.0-20250114081937-a40ade9515cc/go.mod h1:mcKxPJn3ZTCYoi1RctY2CriZfYob0ywtkAmEmepVYnA= -cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc h1:xG6nuiJxlTBjOgSiYZMWFVhxSRrlhTB5TfdkdPVahRA= -cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc/go.mod h1:5kCiolDHF4KcOJJWff1Rh2di8qIxeDfZ7MVXiK2GHzw= -cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc h1:GZn8EuORFh0+2CAAsGBckJWzmWqoMteo5Ynlz4bDMso= -cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc/go.mod h1:a3uxiXMY6kBJvTkXg7GZ/9BEKSlZEjBB077a6bTAWh8= -cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc h1:ODu5HxrTM6k+cgi9gR7+86ChV21MY6N381viQkYBdOU= -cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc/go.mod h1:v00LNsY8uCwo8/UPLhHDjBIs4Qlv+k1zIwO+pvgXDMk= -cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc h1:dcEsAE1TY/Vs7vbPQhvvXSxJFaQjqcXKGN9dURChH7o= -cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc/go.mod h1:SdsQSe5M4UBD9yCmAEuCOLldku7vRtlH0X9ow9gOhHE= -cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc h1:z5yACW1q3V4uPyeWGNGv3issJIoObWs7RKyALTzFeVs= -cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc/go.mod h1:8zpIGgMWg0myA132LVxkoH5nw3H4eXsgFMn2IMwwXkQ= -cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc h1:dQrry7SOFr7SrvitCgfjUpQSs1cEaZ2YSZs7eJ8ycVY= -cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc/go.mod h1:Xlv6PCb7RiM1CPiGaJZcWuSf99PlhYsUZLy1umq+TYI= -cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc h1:ompjwcP9KnMPqoIHA2BQLcS4bXuSPNhbqU0O7KJ/dR0= -cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc/go.mod h1:eUbuvm6cdHXjNDw7pYUYUoApTLmE9lKl86DaTH99SC0= -cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc h1:LuBOnv3ICreY0WIPyMmC/FLJ+jzuS66taCZ0Pt6zNeo= -cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc/go.mod h1:vDUGAPHLgaTvzlap1IMPMDw/Fey96VoZtJVL5pdgUJo= -cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc h1:lFDGRICJV6JvdAUGsdj1repm6jSpzgp0+6O4WFeiMrA= -cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc/go.mod h1:6jXHqDdHwjxaECqs4f+5thfxVYyBGk0kGtoWX+1XS3I= -cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc h1:/I23bJrcijnQJCdnUBY4DnYO+1roA8Y4BO+k5Soxn8w= -cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc/go.mod h1:OjADzbWeEEe14x/gKzpezY/HV6koAU5W+zbLexZVt1o= -cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc h1:wfkVs39ay2hZT11+dueBrum8sHhmg2/SdxUj8A2cgiU= -cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc/go.mod h1:klc++uYJYhFpk1ewu9yJoR9WYhyB28b7wDTFhk4MwI8= -cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc h1:EepUEBoqHlVYQ6FfejBnSBChxSZNUKGbexZrnyXFzKM= -cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc/go.mod h1:6fnBzQWPbPIqsQ2aSyVciBKcWe2kRmX7dZ4sWxadByE= -cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc h1:roZIdSPBhOTEEba3s+adDJwaIiy7NoS4xVHps+K/Nig= -cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc/go.mod h1:f5TkweogtTV/568U6v1+56qfiRABZPNEUfMWfZvKvCw= +cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:1XP9EFtQsvnkOBs6yCv+QjbGy+pMTrT/J9KDvLIZsBs= +cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:JFGunxkINb3aDqOqOsMsvbxQYAg7Zldfxgq69Mzl584= +cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:JawcMKUABDT3CfbuxE4pUfvhjY966KIgrQtTRqL5100= +cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:1IrjaJtQ1DfN4jsQvZ19S2GtUZvX73wgbfwWSoJGGN8= +cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:Yj1kNCUo/f5nUcuLfwhORyIMi6pyiC/0IcVFAS1etX0= +cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:hdTGUIlF7yTWQ+6sDnWh7hZKt4QpG/vX/xCp8wpyEHg= +cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:+EUOaikqSD/nayYyUchQQZULtqzaSjY2UrdYjYV59GU= +cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:zSObZnbnKQyTzQ/VXV+WjR5p4F6X3ZqqTvE4v3pDvJc= +cosmossdk.io/x/circuit v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:th7QUjF+O42j6NhT2m9tK0WaekLBbeNW9NcSugGg6UQ= +cosmossdk.io/x/circuit v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:W5gM0N6JYntCX3nfsAsZxqpOkqVVsjRcOnqj5hC4yDw= +cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:CyMjnF3xNSGIdbeJI5TYbpHyMU5X5k1k4zkTn6oqkDs= +cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:PWu1EUCCs2uMDZAwQwNXCv0qsoEAZ7vvcTw8zcUDK8o= +cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:jSgnTV9g6s77yD2BL793E1Y5pvwDoPM6v3cXH2ROgG0= +cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Nw61zfixndwj5tXqdEWESzK1B05XiF1BTHLA/g5cmFI= +cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:SsZ0OLlH6ZA+qr1QxGrXhaZSKaj9JLFi1yhCvLn38GM= +cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:XjBLELrzfRXOD7r7M2duUthSz1nnTOZhAq4oBx9p/6c= +cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:wsK1nv9uwhIzjEWXAoBi/FRJlrQuDFdgd/sTh8aZFKg= +cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:BWre2SLNEF6aSeBxPdPBDCP8K0Rs1fIBLGzslryJ5oU= +cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:haaY94m4rycPEKnFPxdSEfKoyRTprRBaT6/YxyassOs= +cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:81DwKmsEXT2oUDc9EkqWTh6tR8PjE4A3R9mVcQhib38= +cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:NUt7wPynbg6wCu6ZaJmzVtuWJlGBGqDSi5/b4f7GLQ8= +cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:D27sWD5iK3gwLChwc7FLlR49lI7hWr44H+13DgIgYWE= +cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:vg9iabuEXvIG+8EnN+rviOoFPNY5BR6li7nvmWda700= +cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:g8QDPMq+y4Fq5j2/kPB91ZZqnNcKnP4aBrHigkqt7As= +cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:m60YGIQ4KgXGILYDzGZ2f8+ak/7lAMHmMDuEoKcSAck= +cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Ht29swG+6V6AdaBqTCjQ/Ij/VJ/YqLy9Cv1M9fcT1xA= +cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:e9IDOfn3SfuX0n8J78rKXD6pzLilEDVAWu1uZmP5xxs= +cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:6ML9Qz384qfrYEzGSF0rt0jvh9BbYbnzkObGEPUyEoE= +cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:IblAaDptrdGJgEGQBBFu3SmDJALe1n7wrLewMqJwzzw= +cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:C2Y+AwExUFRcmgoiYpMK/g4V5bVBx8Y0spvErODWnhg= +cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:L36WSYsihSK/Ma+Sb1XO07mnE4wHlOZjBEhu15UtwH8= +cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:aYqW53L5KY9xeXNfDC8zyeJCsxfKnFMdsipRLeIiG9c= +cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:zuTHxUXdW+YVho/SxcKVDUCQe3dpzYwlEk8G7QbDmjg= +cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:E51/hlkHDfdVpkh8I5jl9GY0IyiFSxxfIG+e28b18Ko= +cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:LLhaJy8ZunYAyk1F7QhgXL4CrzrRRGdpIyqN+Zp7TH8= +cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:UDqT4bbVaaz2+rv+FWi3MMEQQX8fsVTGBNnAf8Zs880= cosmossdk.io/x/tx v1.0.1 h1:PomaVlERYWxhki9RKX+uTE30eJkyqIQjxc7kw1DPXUk= cosmossdk.io/x/tx v1.0.1/go.mod h1:dwOSom2k2BJuGgnm9YXBeFII9gbHJGN/BHZBVCbZvPg= -cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc h1:7dpAdiFlLdG6l5R9W0nuWQKiCORXMl7Ophm7jDfne3Y= -cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc/go.mod h1:W4jA7b/LcBpeDhDelpw9YUbuvWPm459JQzLKd7c+c/Y= +cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:4aleuyrWA6Oo5M2jmlHn4k4vT1vxogqbbQH5yktqDUE= +cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Yzo7lGev8EHHtbcAkrI4Fc6L1jD3/VW3VxeHqXva24Y= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= @@ -278,8 +278,6 @@ github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bp github.com/DataDog/datadog-go v4.8.3+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.6 h1:LbEglqepa/ipmmQJUDnSsfvA8e8IStVcGaFWDuxvGOY= github.com/DataDog/zstd v1.5.6/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= -github.com/DimitrisJim/interchaintest/v9 v9.0.0-20241127135837-285cf3b21950 h1:/wk2s7Q3nWIRsBlPMSbIG4ozPmQuxdoZNfmBFBn+fEs= -github.com/DimitrisJim/interchaintest/v9 v9.0.0-20241127135837-285cf3b21950/go.mod h1:/6jnE/3C1tdH1mFseJDZfYf8PqUwTRY5PVf0tXuKqVE= github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e h1:ahyvB3q25YnZWly5Gq1ekg6jcmWaGj/vG/MhF4aisoc= github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e/go.mod h1:kGUqhHd//musdITWjFvNTHn90WG9bMLBEPQZ17Cmlpw= github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec h1:1Qb69mGp/UtRPn422BH4/Y4Q3SLUrD9KHuDkm8iodFc= @@ -395,8 +393,8 @@ github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNC github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw= 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.52.0-rc.1.0.20250114081937-a40ade9515cc h1:/qJ8rHesLP6EkS1hV9TVd0+vdZJBNBjLU3lvsX23CMA= -github.com/cosmos/cosmos-sdk v0.52.0-rc.1.0.20250114081937-a40ade9515cc/go.mod h1:v82qVB9SOdP2gzKaEqiYefzWvXY0d1epP0JHHEeevqY= +github.com/cosmos/cosmos-sdk v0.52.0-rc.2 h1:5TDP8I8H5V9cWqO34MvDKG8rFZh4VPEjSngRdAxuhbs= +github.com/cosmos/cosmos-sdk v0.52.0-rc.2/go.mod h1:udaDTtQ3FviEqSMjPIss0EbYOqOSbiHj/+BZ8ID/8zE= 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= @@ -471,6 +469,8 @@ github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8 github.com/getsentry/sentry-go v0.29.0 h1:YtWluuCFg9OfcqnaujpY918N/AhCCwarIDWOYSBAjCA= github.com/getsentry/sentry-go v0.29.0/go.mod h1:jhPesDAL0Q0W2+2YEuVOvdWmVtdsr1+jtBrlDEVWwLY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gjermundgaraba/interchaintest/v9 v9.0.0-20250124210659-93297de69a64 h1:xRtsAfUvG1toCQFzMEeV7bAI6bFy1WllDR0rW/GDsr8= +github.com/gjermundgaraba/interchaintest/v9 v9.0.0-20250124210659-93297de69a64/go.mod h1:VLAvDIAYfETur4iRgD0HDtkhRkhGHMQ4fjvuEiAYuPU= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -827,8 +827,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 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.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= -github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= @@ -957,8 +957,8 @@ go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZk go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= -go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= -go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= +go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= +go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= @@ -1468,8 +1468,8 @@ google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 h1:oLiyxGgE+rt22duwci1+TG7bg2/L1LQsXwfjPlmuJA0= google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142/go.mod h1:G11eXq53iI5Q+kyNOmCvnzBaxEA2Q/Ik5Tj7nqBE8j4= -google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g= -google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4= +google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a h1:OAiGFfOiA0v9MRYsSidp3ubZaBnteRUyn3xB2ZQ5G/E= +google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a/go.mod h1:jehYqy3+AhJU9ve55aNOaSml7wUXjF9x6z2LcCfpAhY= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -1507,8 +1507,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1525,8 +1525,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.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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= diff --git a/go.mod b/go.mod index e9541e0e4da..5292abbb785 100644 --- a/go.mod +++ b/go.mod @@ -44,15 +44,15 @@ require ( github.com/spf13/cast v1.7.1 github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.10.0 - google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 - google.golang.org/grpc v1.69.4 - google.golang.org/protobuf v1.36.3 + google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a + google.golang.org/grpc v1.70.0 + google.golang.org/protobuf v1.36.4 gopkg.in/yaml.v2 v2.4.0 ) require ( - buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1 // indirect - buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1 // indirect + buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1 // indirect + buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 // indirect cloud.google.com/go v0.115.1 // indirect cloud.google.com/go/auth v0.8.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect @@ -113,7 +113,6 @@ require ( github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.3 // indirect github.com/google/flatbuffers v24.3.25+incompatible // indirect @@ -170,7 +169,7 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.61.0 // indirect + github.com/prometheus/common v0.62.0 // 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.13.1 // indirect @@ -198,9 +197,10 @@ require ( go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/otel v1.31.0 // indirect - go.opentelemetry.io/otel/metric v1.31.0 // indirect - go.opentelemetry.io/otel/trace v1.31.0 // indirect + go.opentelemetry.io/otel v1.32.0 // indirect + go.opentelemetry.io/otel/metric v1.32.0 // indirect + go.opentelemetry.io/otel/trace v1.32.0 // indirect + go.uber.org/mock v0.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.12.0 // indirect golang.org/x/crypto v0.32.0 // indirect @@ -224,28 +224,29 @@ require ( replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 +//TODO: remove everything below after tags are created replace ( - cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc - cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/group => cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/params => cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc + cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/group => cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/params => cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e // pseudo version lower than the latest tag - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.1.0.20250114081937-a40ade9515cc + github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.2 ) diff --git a/go.sum b/go.sum index f06f576fbe0..a75917b2439 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1 h1:72N6FvGkvIAHJFuW6BFXCThbTS2qo/PlzQuw7wSjUi8= -buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1/go.mod h1:UJ1nx2WHcWAvKiaem512kYlHektAZJ/eNU032Pdar70= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1 h1:LFgdGZ+BzNqHWsndyRvvFE1450BBZ2nFtyNEGZ9NOSg= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1/go.mod h1:cuOHNO5SRU1J25UoI8VvPyi8dq9BpZb4gKa01Umx57Y= +buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1 h1:ka493q+UHMpnJHmWS5EqsvVnOQIKrCdO/2Jpzht4drc= +buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1/go.mod h1:mvIvtXjrqo1Rmpf+OUuHIVQpA6f9bezvxtZ1c1uo3a8= +buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 h1:t5a3Rfm5y1+U3gqSq9fd728bj7kL9Rq1oBBXgx2iaaE= +buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1/go.mod h1:tUkfiDbobvvm/uysw5gXCf0I+2eFtlo7pBTy+OTnzZc= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -194,8 +194,8 @@ cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1V cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= cosmossdk.io/api v0.8.2 h1:klzA1RODd9tTawJ2CbBd/34RV/cB9qtd9oJN6rcRqqg= cosmossdk.io/api v0.8.2/go.mod h1:XJUwQrihIDjErzs3+jm1zO/9KRzKf4HMjRzXC+l+Cio= -cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc h1:kdVRV1nKiiZjqhX81ex7oy5X+WLpmlJUp1MLOUZfhHo= -cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc/go.mod h1:o5kHjrWXvmFTLx6+ObaNWPyCAG7R6gmOXIm6ks9LE1c= +cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e h1:/ablega07LmBWeIZSGL/LnIKQw4s3gHxTNvpeJZchGk= +cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e/go.mod h1:aS+VVIJTrrpn70VqUA2c1DEiT93DVi63U7K26yXmQ68= cosmossdk.io/collections v1.0.0 h1:YCYIe/pIMtc1iLDD0OrVdfWCnIkpwdy7k9NSQpaR5mg= cosmossdk.io/collections v1.0.0/go.mod h1:mFfLxnYT1fV+B3Lx9GLap1qxmffIPqQCND4xBExerps= cosmossdk.io/core v1.0.0 h1:e7XBbISOytLBOXMVwpRPixThXqEkeLGlg8no/qpgS8U= @@ -214,48 +214,48 @@ cosmossdk.io/schema v1.0.0 h1:/diH4XJjpV1JQwuIozwr+A4uFuuwanFdnw2kKeiXwwQ= cosmossdk.io/schema v1.0.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43 h1:glZ6MpmD+5AhwJYV4jzx+rn7cgUB2owHgk9o+93luz0= cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43/go.mod h1:XCWpgfueHSBY+B7Cf2Aq/CcsU+6XoFH+EmseCKglFrU= -cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc h1:Goq6Yr8uc50qZpfqp5MpyEaTuCHQMK4BqeEQVjYYZAI= -cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc/go.mod h1:Da8bWbfy9n79GpD+uJmp2Tr9yVJMnW6ZsBFEV320LGA= +cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:uoN0jzr2RnlYa+JadOoBplSyZn5P+Gzg9X0h3n1Sslk= +cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:MV20QZ/hl80WF47E0YgRgInqswja+J5KN60mryo0uy0= cosmossdk.io/x/accounts/defaults/base v0.2.0-rc.1 h1:sVAOVQLbdmzLmjnWLhAhIN65HTmSMGBIwU2uTeSCEp0= cosmossdk.io/x/accounts/defaults/base v0.2.0-rc.1/go.mod h1:52PyilJMRraVwNcG58q4t7OSzSHApqNfJheq+mNB+qw= -cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc h1:FzZeSHquVbGt1jVWMoMbSzezACWYTqc2/IF1TBgy5Tw= -cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc/go.mod h1:EhCK34cu8/3xq2QhTiZHlOwNhogDdkRYsGPUVd+dJbE= -cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc h1:IxhkYAAsgNtsp7w/8IXfSRp9surZvC3Ufwvkgj7bJUU= -cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc/go.mod h1:WJRWc2MhW6sXZmUfXtKWD+iv+EEqHPd7n49BJ5I0Wkg= -cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc h1:bf1KqfINZ9Q53CFHq2UOfUunE/DoWaEsoDSf7fHbDLY= -cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc/go.mod h1:N8DGrZIqnkARCQbHVvqh8u7T+Hd1xD/bkrsNGdPxvE0= -cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc h1:20B2FnKP1Ai2AMVSRsMEraZByZGEsNM5WE0Pjw3TRYc= -cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc/go.mod h1:NLt9NZx5klYpumddH0OsWgiGuI34GZsrA/8i0ZbxCb4= -cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc h1:xG6nuiJxlTBjOgSiYZMWFVhxSRrlhTB5TfdkdPVahRA= -cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc/go.mod h1:5kCiolDHF4KcOJJWff1Rh2di8qIxeDfZ7MVXiK2GHzw= -cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc h1:GZn8EuORFh0+2CAAsGBckJWzmWqoMteo5Ynlz4bDMso= -cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc/go.mod h1:a3uxiXMY6kBJvTkXg7GZ/9BEKSlZEjBB077a6bTAWh8= -cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc h1:ODu5HxrTM6k+cgi9gR7+86ChV21MY6N381viQkYBdOU= -cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc/go.mod h1:v00LNsY8uCwo8/UPLhHDjBIs4Qlv+k1zIwO+pvgXDMk= -cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc h1:dcEsAE1TY/Vs7vbPQhvvXSxJFaQjqcXKGN9dURChH7o= -cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc/go.mod h1:SdsQSe5M4UBD9yCmAEuCOLldku7vRtlH0X9ow9gOhHE= -cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc h1:z5yACW1q3V4uPyeWGNGv3issJIoObWs7RKyALTzFeVs= -cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc/go.mod h1:8zpIGgMWg0myA132LVxkoH5nw3H4eXsgFMn2IMwwXkQ= -cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc h1:dQrry7SOFr7SrvitCgfjUpQSs1cEaZ2YSZs7eJ8ycVY= -cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc/go.mod h1:Xlv6PCb7RiM1CPiGaJZcWuSf99PlhYsUZLy1umq+TYI= -cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc h1:ompjwcP9KnMPqoIHA2BQLcS4bXuSPNhbqU0O7KJ/dR0= -cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc/go.mod h1:eUbuvm6cdHXjNDw7pYUYUoApTLmE9lKl86DaTH99SC0= -cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc h1:LuBOnv3ICreY0WIPyMmC/FLJ+jzuS66taCZ0Pt6zNeo= -cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc/go.mod h1:vDUGAPHLgaTvzlap1IMPMDw/Fey96VoZtJVL5pdgUJo= -cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc h1:lFDGRICJV6JvdAUGsdj1repm6jSpzgp0+6O4WFeiMrA= -cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc/go.mod h1:6jXHqDdHwjxaECqs4f+5thfxVYyBGk0kGtoWX+1XS3I= -cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc h1:/I23bJrcijnQJCdnUBY4DnYO+1roA8Y4BO+k5Soxn8w= -cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc/go.mod h1:OjADzbWeEEe14x/gKzpezY/HV6koAU5W+zbLexZVt1o= -cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc h1:wfkVs39ay2hZT11+dueBrum8sHhmg2/SdxUj8A2cgiU= -cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc/go.mod h1:klc++uYJYhFpk1ewu9yJoR9WYhyB28b7wDTFhk4MwI8= -cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc h1:EepUEBoqHlVYQ6FfejBnSBChxSZNUKGbexZrnyXFzKM= -cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc/go.mod h1:6fnBzQWPbPIqsQ2aSyVciBKcWe2kRmX7dZ4sWxadByE= -cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc h1:roZIdSPBhOTEEba3s+adDJwaIiy7NoS4xVHps+K/Nig= -cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc/go.mod h1:f5TkweogtTV/568U6v1+56qfiRABZPNEUfMWfZvKvCw= +cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:1XP9EFtQsvnkOBs6yCv+QjbGy+pMTrT/J9KDvLIZsBs= +cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:JFGunxkINb3aDqOqOsMsvbxQYAg7Zldfxgq69Mzl584= +cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:JawcMKUABDT3CfbuxE4pUfvhjY966KIgrQtTRqL5100= +cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:1IrjaJtQ1DfN4jsQvZ19S2GtUZvX73wgbfwWSoJGGN8= +cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:Yj1kNCUo/f5nUcuLfwhORyIMi6pyiC/0IcVFAS1etX0= +cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:hdTGUIlF7yTWQ+6sDnWh7hZKt4QpG/vX/xCp8wpyEHg= +cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:+EUOaikqSD/nayYyUchQQZULtqzaSjY2UrdYjYV59GU= +cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:zSObZnbnKQyTzQ/VXV+WjR5p4F6X3ZqqTvE4v3pDvJc= +cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:CyMjnF3xNSGIdbeJI5TYbpHyMU5X5k1k4zkTn6oqkDs= +cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:PWu1EUCCs2uMDZAwQwNXCv0qsoEAZ7vvcTw8zcUDK8o= +cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:jSgnTV9g6s77yD2BL793E1Y5pvwDoPM6v3cXH2ROgG0= +cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Nw61zfixndwj5tXqdEWESzK1B05XiF1BTHLA/g5cmFI= +cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:SsZ0OLlH6ZA+qr1QxGrXhaZSKaj9JLFi1yhCvLn38GM= +cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:XjBLELrzfRXOD7r7M2duUthSz1nnTOZhAq4oBx9p/6c= +cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:wsK1nv9uwhIzjEWXAoBi/FRJlrQuDFdgd/sTh8aZFKg= +cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:BWre2SLNEF6aSeBxPdPBDCP8K0Rs1fIBLGzslryJ5oU= +cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:haaY94m4rycPEKnFPxdSEfKoyRTprRBaT6/YxyassOs= +cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:81DwKmsEXT2oUDc9EkqWTh6tR8PjE4A3R9mVcQhib38= +cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:NUt7wPynbg6wCu6ZaJmzVtuWJlGBGqDSi5/b4f7GLQ8= +cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:D27sWD5iK3gwLChwc7FLlR49lI7hWr44H+13DgIgYWE= +cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:vg9iabuEXvIG+8EnN+rviOoFPNY5BR6li7nvmWda700= +cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:g8QDPMq+y4Fq5j2/kPB91ZZqnNcKnP4aBrHigkqt7As= +cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:m60YGIQ4KgXGILYDzGZ2f8+ak/7lAMHmMDuEoKcSAck= +cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Ht29swG+6V6AdaBqTCjQ/Ij/VJ/YqLy9Cv1M9fcT1xA= +cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:e9IDOfn3SfuX0n8J78rKXD6pzLilEDVAWu1uZmP5xxs= +cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:6ML9Qz384qfrYEzGSF0rt0jvh9BbYbnzkObGEPUyEoE= +cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:IblAaDptrdGJgEGQBBFu3SmDJALe1n7wrLewMqJwzzw= +cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:C2Y+AwExUFRcmgoiYpMK/g4V5bVBx8Y0spvErODWnhg= +cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:L36WSYsihSK/Ma+Sb1XO07mnE4wHlOZjBEhu15UtwH8= +cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:aYqW53L5KY9xeXNfDC8zyeJCsxfKnFMdsipRLeIiG9c= +cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:zuTHxUXdW+YVho/SxcKVDUCQe3dpzYwlEk8G7QbDmjg= +cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:E51/hlkHDfdVpkh8I5jl9GY0IyiFSxxfIG+e28b18Ko= +cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:LLhaJy8ZunYAyk1F7QhgXL4CrzrRRGdpIyqN+Zp7TH8= +cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:UDqT4bbVaaz2+rv+FWi3MMEQQX8fsVTGBNnAf8Zs880= cosmossdk.io/x/tx v1.0.1 h1:PomaVlERYWxhki9RKX+uTE30eJkyqIQjxc7kw1DPXUk= cosmossdk.io/x/tx v1.0.1/go.mod h1:dwOSom2k2BJuGgnm9YXBeFII9gbHJGN/BHZBVCbZvPg= -cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc h1:7dpAdiFlLdG6l5R9W0nuWQKiCORXMl7Ophm7jDfne3Y= -cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc/go.mod h1:W4jA7b/LcBpeDhDelpw9YUbuvWPm459JQzLKd7c+c/Y= +cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:4aleuyrWA6Oo5M2jmlHn4k4vT1vxogqbbQH5yktqDUE= +cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Yzo7lGev8EHHtbcAkrI4Fc6L1jD3/VW3VxeHqXva24Y= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= @@ -375,8 +375,8 @@ github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNC github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw= 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.52.0-rc.1.0.20250114081937-a40ade9515cc h1:/qJ8rHesLP6EkS1hV9TVd0+vdZJBNBjLU3lvsX23CMA= -github.com/cosmos/cosmos-sdk v0.52.0-rc.1.0.20250114081937-a40ade9515cc/go.mod h1:v82qVB9SOdP2gzKaEqiYefzWvXY0d1epP0JHHEeevqY= +github.com/cosmos/cosmos-sdk v0.52.0-rc.2 h1:5TDP8I8H5V9cWqO34MvDKG8rFZh4VPEjSngRdAxuhbs= +github.com/cosmos/cosmos-sdk v0.52.0-rc.2/go.mod h1:udaDTtQ3FviEqSMjPIss0EbYOqOSbiHj/+BZ8ID/8zE= 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= @@ -787,8 +787,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 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.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= -github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= @@ -896,16 +896,16 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.5 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= -go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= -go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= -go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= -go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= -go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= -go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= -go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= -go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= -go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= +go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= +go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= +go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= +go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= +go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= +go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= +go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= +go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= +go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= +go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= @@ -1402,8 +1402,8 @@ google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 h1:oLiyxGgE+rt22duwci1+TG7bg2/L1LQsXwfjPlmuJA0= google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142/go.mod h1:G11eXq53iI5Q+kyNOmCvnzBaxEA2Q/Ik5Tj7nqBE8j4= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4= +google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a h1:OAiGFfOiA0v9MRYsSidp3ubZaBnteRUyn3xB2ZQ5G/E= +google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a/go.mod h1:jehYqy3+AhJU9ve55aNOaSml7wUXjF9x6z2LcCfpAhY= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -1441,8 +1441,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1459,8 +1459,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.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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= diff --git a/modules/apps/29-fee/module.go b/modules/apps/29-fee/module.go index 88dc1959c77..fbef3e57062 100644 --- a/modules/apps/29-fee/module.go +++ b/modules/apps/29-fee/module.go @@ -15,6 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/cosmos/ibc-go/v9/modules/apps/29-fee/client/cli" "github.com/cosmos/ibc-go/v9/modules/apps/29-fee/keeper" "github.com/cosmos/ibc-go/v9/modules/apps/29-fee/types" diff --git a/modules/apps/callbacks/go.mod b/modules/apps/callbacks/go.mod index bf580756775..01cc52cb0cf 100644 --- a/modules/apps/callbacks/go.mod +++ b/modules/apps/callbacks/go.mod @@ -40,8 +40,8 @@ require ( ) require ( - buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1 // indirect - buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1 // indirect + buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1 // indirect + buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 // indirect cloud.google.com/go v0.115.1 // indirect cloud.google.com/go/auth v0.8.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect @@ -110,7 +110,6 @@ require ( github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.3 // indirect @@ -169,7 +168,7 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.61.0 // indirect + github.com/prometheus/common v0.62.0 // 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.13.1 // indirect @@ -198,9 +197,10 @@ require ( go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/otel v1.31.0 // indirect - go.opentelemetry.io/otel/metric v1.31.0 // indirect - go.opentelemetry.io/otel/trace v1.31.0 // indirect + go.opentelemetry.io/otel v1.32.0 // indirect + go.opentelemetry.io/otel/metric v1.32.0 // indirect + go.opentelemetry.io/otel/trace v1.32.0 // indirect + go.uber.org/mock v0.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.12.0 // indirect golang.org/x/crypto v0.32.0 // indirect @@ -214,10 +214,10 @@ require ( golang.org/x/time v0.6.0 // indirect google.golang.org/api v0.192.0 // indirect google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // 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 @@ -226,28 +226,29 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) +//TODO: remove everything below after tags are created replace ( - cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc - cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/group => cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/params => cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc + cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/group => cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/params => cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e // pseudo version lower than the latest tag - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.1.0.20250114081937-a40ade9515cc + github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.2 ) diff --git a/modules/apps/callbacks/go.sum b/modules/apps/callbacks/go.sum index 5d5fd15cb50..902c9130688 100644 --- a/modules/apps/callbacks/go.sum +++ b/modules/apps/callbacks/go.sum @@ -1,7 +1,7 @@ -buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1 h1:72N6FvGkvIAHJFuW6BFXCThbTS2qo/PlzQuw7wSjUi8= -buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1/go.mod h1:UJ1nx2WHcWAvKiaem512kYlHektAZJ/eNU032Pdar70= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1 h1:LFgdGZ+BzNqHWsndyRvvFE1450BBZ2nFtyNEGZ9NOSg= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1/go.mod h1:cuOHNO5SRU1J25UoI8VvPyi8dq9BpZb4gKa01Umx57Y= +buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1 h1:ka493q+UHMpnJHmWS5EqsvVnOQIKrCdO/2Jpzht4drc= +buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1/go.mod h1:mvIvtXjrqo1Rmpf+OUuHIVQpA6f9bezvxtZ1c1uo3a8= +buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 h1:t5a3Rfm5y1+U3gqSq9fd728bj7kL9Rq1oBBXgx2iaaE= +buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1/go.mod h1:tUkfiDbobvvm/uysw5gXCf0I+2eFtlo7pBTy+OTnzZc= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -194,8 +194,8 @@ cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1V cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= cosmossdk.io/api v0.8.2 h1:klzA1RODd9tTawJ2CbBd/34RV/cB9qtd9oJN6rcRqqg= cosmossdk.io/api v0.8.2/go.mod h1:XJUwQrihIDjErzs3+jm1zO/9KRzKf4HMjRzXC+l+Cio= -cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc h1:kdVRV1nKiiZjqhX81ex7oy5X+WLpmlJUp1MLOUZfhHo= -cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc/go.mod h1:o5kHjrWXvmFTLx6+ObaNWPyCAG7R6gmOXIm6ks9LE1c= +cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e h1:/ablega07LmBWeIZSGL/LnIKQw4s3gHxTNvpeJZchGk= +cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e/go.mod h1:aS+VVIJTrrpn70VqUA2c1DEiT93DVi63U7K26yXmQ68= cosmossdk.io/collections v1.0.0 h1:YCYIe/pIMtc1iLDD0OrVdfWCnIkpwdy7k9NSQpaR5mg= cosmossdk.io/collections v1.0.0/go.mod h1:mFfLxnYT1fV+B3Lx9GLap1qxmffIPqQCND4xBExerps= cosmossdk.io/core v1.0.0 h1:e7XBbISOytLBOXMVwpRPixThXqEkeLGlg8no/qpgS8U= @@ -214,48 +214,48 @@ cosmossdk.io/schema v1.0.0 h1:/diH4XJjpV1JQwuIozwr+A4uFuuwanFdnw2kKeiXwwQ= cosmossdk.io/schema v1.0.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43 h1:glZ6MpmD+5AhwJYV4jzx+rn7cgUB2owHgk9o+93luz0= cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43/go.mod h1:XCWpgfueHSBY+B7Cf2Aq/CcsU+6XoFH+EmseCKglFrU= -cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc h1:Goq6Yr8uc50qZpfqp5MpyEaTuCHQMK4BqeEQVjYYZAI= -cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc/go.mod h1:Da8bWbfy9n79GpD+uJmp2Tr9yVJMnW6ZsBFEV320LGA= +cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:uoN0jzr2RnlYa+JadOoBplSyZn5P+Gzg9X0h3n1Sslk= +cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:MV20QZ/hl80WF47E0YgRgInqswja+J5KN60mryo0uy0= cosmossdk.io/x/accounts/defaults/base v0.2.0-rc.1 h1:sVAOVQLbdmzLmjnWLhAhIN65HTmSMGBIwU2uTeSCEp0= cosmossdk.io/x/accounts/defaults/base v0.2.0-rc.1/go.mod h1:52PyilJMRraVwNcG58q4t7OSzSHApqNfJheq+mNB+qw= -cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc h1:FzZeSHquVbGt1jVWMoMbSzezACWYTqc2/IF1TBgy5Tw= -cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc/go.mod h1:EhCK34cu8/3xq2QhTiZHlOwNhogDdkRYsGPUVd+dJbE= -cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc h1:IxhkYAAsgNtsp7w/8IXfSRp9surZvC3Ufwvkgj7bJUU= -cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc/go.mod h1:WJRWc2MhW6sXZmUfXtKWD+iv+EEqHPd7n49BJ5I0Wkg= -cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc h1:bf1KqfINZ9Q53CFHq2UOfUunE/DoWaEsoDSf7fHbDLY= -cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc/go.mod h1:N8DGrZIqnkARCQbHVvqh8u7T+Hd1xD/bkrsNGdPxvE0= -cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc h1:20B2FnKP1Ai2AMVSRsMEraZByZGEsNM5WE0Pjw3TRYc= -cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc/go.mod h1:NLt9NZx5klYpumddH0OsWgiGuI34GZsrA/8i0ZbxCb4= -cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc h1:xG6nuiJxlTBjOgSiYZMWFVhxSRrlhTB5TfdkdPVahRA= -cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc/go.mod h1:5kCiolDHF4KcOJJWff1Rh2di8qIxeDfZ7MVXiK2GHzw= -cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc h1:GZn8EuORFh0+2CAAsGBckJWzmWqoMteo5Ynlz4bDMso= -cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc/go.mod h1:a3uxiXMY6kBJvTkXg7GZ/9BEKSlZEjBB077a6bTAWh8= -cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc h1:ODu5HxrTM6k+cgi9gR7+86ChV21MY6N381viQkYBdOU= -cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc/go.mod h1:v00LNsY8uCwo8/UPLhHDjBIs4Qlv+k1zIwO+pvgXDMk= -cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc h1:dcEsAE1TY/Vs7vbPQhvvXSxJFaQjqcXKGN9dURChH7o= -cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc/go.mod h1:SdsQSe5M4UBD9yCmAEuCOLldku7vRtlH0X9ow9gOhHE= -cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc h1:z5yACW1q3V4uPyeWGNGv3issJIoObWs7RKyALTzFeVs= -cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc/go.mod h1:8zpIGgMWg0myA132LVxkoH5nw3H4eXsgFMn2IMwwXkQ= -cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc h1:dQrry7SOFr7SrvitCgfjUpQSs1cEaZ2YSZs7eJ8ycVY= -cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc/go.mod h1:Xlv6PCb7RiM1CPiGaJZcWuSf99PlhYsUZLy1umq+TYI= -cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc h1:ompjwcP9KnMPqoIHA2BQLcS4bXuSPNhbqU0O7KJ/dR0= -cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc/go.mod h1:eUbuvm6cdHXjNDw7pYUYUoApTLmE9lKl86DaTH99SC0= -cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc h1:LuBOnv3ICreY0WIPyMmC/FLJ+jzuS66taCZ0Pt6zNeo= -cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc/go.mod h1:vDUGAPHLgaTvzlap1IMPMDw/Fey96VoZtJVL5pdgUJo= -cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc h1:lFDGRICJV6JvdAUGsdj1repm6jSpzgp0+6O4WFeiMrA= -cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc/go.mod h1:6jXHqDdHwjxaECqs4f+5thfxVYyBGk0kGtoWX+1XS3I= -cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc h1:/I23bJrcijnQJCdnUBY4DnYO+1roA8Y4BO+k5Soxn8w= -cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc/go.mod h1:OjADzbWeEEe14x/gKzpezY/HV6koAU5W+zbLexZVt1o= -cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc h1:wfkVs39ay2hZT11+dueBrum8sHhmg2/SdxUj8A2cgiU= -cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc/go.mod h1:klc++uYJYhFpk1ewu9yJoR9WYhyB28b7wDTFhk4MwI8= -cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc h1:EepUEBoqHlVYQ6FfejBnSBChxSZNUKGbexZrnyXFzKM= -cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc/go.mod h1:6fnBzQWPbPIqsQ2aSyVciBKcWe2kRmX7dZ4sWxadByE= -cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc h1:roZIdSPBhOTEEba3s+adDJwaIiy7NoS4xVHps+K/Nig= -cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc/go.mod h1:f5TkweogtTV/568U6v1+56qfiRABZPNEUfMWfZvKvCw= +cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:1XP9EFtQsvnkOBs6yCv+QjbGy+pMTrT/J9KDvLIZsBs= +cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:JFGunxkINb3aDqOqOsMsvbxQYAg7Zldfxgq69Mzl584= +cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:JawcMKUABDT3CfbuxE4pUfvhjY966KIgrQtTRqL5100= +cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:1IrjaJtQ1DfN4jsQvZ19S2GtUZvX73wgbfwWSoJGGN8= +cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:Yj1kNCUo/f5nUcuLfwhORyIMi6pyiC/0IcVFAS1etX0= +cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:hdTGUIlF7yTWQ+6sDnWh7hZKt4QpG/vX/xCp8wpyEHg= +cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:+EUOaikqSD/nayYyUchQQZULtqzaSjY2UrdYjYV59GU= +cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:zSObZnbnKQyTzQ/VXV+WjR5p4F6X3ZqqTvE4v3pDvJc= +cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:CyMjnF3xNSGIdbeJI5TYbpHyMU5X5k1k4zkTn6oqkDs= +cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:PWu1EUCCs2uMDZAwQwNXCv0qsoEAZ7vvcTw8zcUDK8o= +cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:jSgnTV9g6s77yD2BL793E1Y5pvwDoPM6v3cXH2ROgG0= +cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Nw61zfixndwj5tXqdEWESzK1B05XiF1BTHLA/g5cmFI= +cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:SsZ0OLlH6ZA+qr1QxGrXhaZSKaj9JLFi1yhCvLn38GM= +cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:XjBLELrzfRXOD7r7M2duUthSz1nnTOZhAq4oBx9p/6c= +cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:wsK1nv9uwhIzjEWXAoBi/FRJlrQuDFdgd/sTh8aZFKg= +cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:BWre2SLNEF6aSeBxPdPBDCP8K0Rs1fIBLGzslryJ5oU= +cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:haaY94m4rycPEKnFPxdSEfKoyRTprRBaT6/YxyassOs= +cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:81DwKmsEXT2oUDc9EkqWTh6tR8PjE4A3R9mVcQhib38= +cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:NUt7wPynbg6wCu6ZaJmzVtuWJlGBGqDSi5/b4f7GLQ8= +cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:D27sWD5iK3gwLChwc7FLlR49lI7hWr44H+13DgIgYWE= +cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:vg9iabuEXvIG+8EnN+rviOoFPNY5BR6li7nvmWda700= +cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:g8QDPMq+y4Fq5j2/kPB91ZZqnNcKnP4aBrHigkqt7As= +cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:m60YGIQ4KgXGILYDzGZ2f8+ak/7lAMHmMDuEoKcSAck= +cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Ht29swG+6V6AdaBqTCjQ/Ij/VJ/YqLy9Cv1M9fcT1xA= +cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:e9IDOfn3SfuX0n8J78rKXD6pzLilEDVAWu1uZmP5xxs= +cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:6ML9Qz384qfrYEzGSF0rt0jvh9BbYbnzkObGEPUyEoE= +cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:IblAaDptrdGJgEGQBBFu3SmDJALe1n7wrLewMqJwzzw= +cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:C2Y+AwExUFRcmgoiYpMK/g4V5bVBx8Y0spvErODWnhg= +cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:L36WSYsihSK/Ma+Sb1XO07mnE4wHlOZjBEhu15UtwH8= +cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:aYqW53L5KY9xeXNfDC8zyeJCsxfKnFMdsipRLeIiG9c= +cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:zuTHxUXdW+YVho/SxcKVDUCQe3dpzYwlEk8G7QbDmjg= +cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:E51/hlkHDfdVpkh8I5jl9GY0IyiFSxxfIG+e28b18Ko= +cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:LLhaJy8ZunYAyk1F7QhgXL4CrzrRRGdpIyqN+Zp7TH8= +cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:UDqT4bbVaaz2+rv+FWi3MMEQQX8fsVTGBNnAf8Zs880= cosmossdk.io/x/tx v1.0.1 h1:PomaVlERYWxhki9RKX+uTE30eJkyqIQjxc7kw1DPXUk= cosmossdk.io/x/tx v1.0.1/go.mod h1:dwOSom2k2BJuGgnm9YXBeFII9gbHJGN/BHZBVCbZvPg= -cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc h1:7dpAdiFlLdG6l5R9W0nuWQKiCORXMl7Ophm7jDfne3Y= -cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc/go.mod h1:W4jA7b/LcBpeDhDelpw9YUbuvWPm459JQzLKd7c+c/Y= +cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:4aleuyrWA6Oo5M2jmlHn4k4vT1vxogqbbQH5yktqDUE= +cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Yzo7lGev8EHHtbcAkrI4Fc6L1jD3/VW3VxeHqXva24Y= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= @@ -375,8 +375,8 @@ github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNC github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw= 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.52.0-rc.1.0.20250114081937-a40ade9515cc h1:/qJ8rHesLP6EkS1hV9TVd0+vdZJBNBjLU3lvsX23CMA= -github.com/cosmos/cosmos-sdk v0.52.0-rc.1.0.20250114081937-a40ade9515cc/go.mod h1:v82qVB9SOdP2gzKaEqiYefzWvXY0d1epP0JHHEeevqY= +github.com/cosmos/cosmos-sdk v0.52.0-rc.2 h1:5TDP8I8H5V9cWqO34MvDKG8rFZh4VPEjSngRdAxuhbs= +github.com/cosmos/cosmos-sdk v0.52.0-rc.2/go.mod h1:udaDTtQ3FviEqSMjPIss0EbYOqOSbiHj/+BZ8ID/8zE= 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= @@ -785,8 +785,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 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.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= -github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= @@ -894,16 +894,16 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.5 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= -go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= -go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= -go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= -go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= -go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= -go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= -go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= -go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= -go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= +go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= +go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= +go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= +go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= +go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= +go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= +go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= +go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= +go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= +go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= @@ -1398,8 +1398,8 @@ google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 h1:oLiyxGgE+rt22duwci1+TG7bg2/L1LQsXwfjPlmuJA0= google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142/go.mod h1:G11eXq53iI5Q+kyNOmCvnzBaxEA2Q/Ik5Tj7nqBE8j4= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4= +google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a h1:OAiGFfOiA0v9MRYsSidp3ubZaBnteRUyn3xB2ZQ5G/E= +google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a/go.mod h1:jehYqy3+AhJU9ve55aNOaSml7wUXjF9x6z2LcCfpAhY= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -1437,8 +1437,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1455,8 +1455,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.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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= diff --git a/modules/light-clients/06-solomachine/proof.go b/modules/light-clients/06-solomachine/proof.go index 3a3a3cc3d2f..11b08a78248 100644 --- a/modules/light-clients/06-solomachine/proof.go +++ b/modules/light-clients/06-solomachine/proof.go @@ -1,6 +1,7 @@ package solomachine import ( + apisigning "cosmossdk.io/api/cosmos/tx/signing/v1beta1" errorsmod "cosmossdk.io/errors" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" @@ -23,7 +24,7 @@ func VerifySignature(pubKey cryptotypes.PubKey, signBytes []byte, sigData signin // The function supplied fulfills the VerifyMultisignature interface. No special // adjustments need to be made to the sign bytes based on the sign mode. - if err := pubKey.VerifyMultisignature(func(signing.SignMode) ([]byte, error) { + if err := pubKey.VerifyMultisignature(func(apisigning.SignMode) ([]byte, error) { return signBytes, nil }, data); err != nil { return errorsmod.Wrapf(ErrSignatureVerificationFailed, "failed to verify multisignature: %s", err.Error()) diff --git a/modules/light-clients/08-wasm/go.mod b/modules/light-clients/08-wasm/go.mod index eb15df5f13f..a9cd3194f28 100644 --- a/modules/light-clients/08-wasm/go.mod +++ b/modules/light-clients/08-wasm/go.mod @@ -47,13 +47,13 @@ require ( github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.10.0 - google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 - google.golang.org/grpc v1.69.4 + google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a + google.golang.org/grpc v1.70.0 ) require ( - buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1 // indirect - buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1 // indirect + buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1 // indirect + buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 // indirect cloud.google.com/go v0.115.1 // indirect cloud.google.com/go/auth v0.8.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect @@ -118,7 +118,6 @@ require ( github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.3 // indirect github.com/google/flatbuffers v24.3.25+incompatible // indirect @@ -179,7 +178,7 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.61.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rivo/uniseg v0.2.0 // indirect @@ -208,9 +207,10 @@ require ( go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/otel v1.31.0 // indirect - go.opentelemetry.io/otel/metric v1.31.0 // indirect - go.opentelemetry.io/otel/trace v1.31.0 // indirect + go.opentelemetry.io/otel v1.32.0 // indirect + go.opentelemetry.io/otel/metric v1.32.0 // indirect + go.opentelemetry.io/otel/trace v1.32.0 // indirect + go.uber.org/mock v0.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.12.0 // indirect golang.org/x/crypto v0.32.0 // indirect @@ -225,7 +225,7 @@ require ( google.golang.org/api v0.192.0 // indirect google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/protobuf v1.36.4 // 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 @@ -243,27 +243,27 @@ replace github.com/cosmos/ibc-go/modules/capability => ../../capability //TODO: remove everything below after tags are created replace ( - cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc - cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/group => cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/params => cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc + cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/group => cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/params => cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e // pseudo version lower than the latest tag - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.1.0.20250114081937-a40ade9515cc + github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.2 ) diff --git a/modules/light-clients/08-wasm/go.sum b/modules/light-clients/08-wasm/go.sum index a9bcc2c8de2..9e66bd40693 100644 --- a/modules/light-clients/08-wasm/go.sum +++ b/modules/light-clients/08-wasm/go.sum @@ -1,7 +1,7 @@ -buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1 h1:72N6FvGkvIAHJFuW6BFXCThbTS2qo/PlzQuw7wSjUi8= -buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1/go.mod h1:UJ1nx2WHcWAvKiaem512kYlHektAZJ/eNU032Pdar70= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1 h1:LFgdGZ+BzNqHWsndyRvvFE1450BBZ2nFtyNEGZ9NOSg= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1/go.mod h1:cuOHNO5SRU1J25UoI8VvPyi8dq9BpZb4gKa01Umx57Y= +buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1 h1:ka493q+UHMpnJHmWS5EqsvVnOQIKrCdO/2Jpzht4drc= +buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1/go.mod h1:mvIvtXjrqo1Rmpf+OUuHIVQpA6f9bezvxtZ1c1uo3a8= +buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 h1:t5a3Rfm5y1+U3gqSq9fd728bj7kL9Rq1oBBXgx2iaaE= +buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1/go.mod h1:tUkfiDbobvvm/uysw5gXCf0I+2eFtlo7pBTy+OTnzZc= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -194,8 +194,8 @@ cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1V cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= cosmossdk.io/api v0.8.2 h1:klzA1RODd9tTawJ2CbBd/34RV/cB9qtd9oJN6rcRqqg= cosmossdk.io/api v0.8.2/go.mod h1:XJUwQrihIDjErzs3+jm1zO/9KRzKf4HMjRzXC+l+Cio= -cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc h1:kdVRV1nKiiZjqhX81ex7oy5X+WLpmlJUp1MLOUZfhHo= -cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc/go.mod h1:o5kHjrWXvmFTLx6+ObaNWPyCAG7R6gmOXIm6ks9LE1c= +cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e h1:/ablega07LmBWeIZSGL/LnIKQw4s3gHxTNvpeJZchGk= +cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e/go.mod h1:aS+VVIJTrrpn70VqUA2c1DEiT93DVi63U7K26yXmQ68= cosmossdk.io/collections v1.0.0 h1:YCYIe/pIMtc1iLDD0OrVdfWCnIkpwdy7k9NSQpaR5mg= cosmossdk.io/collections v1.0.0/go.mod h1:mFfLxnYT1fV+B3Lx9GLap1qxmffIPqQCND4xBExerps= cosmossdk.io/core v1.0.0 h1:e7XBbISOytLBOXMVwpRPixThXqEkeLGlg8no/qpgS8U= @@ -216,50 +216,50 @@ cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43 h1:glZ6MpmD+5AhwJY cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43/go.mod h1:XCWpgfueHSBY+B7Cf2Aq/CcsU+6XoFH+EmseCKglFrU= cosmossdk.io/tools/confix v0.1.2 h1:2hoM1oFCNisd0ltSAAZw2i4ponARPmlhuNu3yy0VwI4= cosmossdk.io/tools/confix v0.1.2/go.mod h1:7XfcbK9sC/KNgVGxgLM0BrFbVcR/+6Dg7MFfpx7duYo= -cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc h1:Goq6Yr8uc50qZpfqp5MpyEaTuCHQMK4BqeEQVjYYZAI= -cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc/go.mod h1:Da8bWbfy9n79GpD+uJmp2Tr9yVJMnW6ZsBFEV320LGA= +cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:uoN0jzr2RnlYa+JadOoBplSyZn5P+Gzg9X0h3n1Sslk= +cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:MV20QZ/hl80WF47E0YgRgInqswja+J5KN60mryo0uy0= cosmossdk.io/x/accounts/defaults/base v0.2.0-rc.1 h1:sVAOVQLbdmzLmjnWLhAhIN65HTmSMGBIwU2uTeSCEp0= cosmossdk.io/x/accounts/defaults/base v0.2.0-rc.1/go.mod h1:52PyilJMRraVwNcG58q4t7OSzSHApqNfJheq+mNB+qw= -cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc h1:FzZeSHquVbGt1jVWMoMbSzezACWYTqc2/IF1TBgy5Tw= -cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc/go.mod h1:EhCK34cu8/3xq2QhTiZHlOwNhogDdkRYsGPUVd+dJbE= -cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc h1:IxhkYAAsgNtsp7w/8IXfSRp9surZvC3Ufwvkgj7bJUU= -cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc/go.mod h1:WJRWc2MhW6sXZmUfXtKWD+iv+EEqHPd7n49BJ5I0Wkg= -cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc h1:bf1KqfINZ9Q53CFHq2UOfUunE/DoWaEsoDSf7fHbDLY= -cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc/go.mod h1:N8DGrZIqnkARCQbHVvqh8u7T+Hd1xD/bkrsNGdPxvE0= -cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc h1:20B2FnKP1Ai2AMVSRsMEraZByZGEsNM5WE0Pjw3TRYc= -cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc/go.mod h1:NLt9NZx5klYpumddH0OsWgiGuI34GZsrA/8i0ZbxCb4= -cosmossdk.io/x/circuit v0.0.0-20250114081937-a40ade9515cc h1:5ZcVmyrIvT4Xm0XAGD2plePRrwsIR43mMW3xMLvqfqY= -cosmossdk.io/x/circuit v0.0.0-20250114081937-a40ade9515cc/go.mod h1:mcKxPJn3ZTCYoi1RctY2CriZfYob0ywtkAmEmepVYnA= -cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc h1:xG6nuiJxlTBjOgSiYZMWFVhxSRrlhTB5TfdkdPVahRA= -cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc/go.mod h1:5kCiolDHF4KcOJJWff1Rh2di8qIxeDfZ7MVXiK2GHzw= -cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc h1:GZn8EuORFh0+2CAAsGBckJWzmWqoMteo5Ynlz4bDMso= -cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc/go.mod h1:a3uxiXMY6kBJvTkXg7GZ/9BEKSlZEjBB077a6bTAWh8= -cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc h1:ODu5HxrTM6k+cgi9gR7+86ChV21MY6N381viQkYBdOU= -cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc/go.mod h1:v00LNsY8uCwo8/UPLhHDjBIs4Qlv+k1zIwO+pvgXDMk= -cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc h1:dcEsAE1TY/Vs7vbPQhvvXSxJFaQjqcXKGN9dURChH7o= -cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc/go.mod h1:SdsQSe5M4UBD9yCmAEuCOLldku7vRtlH0X9ow9gOhHE= -cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc h1:z5yACW1q3V4uPyeWGNGv3issJIoObWs7RKyALTzFeVs= -cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc/go.mod h1:8zpIGgMWg0myA132LVxkoH5nw3H4eXsgFMn2IMwwXkQ= -cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc h1:dQrry7SOFr7SrvitCgfjUpQSs1cEaZ2YSZs7eJ8ycVY= -cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc/go.mod h1:Xlv6PCb7RiM1CPiGaJZcWuSf99PlhYsUZLy1umq+TYI= -cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc h1:ompjwcP9KnMPqoIHA2BQLcS4bXuSPNhbqU0O7KJ/dR0= -cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc/go.mod h1:eUbuvm6cdHXjNDw7pYUYUoApTLmE9lKl86DaTH99SC0= -cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc h1:LuBOnv3ICreY0WIPyMmC/FLJ+jzuS66taCZ0Pt6zNeo= -cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc/go.mod h1:vDUGAPHLgaTvzlap1IMPMDw/Fey96VoZtJVL5pdgUJo= -cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc h1:lFDGRICJV6JvdAUGsdj1repm6jSpzgp0+6O4WFeiMrA= -cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc/go.mod h1:6jXHqDdHwjxaECqs4f+5thfxVYyBGk0kGtoWX+1XS3I= -cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc h1:/I23bJrcijnQJCdnUBY4DnYO+1roA8Y4BO+k5Soxn8w= -cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc/go.mod h1:OjADzbWeEEe14x/gKzpezY/HV6koAU5W+zbLexZVt1o= -cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc h1:wfkVs39ay2hZT11+dueBrum8sHhmg2/SdxUj8A2cgiU= -cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc/go.mod h1:klc++uYJYhFpk1ewu9yJoR9WYhyB28b7wDTFhk4MwI8= -cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc h1:EepUEBoqHlVYQ6FfejBnSBChxSZNUKGbexZrnyXFzKM= -cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc/go.mod h1:6fnBzQWPbPIqsQ2aSyVciBKcWe2kRmX7dZ4sWxadByE= -cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc h1:roZIdSPBhOTEEba3s+adDJwaIiy7NoS4xVHps+K/Nig= -cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc/go.mod h1:f5TkweogtTV/568U6v1+56qfiRABZPNEUfMWfZvKvCw= +cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:1XP9EFtQsvnkOBs6yCv+QjbGy+pMTrT/J9KDvLIZsBs= +cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:JFGunxkINb3aDqOqOsMsvbxQYAg7Zldfxgq69Mzl584= +cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:JawcMKUABDT3CfbuxE4pUfvhjY966KIgrQtTRqL5100= +cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:1IrjaJtQ1DfN4jsQvZ19S2GtUZvX73wgbfwWSoJGGN8= +cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:Yj1kNCUo/f5nUcuLfwhORyIMi6pyiC/0IcVFAS1etX0= +cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:hdTGUIlF7yTWQ+6sDnWh7hZKt4QpG/vX/xCp8wpyEHg= +cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:+EUOaikqSD/nayYyUchQQZULtqzaSjY2UrdYjYV59GU= +cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:zSObZnbnKQyTzQ/VXV+WjR5p4F6X3ZqqTvE4v3pDvJc= +cosmossdk.io/x/circuit v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:th7QUjF+O42j6NhT2m9tK0WaekLBbeNW9NcSugGg6UQ= +cosmossdk.io/x/circuit v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:W5gM0N6JYntCX3nfsAsZxqpOkqVVsjRcOnqj5hC4yDw= +cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:CyMjnF3xNSGIdbeJI5TYbpHyMU5X5k1k4zkTn6oqkDs= +cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:PWu1EUCCs2uMDZAwQwNXCv0qsoEAZ7vvcTw8zcUDK8o= +cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:jSgnTV9g6s77yD2BL793E1Y5pvwDoPM6v3cXH2ROgG0= +cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Nw61zfixndwj5tXqdEWESzK1B05XiF1BTHLA/g5cmFI= +cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:SsZ0OLlH6ZA+qr1QxGrXhaZSKaj9JLFi1yhCvLn38GM= +cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:XjBLELrzfRXOD7r7M2duUthSz1nnTOZhAq4oBx9p/6c= +cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:wsK1nv9uwhIzjEWXAoBi/FRJlrQuDFdgd/sTh8aZFKg= +cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:BWre2SLNEF6aSeBxPdPBDCP8K0Rs1fIBLGzslryJ5oU= +cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:haaY94m4rycPEKnFPxdSEfKoyRTprRBaT6/YxyassOs= +cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:81DwKmsEXT2oUDc9EkqWTh6tR8PjE4A3R9mVcQhib38= +cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:NUt7wPynbg6wCu6ZaJmzVtuWJlGBGqDSi5/b4f7GLQ8= +cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:D27sWD5iK3gwLChwc7FLlR49lI7hWr44H+13DgIgYWE= +cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:vg9iabuEXvIG+8EnN+rviOoFPNY5BR6li7nvmWda700= +cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:g8QDPMq+y4Fq5j2/kPB91ZZqnNcKnP4aBrHigkqt7As= +cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:m60YGIQ4KgXGILYDzGZ2f8+ak/7lAMHmMDuEoKcSAck= +cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Ht29swG+6V6AdaBqTCjQ/Ij/VJ/YqLy9Cv1M9fcT1xA= +cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:e9IDOfn3SfuX0n8J78rKXD6pzLilEDVAWu1uZmP5xxs= +cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:6ML9Qz384qfrYEzGSF0rt0jvh9BbYbnzkObGEPUyEoE= +cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:IblAaDptrdGJgEGQBBFu3SmDJALe1n7wrLewMqJwzzw= +cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:C2Y+AwExUFRcmgoiYpMK/g4V5bVBx8Y0spvErODWnhg= +cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:L36WSYsihSK/Ma+Sb1XO07mnE4wHlOZjBEhu15UtwH8= +cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:aYqW53L5KY9xeXNfDC8zyeJCsxfKnFMdsipRLeIiG9c= +cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:zuTHxUXdW+YVho/SxcKVDUCQe3dpzYwlEk8G7QbDmjg= +cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:E51/hlkHDfdVpkh8I5jl9GY0IyiFSxxfIG+e28b18Ko= +cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:LLhaJy8ZunYAyk1F7QhgXL4CrzrRRGdpIyqN+Zp7TH8= +cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:UDqT4bbVaaz2+rv+FWi3MMEQQX8fsVTGBNnAf8Zs880= cosmossdk.io/x/tx v1.0.1 h1:PomaVlERYWxhki9RKX+uTE30eJkyqIQjxc7kw1DPXUk= cosmossdk.io/x/tx v1.0.1/go.mod h1:dwOSom2k2BJuGgnm9YXBeFII9gbHJGN/BHZBVCbZvPg= -cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc h1:7dpAdiFlLdG6l5R9W0nuWQKiCORXMl7Ophm7jDfne3Y= -cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc/go.mod h1:W4jA7b/LcBpeDhDelpw9YUbuvWPm459JQzLKd7c+c/Y= +cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:4aleuyrWA6Oo5M2jmlHn4k4vT1vxogqbbQH5yktqDUE= +cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Yzo7lGev8EHHtbcAkrI4Fc6L1jD3/VW3VxeHqXva24Y= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= @@ -383,8 +383,8 @@ github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNC github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw= 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.52.0-rc.1.0.20250114081937-a40ade9515cc h1:/qJ8rHesLP6EkS1hV9TVd0+vdZJBNBjLU3lvsX23CMA= -github.com/cosmos/cosmos-sdk v0.52.0-rc.1.0.20250114081937-a40ade9515cc/go.mod h1:v82qVB9SOdP2gzKaEqiYefzWvXY0d1epP0JHHEeevqY= +github.com/cosmos/cosmos-sdk v0.52.0-rc.2 h1:5TDP8I8H5V9cWqO34MvDKG8rFZh4VPEjSngRdAxuhbs= +github.com/cosmos/cosmos-sdk v0.52.0-rc.2/go.mod h1:udaDTtQ3FviEqSMjPIss0EbYOqOSbiHj/+BZ8ID/8zE= 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= @@ -805,8 +805,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 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.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= -github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= @@ -918,16 +918,16 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.5 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= -go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= -go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= -go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= -go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= -go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= -go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= -go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= -go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= -go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= +go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= +go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= +go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= +go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= +go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= +go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= +go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= +go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= +go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= +go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= @@ -1422,8 +1422,8 @@ google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 h1:oLiyxGgE+rt22duwci1+TG7bg2/L1LQsXwfjPlmuJA0= google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142/go.mod h1:G11eXq53iI5Q+kyNOmCvnzBaxEA2Q/Ik5Tj7nqBE8j4= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4= +google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a h1:OAiGFfOiA0v9MRYsSidp3ubZaBnteRUyn3xB2ZQ5G/E= +google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a/go.mod h1:jehYqy3+AhJU9ve55aNOaSml7wUXjF9x6z2LcCfpAhY= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -1461,8 +1461,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1479,8 +1479,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.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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= diff --git a/modules/light-clients/08-wasm/testing/simapp/app.go b/modules/light-clients/08-wasm/testing/simapp/app.go index 09a99f2070b..4a1cf36282b 100644 --- a/modules/light-clients/08-wasm/testing/simapp/app.go +++ b/modules/light-clients/08-wasm/testing/simapp/app.go @@ -14,6 +14,7 @@ import ( autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" + apisigning "cosmossdk.io/api/cosmos/tx/signing/v1beta1" "cosmossdk.io/client/v2/autocli" coreaddress "cosmossdk.io/core/address" corestore "cosmossdk.io/core/store" @@ -90,7 +91,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/types/msgservice" - sigtypes "github.com/cosmos/cosmos-sdk/types/tx/signing" "github.com/cosmos/cosmos-sdk/version" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/auth/ante" @@ -393,7 +393,7 @@ func NewSimApp( ) // optional: enable sign mode textual by overwriting the default tx config (after setting the bank keeper) - enabledSignModes := append(authtx.DefaultSignModes, sigtypes.SignMode_SIGN_MODE_TEXTUAL) + enabledSignModes := append(authtx.DefaultSignModes, apisigning.SignMode_SIGN_MODE_TEXTUAL) txConfigOpts := authtx.ConfigOptions{ EnabledSignModes: enabledSignModes, TextualCoinMetadataQueryFn: txmodule.NewBankKeeperCoinMetadataQueryFn(app.BankKeeper), diff --git a/modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go b/modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go index ba5303918c0..00add23ca94 100644 --- a/modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go +++ b/modules/light-clients/08-wasm/testing/simapp/simd/cmd/root.go @@ -12,6 +12,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" + apisigning "cosmossdk.io/api/cosmos/tx/signing/v1beta1" "cosmossdk.io/client/v2/offchain" corestore "cosmossdk.io/core/store" "cosmossdk.io/log" @@ -33,7 +34,6 @@ import ( simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/cosmos-sdk/types/tx/signing" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" "github.com/cosmos/cosmos-sdk/x/auth/tx" txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config" @@ -92,7 +92,7 @@ func NewRootCmd() *cobra.Command { // This needs to go after ReadFromClientConfig, as that function // sets the RPC client needed for SIGN_MODE_TEXTUAL. - enabledSignModes := append(tx.DefaultSignModes, signing.SignMode_SIGN_MODE_TEXTUAL) //nolint:gocritic // we know we aren't appending to the same slice + enabledSignModes := append(tx.DefaultSignModes, apisigning.SignMode_SIGN_MODE_TEXTUAL) //nolint:gocritic // we know we aren't appending to the same slice txConfigOpts := tx.ConfigOptions{ EnabledSignModes: enabledSignModes, TextualCoinMetadataQueryFn: txmodule.NewGRPCCoinMetadataQueryFn(initClientCtx), diff --git a/simapp/app.go b/simapp/app.go index ce293aba14e..bb90ceb6379 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -13,6 +13,7 @@ import ( autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" + apisigning "cosmossdk.io/api/cosmos/tx/signing/v1beta1" "cosmossdk.io/client/v2/autocli" clienthelpers "cosmossdk.io/client/v2/helpers" coreaddress "cosmossdk.io/core/address" @@ -99,7 +100,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/types/msgservice" - sigtypes "github.com/cosmos/cosmos-sdk/types/tx/signing" "github.com/cosmos/cosmos-sdk/version" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/auth/ante" @@ -406,7 +406,7 @@ func NewSimApp( ) // optional: enable sign mode textual by overwriting the default tx config (after setting the bank keeper) - enabledSignModes := append(authtx.DefaultSignModes, sigtypes.SignMode_SIGN_MODE_TEXTUAL) + enabledSignModes := append(authtx.DefaultSignModes, apisigning.SignMode_SIGN_MODE_TEXTUAL) txConfigOpts := authtx.ConfigOptions{ EnabledSignModes: enabledSignModes, TextualCoinMetadataQueryFn: txmodule.NewBankKeeperCoinMetadataQueryFn(app.BankKeeper), diff --git a/simapp/go.mod b/simapp/go.mod index 0d4939fcdad..142fc1878a1 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -47,8 +47,8 @@ require ( ) require ( - buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1 // indirect - buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1 // indirect + buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1 // indirect + buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 // indirect cloud.google.com/go v0.115.1 // indirect cloud.google.com/go/auth v0.8.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect @@ -115,7 +115,6 @@ require ( github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.3 // indirect @@ -178,7 +177,7 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.61.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rivo/uniseg v0.2.0 // indirect @@ -206,9 +205,10 @@ require ( go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/otel v1.31.0 // indirect - go.opentelemetry.io/otel/metric v1.31.0 // indirect - go.opentelemetry.io/otel/trace v1.31.0 // indirect + go.opentelemetry.io/otel v1.32.0 // indirect + go.opentelemetry.io/otel/metric v1.32.0 // indirect + go.opentelemetry.io/otel/trace v1.32.0 // indirect + go.uber.org/mock v0.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.12.0 // indirect golang.org/x/crypto v0.32.0 // indirect @@ -222,10 +222,10 @@ require ( golang.org/x/time v0.6.0 // indirect google.golang.org/api v0.192.0 // indirect google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect - google.golang.org/grpc v1.69.4 // indirect - google.golang.org/protobuf v1.36.3 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.4 // 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 @@ -238,31 +238,28 @@ require ( replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 //TODO: remove everything below after tags are created -// v0.0.0-20241108061010-a0458127fccf = sdk release/v0.52.x branch -// v0.0.0-20241106165340-4eb943897eaa = ibc-go marko/gomod_change branch -// v1.0.0-alpha.5.0.20241108095921-406f977be0b9 = sdk main branch replace ( - cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc - cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/group => cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/params => cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc - cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc + cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts => cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts/defaults/lockup => cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/accounts/defaults/multisig => cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/authz => cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/bank => cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/circuit => cosmossdk.io/x/circuit v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/distribution => cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/epochs => cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/evidence => cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/feegrant => cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/group => cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/mint => cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/nft => cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/params => cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/protocolpool => cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/slashing => cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/staking => cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e + cosmossdk.io/x/upgrade => cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e // pseudo version lower than the latest tag - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.1.0.20250114081937-a40ade9515cc + github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.2 ) diff --git a/simapp/go.sum b/simapp/go.sum index 0b80040a104..5232efad7a0 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -1,7 +1,7 @@ -buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1 h1:72N6FvGkvIAHJFuW6BFXCThbTS2qo/PlzQuw7wSjUi8= -buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.2-20241120201313-68e42a58b301.1/go.mod h1:UJ1nx2WHcWAvKiaem512kYlHektAZJ/eNU032Pdar70= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1 h1:LFgdGZ+BzNqHWsndyRvvFE1450BBZ2nFtyNEGZ9NOSg= -buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.2-20240130113600-88ef6483f90f.1/go.mod h1:cuOHNO5SRU1J25UoI8VvPyi8dq9BpZb4gKa01Umx57Y= +buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1 h1:ka493q+UHMpnJHmWS5EqsvVnOQIKrCdO/2Jpzht4drc= +buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1/go.mod h1:mvIvtXjrqo1Rmpf+OUuHIVQpA6f9bezvxtZ1c1uo3a8= +buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 h1:t5a3Rfm5y1+U3gqSq9fd728bj7kL9Rq1oBBXgx2iaaE= +buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1/go.mod h1:tUkfiDbobvvm/uysw5gXCf0I+2eFtlo7pBTy+OTnzZc= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -194,8 +194,8 @@ cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1V cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= cosmossdk.io/api v0.8.2 h1:klzA1RODd9tTawJ2CbBd/34RV/cB9qtd9oJN6rcRqqg= cosmossdk.io/api v0.8.2/go.mod h1:XJUwQrihIDjErzs3+jm1zO/9KRzKf4HMjRzXC+l+Cio= -cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc h1:kdVRV1nKiiZjqhX81ex7oy5X+WLpmlJUp1MLOUZfhHo= -cosmossdk.io/client/v2 v2.10.0-beta.1.0.20250114081937-a40ade9515cc/go.mod h1:o5kHjrWXvmFTLx6+ObaNWPyCAG7R6gmOXIm6ks9LE1c= +cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e h1:/ablega07LmBWeIZSGL/LnIKQw4s3gHxTNvpeJZchGk= +cosmossdk.io/client/v2 v2.10.0-beta.2.0.20250124173324-960d44842b9e/go.mod h1:aS+VVIJTrrpn70VqUA2c1DEiT93DVi63U7K26yXmQ68= cosmossdk.io/collections v1.0.0 h1:YCYIe/pIMtc1iLDD0OrVdfWCnIkpwdy7k9NSQpaR5mg= cosmossdk.io/collections v1.0.0/go.mod h1:mFfLxnYT1fV+B3Lx9GLap1qxmffIPqQCND4xBExerps= cosmossdk.io/core v1.0.0 h1:e7XBbISOytLBOXMVwpRPixThXqEkeLGlg8no/qpgS8U= @@ -216,50 +216,50 @@ cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43 h1:glZ6MpmD+5AhwJY cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43/go.mod h1:XCWpgfueHSBY+B7Cf2Aq/CcsU+6XoFH+EmseCKglFrU= cosmossdk.io/tools/confix v0.1.2 h1:2hoM1oFCNisd0ltSAAZw2i4ponARPmlhuNu3yy0VwI4= cosmossdk.io/tools/confix v0.1.2/go.mod h1:7XfcbK9sC/KNgVGxgLM0BrFbVcR/+6Dg7MFfpx7duYo= -cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc h1:Goq6Yr8uc50qZpfqp5MpyEaTuCHQMK4BqeEQVjYYZAI= -cosmossdk.io/x/accounts v0.0.0-20250114081937-a40ade9515cc/go.mod h1:Da8bWbfy9n79GpD+uJmp2Tr9yVJMnW6ZsBFEV320LGA= +cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:uoN0jzr2RnlYa+JadOoBplSyZn5P+Gzg9X0h3n1Sslk= +cosmossdk.io/x/accounts v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:MV20QZ/hl80WF47E0YgRgInqswja+J5KN60mryo0uy0= cosmossdk.io/x/accounts/defaults/base v0.2.0-rc.1 h1:sVAOVQLbdmzLmjnWLhAhIN65HTmSMGBIwU2uTeSCEp0= cosmossdk.io/x/accounts/defaults/base v0.2.0-rc.1/go.mod h1:52PyilJMRraVwNcG58q4t7OSzSHApqNfJheq+mNB+qw= -cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc h1:FzZeSHquVbGt1jVWMoMbSzezACWYTqc2/IF1TBgy5Tw= -cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20250114081937-a40ade9515cc/go.mod h1:EhCK34cu8/3xq2QhTiZHlOwNhogDdkRYsGPUVd+dJbE= -cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc h1:IxhkYAAsgNtsp7w/8IXfSRp9surZvC3Ufwvkgj7bJUU= -cosmossdk.io/x/accounts/defaults/multisig v0.0.0-20250114081937-a40ade9515cc/go.mod h1:WJRWc2MhW6sXZmUfXtKWD+iv+EEqHPd7n49BJ5I0Wkg= -cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc h1:bf1KqfINZ9Q53CFHq2UOfUunE/DoWaEsoDSf7fHbDLY= -cosmossdk.io/x/authz v0.0.0-20250114081937-a40ade9515cc/go.mod h1:N8DGrZIqnkARCQbHVvqh8u7T+Hd1xD/bkrsNGdPxvE0= -cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc h1:20B2FnKP1Ai2AMVSRsMEraZByZGEsNM5WE0Pjw3TRYc= -cosmossdk.io/x/bank v0.0.0-20250114081937-a40ade9515cc/go.mod h1:NLt9NZx5klYpumddH0OsWgiGuI34GZsrA/8i0ZbxCb4= -cosmossdk.io/x/circuit v0.0.0-20250114081937-a40ade9515cc h1:5ZcVmyrIvT4Xm0XAGD2plePRrwsIR43mMW3xMLvqfqY= -cosmossdk.io/x/circuit v0.0.0-20250114081937-a40ade9515cc/go.mod h1:mcKxPJn3ZTCYoi1RctY2CriZfYob0ywtkAmEmepVYnA= -cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc h1:xG6nuiJxlTBjOgSiYZMWFVhxSRrlhTB5TfdkdPVahRA= -cosmossdk.io/x/consensus v0.0.0-20250114081937-a40ade9515cc/go.mod h1:5kCiolDHF4KcOJJWff1Rh2di8qIxeDfZ7MVXiK2GHzw= -cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc h1:GZn8EuORFh0+2CAAsGBckJWzmWqoMteo5Ynlz4bDMso= -cosmossdk.io/x/distribution v0.0.0-20250114081937-a40ade9515cc/go.mod h1:a3uxiXMY6kBJvTkXg7GZ/9BEKSlZEjBB077a6bTAWh8= -cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc h1:ODu5HxrTM6k+cgi9gR7+86ChV21MY6N381viQkYBdOU= -cosmossdk.io/x/epochs v0.0.0-20250114081937-a40ade9515cc/go.mod h1:v00LNsY8uCwo8/UPLhHDjBIs4Qlv+k1zIwO+pvgXDMk= -cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc h1:dcEsAE1TY/Vs7vbPQhvvXSxJFaQjqcXKGN9dURChH7o= -cosmossdk.io/x/evidence v0.0.0-20250114081937-a40ade9515cc/go.mod h1:SdsQSe5M4UBD9yCmAEuCOLldku7vRtlH0X9ow9gOhHE= -cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc h1:z5yACW1q3V4uPyeWGNGv3issJIoObWs7RKyALTzFeVs= -cosmossdk.io/x/feegrant v0.0.0-20250114081937-a40ade9515cc/go.mod h1:8zpIGgMWg0myA132LVxkoH5nw3H4eXsgFMn2IMwwXkQ= -cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc h1:dQrry7SOFr7SrvitCgfjUpQSs1cEaZ2YSZs7eJ8ycVY= -cosmossdk.io/x/gov v0.0.0-20250114081937-a40ade9515cc/go.mod h1:Xlv6PCb7RiM1CPiGaJZcWuSf99PlhYsUZLy1umq+TYI= -cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc h1:ompjwcP9KnMPqoIHA2BQLcS4bXuSPNhbqU0O7KJ/dR0= -cosmossdk.io/x/group v0.0.0-20250114081937-a40ade9515cc/go.mod h1:eUbuvm6cdHXjNDw7pYUYUoApTLmE9lKl86DaTH99SC0= -cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc h1:LuBOnv3ICreY0WIPyMmC/FLJ+jzuS66taCZ0Pt6zNeo= -cosmossdk.io/x/mint v0.0.0-20250114081937-a40ade9515cc/go.mod h1:vDUGAPHLgaTvzlap1IMPMDw/Fey96VoZtJVL5pdgUJo= -cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc h1:lFDGRICJV6JvdAUGsdj1repm6jSpzgp0+6O4WFeiMrA= -cosmossdk.io/x/nft v0.0.0-20250114081937-a40ade9515cc/go.mod h1:6jXHqDdHwjxaECqs4f+5thfxVYyBGk0kGtoWX+1XS3I= -cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc h1:/I23bJrcijnQJCdnUBY4DnYO+1roA8Y4BO+k5Soxn8w= -cosmossdk.io/x/params v0.0.0-20250114081937-a40ade9515cc/go.mod h1:OjADzbWeEEe14x/gKzpezY/HV6koAU5W+zbLexZVt1o= -cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc h1:wfkVs39ay2hZT11+dueBrum8sHhmg2/SdxUj8A2cgiU= -cosmossdk.io/x/protocolpool v0.0.0-20250114081937-a40ade9515cc/go.mod h1:klc++uYJYhFpk1ewu9yJoR9WYhyB28b7wDTFhk4MwI8= -cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc h1:EepUEBoqHlVYQ6FfejBnSBChxSZNUKGbexZrnyXFzKM= -cosmossdk.io/x/slashing v0.0.0-20250114081937-a40ade9515cc/go.mod h1:6fnBzQWPbPIqsQ2aSyVciBKcWe2kRmX7dZ4sWxadByE= -cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc h1:roZIdSPBhOTEEba3s+adDJwaIiy7NoS4xVHps+K/Nig= -cosmossdk.io/x/staking v0.0.0-20250114081937-a40ade9515cc/go.mod h1:f5TkweogtTV/568U6v1+56qfiRABZPNEUfMWfZvKvCw= +cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:1XP9EFtQsvnkOBs6yCv+QjbGy+pMTrT/J9KDvLIZsBs= +cosmossdk.io/x/accounts/defaults/lockup v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:JFGunxkINb3aDqOqOsMsvbxQYAg7Zldfxgq69Mzl584= +cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:JawcMKUABDT3CfbuxE4pUfvhjY966KIgrQtTRqL5100= +cosmossdk.io/x/accounts/defaults/multisig v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:1IrjaJtQ1DfN4jsQvZ19S2GtUZvX73wgbfwWSoJGGN8= +cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:Yj1kNCUo/f5nUcuLfwhORyIMi6pyiC/0IcVFAS1etX0= +cosmossdk.io/x/authz v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:hdTGUIlF7yTWQ+6sDnWh7hZKt4QpG/vX/xCp8wpyEHg= +cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:+EUOaikqSD/nayYyUchQQZULtqzaSjY2UrdYjYV59GU= +cosmossdk.io/x/bank v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:zSObZnbnKQyTzQ/VXV+WjR5p4F6X3ZqqTvE4v3pDvJc= +cosmossdk.io/x/circuit v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:th7QUjF+O42j6NhT2m9tK0WaekLBbeNW9NcSugGg6UQ= +cosmossdk.io/x/circuit v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:W5gM0N6JYntCX3nfsAsZxqpOkqVVsjRcOnqj5hC4yDw= +cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:CyMjnF3xNSGIdbeJI5TYbpHyMU5X5k1k4zkTn6oqkDs= +cosmossdk.io/x/consensus v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:PWu1EUCCs2uMDZAwQwNXCv0qsoEAZ7vvcTw8zcUDK8o= +cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:jSgnTV9g6s77yD2BL793E1Y5pvwDoPM6v3cXH2ROgG0= +cosmossdk.io/x/distribution v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Nw61zfixndwj5tXqdEWESzK1B05XiF1BTHLA/g5cmFI= +cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:SsZ0OLlH6ZA+qr1QxGrXhaZSKaj9JLFi1yhCvLn38GM= +cosmossdk.io/x/epochs v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:XjBLELrzfRXOD7r7M2duUthSz1nnTOZhAq4oBx9p/6c= +cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:wsK1nv9uwhIzjEWXAoBi/FRJlrQuDFdgd/sTh8aZFKg= +cosmossdk.io/x/evidence v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:BWre2SLNEF6aSeBxPdPBDCP8K0Rs1fIBLGzslryJ5oU= +cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:haaY94m4rycPEKnFPxdSEfKoyRTprRBaT6/YxyassOs= +cosmossdk.io/x/feegrant v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:81DwKmsEXT2oUDc9EkqWTh6tR8PjE4A3R9mVcQhib38= +cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:NUt7wPynbg6wCu6ZaJmzVtuWJlGBGqDSi5/b4f7GLQ8= +cosmossdk.io/x/gov v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:D27sWD5iK3gwLChwc7FLlR49lI7hWr44H+13DgIgYWE= +cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:vg9iabuEXvIG+8EnN+rviOoFPNY5BR6li7nvmWda700= +cosmossdk.io/x/group v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:g8QDPMq+y4Fq5j2/kPB91ZZqnNcKnP4aBrHigkqt7As= +cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:m60YGIQ4KgXGILYDzGZ2f8+ak/7lAMHmMDuEoKcSAck= +cosmossdk.io/x/mint v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Ht29swG+6V6AdaBqTCjQ/Ij/VJ/YqLy9Cv1M9fcT1xA= +cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:e9IDOfn3SfuX0n8J78rKXD6pzLilEDVAWu1uZmP5xxs= +cosmossdk.io/x/nft v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:6ML9Qz384qfrYEzGSF0rt0jvh9BbYbnzkObGEPUyEoE= +cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:IblAaDptrdGJgEGQBBFu3SmDJALe1n7wrLewMqJwzzw= +cosmossdk.io/x/params v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:C2Y+AwExUFRcmgoiYpMK/g4V5bVBx8Y0spvErODWnhg= +cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:L36WSYsihSK/Ma+Sb1XO07mnE4wHlOZjBEhu15UtwH8= +cosmossdk.io/x/protocolpool v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:aYqW53L5KY9xeXNfDC8zyeJCsxfKnFMdsipRLeIiG9c= +cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:zuTHxUXdW+YVho/SxcKVDUCQe3dpzYwlEk8G7QbDmjg= +cosmossdk.io/x/slashing v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:E51/hlkHDfdVpkh8I5jl9GY0IyiFSxxfIG+e28b18Ko= +cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:LLhaJy8ZunYAyk1F7QhgXL4CrzrRRGdpIyqN+Zp7TH8= +cosmossdk.io/x/staking v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:UDqT4bbVaaz2+rv+FWi3MMEQQX8fsVTGBNnAf8Zs880= cosmossdk.io/x/tx v1.0.1 h1:PomaVlERYWxhki9RKX+uTE30eJkyqIQjxc7kw1DPXUk= cosmossdk.io/x/tx v1.0.1/go.mod h1:dwOSom2k2BJuGgnm9YXBeFII9gbHJGN/BHZBVCbZvPg= -cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc h1:7dpAdiFlLdG6l5R9W0nuWQKiCORXMl7Ophm7jDfne3Y= -cosmossdk.io/x/upgrade v0.0.0-20250114081937-a40ade9515cc/go.mod h1:W4jA7b/LcBpeDhDelpw9YUbuvWPm459JQzLKd7c+c/Y= +cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e h1:4aleuyrWA6Oo5M2jmlHn4k4vT1vxogqbbQH5yktqDUE= +cosmossdk.io/x/upgrade v0.2.0-rc.1.0.20250124173324-960d44842b9e/go.mod h1:Yzo7lGev8EHHtbcAkrI4Fc6L1jD3/VW3VxeHqXva24Y= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= @@ -381,8 +381,8 @@ github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNC github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw= 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.52.0-rc.1.0.20250114081937-a40ade9515cc h1:/qJ8rHesLP6EkS1hV9TVd0+vdZJBNBjLU3lvsX23CMA= -github.com/cosmos/cosmos-sdk v0.52.0-rc.1.0.20250114081937-a40ade9515cc/go.mod h1:v82qVB9SOdP2gzKaEqiYefzWvXY0d1epP0JHHEeevqY= +github.com/cosmos/cosmos-sdk v0.52.0-rc.2 h1:5TDP8I8H5V9cWqO34MvDKG8rFZh4VPEjSngRdAxuhbs= +github.com/cosmos/cosmos-sdk v0.52.0-rc.2/go.mod h1:udaDTtQ3FviEqSMjPIss0EbYOqOSbiHj/+BZ8ID/8zE= 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= @@ -803,8 +803,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 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.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= -github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= @@ -914,16 +914,16 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.5 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= -go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= -go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= -go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= -go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= -go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= -go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= -go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= -go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= -go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= +go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= +go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= +go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= +go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= +go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= +go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= +go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= +go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= +go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= +go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= @@ -1418,8 +1418,8 @@ google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142 h1:oLiyxGgE+rt22duwci1+TG7bg2/L1LQsXwfjPlmuJA0= google.golang.org/genproto v0.0.0-20240814211410-ddb44dafa142/go.mod h1:G11eXq53iI5Q+kyNOmCvnzBaxEA2Q/Ik5Tj7nqBE8j4= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4= +google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a h1:OAiGFfOiA0v9MRYsSidp3ubZaBnteRUyn3xB2ZQ5G/E= +google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a/go.mod h1:jehYqy3+AhJU9ve55aNOaSml7wUXjF9x6z2LcCfpAhY= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -1457,8 +1457,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= -google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1475,8 +1475,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.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/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= diff --git a/simapp/simd/cmd/root.go b/simapp/simd/cmd/root.go index 766bb0dba84..f9bba5d23f8 100644 --- a/simapp/simd/cmd/root.go +++ b/simapp/simd/cmd/root.go @@ -8,6 +8,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" + apisigning "cosmossdk.io/api/cosmos/tx/signing/v1beta1" corestore "cosmossdk.io/core/store" coretesting "cosmossdk.io/core/testing" "cosmossdk.io/log" @@ -22,7 +23,6 @@ import ( servertypes "github.com/cosmos/cosmos-sdk/server/types" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/tx/signing" "github.com/cosmos/cosmos-sdk/x/auth/tx" authtxconfig "github.com/cosmos/cosmos-sdk/x/auth/tx/config" "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -84,7 +84,7 @@ func NewRootCmd() *cobra.Command { // sets the RPC client needed for SIGN_MODE_TEXTUAL. This sign mode // is only available if the client is online. if !initClientCtx.Offline { - enabledSignModes := append(tx.DefaultSignModes, signing.SignMode_SIGN_MODE_TEXTUAL) + enabledSignModes := append(tx.DefaultSignModes, apisigning.SignMode_SIGN_MODE_TEXTUAL) txConfigOpts := tx.ConfigOptions{ EnabledSignModes: enabledSignModes, TextualCoinMetadataQueryFn: authtxconfig.NewGRPCCoinMetadataQueryFn(initClientCtx), From dcd6a3ef3393b38d634998730cc332573229431b Mon Sep 17 00:00:00 2001 From: Tyler <48813565+technicallyty@users.noreply.github.com> Date: Sat, 25 Jan 2025 09:27:41 -0800 Subject: [PATCH 2/6] chore: migrate to core modules (#7866) * core modules * fmt * fix broken tests * lint fix * actually, we can do wasm for now. this will work fine. * appmodulev2 -> appmodule --------- Co-authored-by: Gjermund Garaba --- modules/apps/27-interchain-accounts/module.go | 37 ++++++++------- modules/apps/29-fee/keeper/migrations.go | 6 ++- modules/apps/29-fee/module.go | 25 ++++++---- modules/apps/transfer/keeper/migrations.go | 12 ++--- modules/apps/transfer/module.go | 32 ++++++++----- modules/core/02-client/keeper/migrations.go | 12 +++-- .../02-client/migrations/v7/genesis_test.go | 4 +- modules/core/02-client/migrations/v7/store.go | 27 ++++++----- .../02-client/migrations/v7/store_test.go | 6 ++- .../core/03-connection/keeper/migrations.go | 8 ++-- modules/core/04-channel/keeper/migrations.go | 4 +- modules/core/migrations/v7/genesis_test.go | 4 +- modules/core/module.go | 47 ++++++++++--------- .../08-wasm/keeper/migrations.go | 5 +- modules/light-clients/08-wasm/module.go | 17 ++++--- 15 files changed, 144 insertions(+), 102 deletions(-) diff --git a/modules/apps/27-interchain-accounts/module.go b/modules/apps/27-interchain-accounts/module.go index f99a6953d97..1e9d4ceb522 100644 --- a/modules/apps/27-interchain-accounts/module.go +++ b/modules/apps/27-interchain-accounts/module.go @@ -7,6 +7,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + "google.golang.org/grpc" "cosmossdk.io/client/v2/autocli" "cosmossdk.io/core/appmodule" @@ -14,7 +15,6 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -34,10 +34,10 @@ var ( _ appmodule.AppModule = (*AppModule)(nil) _ appmodule.HasConsensusVersion = (*AppModule)(nil) _ appmodule.HasRegisterInterfaces = (*AppModule)(nil) + _ appmodule.HasMigrations = (*AppModule)(nil) _ module.AppModule = (*AppModule)(nil) _ module.HasGenesis = (*AppModule)(nil) - _ module.HasServices = (*AppModule)(nil) _ module.HasGRPCGateway = (*AppModule)(nil) // Sims @@ -123,28 +123,33 @@ func (AppModule) GetQueryCmd() *cobra.Command { return cli.GetQueryCmd() } -// RegisterServices registers module services -func (am AppModule) RegisterServices(cfg module.Configurator) { - if am.controllerKeeper != nil { - controllertypes.RegisterMsgServer(cfg.MsgServer(), controllerkeeper.NewMsgServerImpl(am.controllerKeeper)) - controllertypes.RegisterQueryServer(cfg.QueryServer(), am.controllerKeeper) - } - - if am.hostKeeper != nil { - hosttypes.RegisterMsgServer(cfg.MsgServer(), hostkeeper.NewMsgServerImpl(am.hostKeeper)) - hosttypes.RegisterQueryServer(cfg.QueryServer(), am.hostKeeper) - } - +func (am AppModule) RegisterMigrations(registrar appmodule.MigrationRegistrar) error { controllerMigrator := controllerkeeper.NewMigrator(am.controllerKeeper) hostMigrator := hostkeeper.NewMigrator(am.hostKeeper) - if err := cfg.RegisterMigration(types.ModuleName, 2, func(ctx sdk.Context) error { + if err := registrar.Register(types.ModuleName, 2, func(ctx context.Context) error { if err := hostMigrator.MigrateParams(ctx); err != nil { return err } return controllerMigrator.MigrateParams(ctx) }); err != nil { - panic(fmt.Errorf("failed to migrate interchainaccounts app from version 2 to 3 (self-managed params migration): %v", err)) + return fmt.Errorf("failed to migrate interchainaccounts app from version 2 to 3 (self-managed params migration): %w", err) + } + return nil +} + +// RegisterServices registers module services +func (am AppModule) RegisterServices(cfg grpc.ServiceRegistrar) error { + if am.controllerKeeper != nil { + controllertypes.RegisterMsgServer(cfg, controllerkeeper.NewMsgServerImpl(am.controllerKeeper)) + controllertypes.RegisterQueryServer(cfg, am.controllerKeeper) } + + if am.hostKeeper != nil { + hosttypes.RegisterMsgServer(cfg, hostkeeper.NewMsgServerImpl(am.hostKeeper)) + hosttypes.RegisterQueryServer(cfg, am.hostKeeper) + } + + return nil } // InitGenesis performs genesis initialization for the interchain accounts module. diff --git a/modules/apps/29-fee/keeper/migrations.go b/modules/apps/29-fee/keeper/migrations.go index 6bb05548796..0b9477b569d 100644 --- a/modules/apps/29-fee/keeper/migrations.go +++ b/modules/apps/29-fee/keeper/migrations.go @@ -1,6 +1,8 @@ package keeper import ( + "context" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/runtime" @@ -24,10 +26,10 @@ func NewMigrator(keeper Keeper) Migrator { // Migrate1to2 migrates ibc-fee module from ConsensusVersion 1 to 2 // by refunding leftover fees to the refund address. -func (m Migrator) Migrate1to2(ctx sdk.Context) error { +func (m Migrator) Migrate1to2(ctx context.Context) error { store := runtime.KVStoreAdapter(m.keeper.KVStoreService.OpenKVStore(ctx)) iterator := storetypes.KVStorePrefixIterator(store, []byte(types.FeesInEscrowPrefix)) - defer coretypes.LogDeferred(ctx.Logger(), func() error { return iterator.Close() }) + defer coretypes.LogDeferred(m.keeper.Logger, func() error { return iterator.Close() }) for ; iterator.Valid(); iterator.Next() { feesInEscrow := m.keeper.MustUnmarshalFees(iterator.Value()) diff --git a/modules/apps/29-fee/module.go b/modules/apps/29-fee/module.go index fbef3e57062..14fad4319e5 100644 --- a/modules/apps/29-fee/module.go +++ b/modules/apps/29-fee/module.go @@ -7,6 +7,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + "google.golang.org/grpc" "cosmossdk.io/client/v2/autocli" "cosmossdk.io/core/appmodule" @@ -26,10 +27,10 @@ var ( _ appmodule.HasConsensusVersion = (*AppModule)(nil) _ appmodule.HasAminoCodec = (*AppModule)(nil) _ appmodule.HasRegisterInterfaces = (*AppModule)(nil) + _ appmodule.HasMigrations = (*AppModule)(nil) - _ module.AppModule = (*AppModule)(nil) - _ module.HasGenesis = (*AppModule)(nil) - _ module.HasServices = (*AppModule)(nil) + _ module.AppModule = (*AppModule)(nil) + _ module.HasGenesis = (*AppModule)(nil) _ autocli.HasCustomTxCommand = (*AppModule)(nil) _ autocli.HasCustomQueryCommand = (*AppModule)(nil) @@ -104,15 +105,19 @@ func (AppModule) GetQueryCmd() *cobra.Command { return cli.GetQueryCmd() } -// RegisterServices registers module services. -func (am AppModule) RegisterServices(cfg module.Configurator) { - types.RegisterMsgServer(cfg.MsgServer(), am.keeper) - types.RegisterQueryServer(cfg.QueryServer(), am.keeper) - +func (am AppModule) RegisterMigrations(registrar appmodule.MigrationRegistrar) error { m := keeper.NewMigrator(am.keeper) - if err := cfg.RegisterMigration(types.ModuleName, 1, m.Migrate1to2); err != nil { - panic(fmt.Errorf("failed to migrate ibc-fee module from version 1 to 2 (refund leftover fees): %v", err)) + if err := registrar.Register(types.ModuleName, 1, m.Migrate1to2); err != nil { + return fmt.Errorf("failed to migrate ibc-fee module from version 1 to 2 (refund leftover fees): %v", err) } + return nil +} + +// RegisterServices registers module services. +func (am AppModule) RegisterServices(cfg grpc.ServiceRegistrar) error { + types.RegisterMsgServer(cfg, am.keeper) + types.RegisterQueryServer(cfg, am.keeper) + return nil } // InitGenesis performs genesis initialization for the ibc-29-fee module. It returns diff --git a/modules/apps/transfer/keeper/migrations.go b/modules/apps/transfer/keeper/migrations.go index d276aef8091..9d793f33635 100644 --- a/modules/apps/transfer/keeper/migrations.go +++ b/modules/apps/transfer/keeper/migrations.go @@ -30,9 +30,9 @@ func NewMigrator(keeper Keeper) Migrator { } // MigrateParams migrates the transfer module's parameters from the x/params to self store. -func (m Migrator) MigrateParams(ctx sdk.Context) error { +func (m Migrator) MigrateParams(ctx context.Context) error { var params types.Params - m.keeper.legacySubspace.GetParamSet(ctx, ¶ms) + m.keeper.legacySubspace.GetParamSet(sdk.UnwrapSDKContext(ctx), ¶ms) m.keeper.SetParams(ctx, params) m.keeper.Logger.Info("successfully migrated transfer app self-manage params") @@ -40,7 +40,7 @@ func (m Migrator) MigrateParams(ctx sdk.Context) error { } // MigrateDenomMetadata sets token metadata for all the IBC denom traces -func (m Migrator) MigrateDenomMetadata(ctx sdk.Context) error { +func (m Migrator) MigrateDenomMetadata(ctx context.Context) error { m.keeper.iterateDenomTraces(ctx, func(dt internaltypes.DenomTrace) (stop bool) { // check if the metadata for the given denom trace does not already exist @@ -55,7 +55,7 @@ func (m Migrator) MigrateDenomMetadata(ctx sdk.Context) error { } // MigrateTotalEscrowForDenom migrates the total amount of source chain tokens in escrow. -func (m Migrator) MigrateTotalEscrowForDenom(ctx sdk.Context) error { +func (m Migrator) MigrateTotalEscrowForDenom(ctx context.Context) error { var totalEscrowed sdk.Coins portID := m.keeper.GetPort(ctx) @@ -76,7 +76,7 @@ func (m Migrator) MigrateTotalEscrowForDenom(ctx sdk.Context) error { } // MigrateDenomTraceToDenom migrates storage from using DenomTrace to Denom. -func (m Migrator) MigrateDenomTraceToDenom(ctx sdk.Context) error { +func (m Migrator) MigrateDenomTraceToDenom(ctx context.Context) error { var ( denoms []types.Denom denomTraces []internaltypes.DenomTrace @@ -147,7 +147,7 @@ func (k Keeper) iterateDenomTraces(ctx context.Context, cb func(denomTrace inter } // setDenomMetadataWithDenomTrace sets an IBC token's denomination metadata -func (k Keeper) setDenomMetadataWithDenomTrace(ctx sdk.Context, denomTrace internaltypes.DenomTrace) { +func (k Keeper) setDenomMetadataWithDenomTrace(ctx context.Context, denomTrace internaltypes.DenomTrace) { metadata := banktypes.Metadata{ Description: fmt.Sprintf("IBC token from %s", denomTrace.GetFullDenomPath()), DenomUnits: []*banktypes.DenomUnit{ diff --git a/modules/apps/transfer/module.go b/modules/apps/transfer/module.go index 1d054933f0e..31245c739e0 100644 --- a/modules/apps/transfer/module.go +++ b/modules/apps/transfer/module.go @@ -7,6 +7,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + "google.golang.org/grpc" "cosmossdk.io/client/v2/autocli" "cosmossdk.io/core/appmodule" @@ -28,11 +29,11 @@ var ( _ appmodule.AppModule = (*AppModule)(nil) _ appmodule.HasConsensusVersion = (*AppModule)(nil) _ appmodule.HasRegisterInterfaces = (*AppModule)(nil) + _ appmodule.HasMigrations = (*AppModule)(nil) _ module.AppModule = (*AppModule)(nil) _ module.HasGRPCGateway = (*AppModule)(nil) _ module.HasGenesis = (*AppModule)(nil) - _ module.HasServices = (*AppModule)(nil) // Sims _ module.AppModuleSimulation = (*AppModule)(nil) @@ -118,27 +119,32 @@ func (AppModule) GetQueryCmd() *cobra.Command { } // RegisterServices registers module services. -func (am AppModule) RegisterServices(cfg module.Configurator) { - types.RegisterMsgServer(cfg.MsgServer(), am.keeper) - types.RegisterQueryServer(cfg.QueryServer(), am.keeper) - types.RegisterQueryV2Server(cfg.QueryServer(), am.keeper) +func (am AppModule) RegisterServices(cfg grpc.ServiceRegistrar) error { + types.RegisterMsgServer(cfg, am.keeper) + types.RegisterQueryServer(cfg, am.keeper) + types.RegisterQueryV2Server(cfg, am.keeper) + return nil +} +func (am AppModule) RegisterMigrations(registrar appmodule.MigrationRegistrar) error { m := keeper.NewMigrator(am.keeper) - if err := cfg.RegisterMigration(types.ModuleName, 2, m.MigrateTotalEscrowForDenom); err != nil { - panic(fmt.Errorf("failed to migrate transfer app from version 2 to 3 (total escrow entry migration): %v", err)) + if err := registrar.Register(types.ModuleName, 2, m.MigrateTotalEscrowForDenom); err != nil { + return fmt.Errorf("failed to migrate transfer app from version 2 to 3 (total escrow entry migration): %w", err) } - if err := cfg.RegisterMigration(types.ModuleName, 3, m.MigrateParams); err != nil { - panic(fmt.Errorf("failed to migrate transfer app version 3 to 4 (self-managed params migration): %v", err)) + if err := registrar.Register(types.ModuleName, 3, m.MigrateParams); err != nil { + return fmt.Errorf("failed to migrate transfer app version 3 to 4 (self-managed params migration): %w", err) } - if err := cfg.RegisterMigration(types.ModuleName, 4, m.MigrateDenomMetadata); err != nil { - panic(fmt.Errorf("failed to migrate transfer app from version 4 to 5 (set denom metadata migration): %v", err)) + if err := registrar.Register(types.ModuleName, 4, m.MigrateDenomMetadata); err != nil { + return fmt.Errorf("failed to migrate transfer app from version 4 to 5 (set denom metadata migration): %w", err) } - if err := cfg.RegisterMigration(types.ModuleName, 5, m.MigrateDenomTraceToDenom); err != nil { - panic(fmt.Errorf("failed to migrate transfer app from version 5 to 6 (migrate DenomTrace to Denom): %v", err)) + if err := registrar.Register(types.ModuleName, 5, m.MigrateDenomTraceToDenom); err != nil { + return fmt.Errorf("failed to migrate transfer app from version 5 to 6 (migrate DenomTrace to Denom): %w", err) } + + return nil } // InitGenesis performs genesis initialization for the ibc-transfer module. It returns diff --git a/modules/core/02-client/keeper/migrations.go b/modules/core/02-client/keeper/migrations.go index a66b783f522..5fae9dc8fdd 100644 --- a/modules/core/02-client/keeper/migrations.go +++ b/modules/core/02-client/keeper/migrations.go @@ -1,6 +1,8 @@ package keeper import ( + "context" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/ibc-go/v9/modules/core/02-client/migrations/v7" @@ -25,16 +27,16 @@ func NewMigrator(keeper *Keeper) Migrator { // - prunes solo machine consensus states // - removes the localhost client // - asserts that existing tendermint clients are properly registered on the chain codec -func (m Migrator) Migrate2to3(ctx sdk.Context) error { - return v7.MigrateStore(ctx, m.keeper.KVStoreService, m.keeper.cdc, m.keeper) +func (m Migrator) Migrate2to3(ctx context.Context) error { + return v7.MigrateStore(ctx, m.keeper.Logger, m.keeper.KVStoreService, m.keeper.cdc, m.keeper) } // MigrateParams migrates from consensus version 4 to 5. // This migration takes the parameters that are currently stored and managed by x/params // and stores them directly in the ibc module's state. -func (m Migrator) MigrateParams(ctx sdk.Context) error { +func (m Migrator) MigrateParams(ctx context.Context) error { var params types.Params - m.keeper.legacySubspace.GetParamSet(ctx, ¶ms) + m.keeper.legacySubspace.GetParamSet(sdk.UnwrapSDKContext(ctx), ¶ms) if err := params.Validate(); err != nil { return err } @@ -46,7 +48,7 @@ func (m Migrator) MigrateParams(ctx sdk.Context) error { // MigrateToStatelessLocalhost deletes the localhost client state. The localhost // implementation is now stateless. -func (m Migrator) MigrateToStatelessLocalhost(ctx sdk.Context) error { +func (m Migrator) MigrateToStatelessLocalhost(ctx context.Context) error { clientStore := m.keeper.ClientStore(ctx, exported.LocalhostClientID) // delete the client state diff --git a/modules/core/02-client/migrations/v7/genesis_test.go b/modules/core/02-client/migrations/v7/genesis_test.go index c674e7d9680..b0207d5cdf3 100644 --- a/modules/core/02-client/migrations/v7/genesis_test.go +++ b/modules/core/02-client/migrations/v7/genesis_test.go @@ -3,6 +3,8 @@ package v7_test import ( "encoding/json" + "cosmossdk.io/log" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/runtime" @@ -107,7 +109,7 @@ func (suite *MigrationsV7TestSuite) TestMigrateGenesisSolomachine() { // migrate store get expected genesis // store migration and genesis migration should produce identical results // NOTE: tendermint clients are not pruned in genesis so the test should not have expired tendermint clients - err = v7.MigrateStore(suite.chainA.GetContext(), runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(ibcexported.StoreKey)), suite.chainA.App.AppCodec(), suite.chainA.GetSimApp().IBCKeeper.ClientKeeper) + err = v7.MigrateStore(suite.chainA.GetContext(), log.NewTestLogger(suite.T()), runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(ibcexported.StoreKey)), suite.chainA.App.AppCodec(), suite.chainA.GetSimApp().IBCKeeper.ClientKeeper) suite.Require().NoError(err) expectedClientGenState, err := ibcclient.ExportGenesis(suite.chainA.GetContext(), suite.chainA.App.GetIBCKeeper().ClientKeeper) suite.Require().NoError(err) diff --git a/modules/core/02-client/migrations/v7/store.go b/modules/core/02-client/migrations/v7/store.go index bf9e44656b9..4ab12059fa5 100644 --- a/modules/core/02-client/migrations/v7/store.go +++ b/modules/core/02-client/migrations/v7/store.go @@ -1,8 +1,10 @@ package v7 import ( + "context" "strings" + "cosmossdk.io/core/log" corestore "cosmossdk.io/core/store" errorsmod "cosmossdk.io/errors" storetypes "cosmossdk.io/store/types" @@ -10,7 +12,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/runtime" - sdk "github.com/cosmos/cosmos-sdk/types" clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types" host "github.com/cosmos/ibc-go/v9/modules/core/24-host" @@ -32,24 +33,24 @@ const Localhost string = "09-localhost" // - Pruning all solo machine consensus states // - Removing the localhost client // - Asserting existing tendermint clients are properly registered on the chain codec -func MigrateStore(ctx sdk.Context, storeService corestore.KVStoreService, cdc codec.BinaryCodec, clientKeeper ClientKeeper) error { +func MigrateStore(ctx context.Context, logger log.Logger, storeService corestore.KVStoreService, cdc codec.BinaryCodec, clientKeeper ClientKeeper) error { store := runtime.KVStoreAdapter(storeService.OpenKVStore(ctx)) - if err := handleSolomachineMigration(ctx, store, cdc, clientKeeper); err != nil { + if err := handleSolomachineMigration(ctx, logger, store, cdc, clientKeeper); err != nil { return err } - if err := handleTendermintMigration(ctx, store, clientKeeper); err != nil { + if err := handleTendermintMigration(ctx, logger, store, clientKeeper); err != nil { return err } - return handleLocalhostMigration(ctx, store, clientKeeper) + return handleLocalhostMigration(ctx, logger, store, clientKeeper) } // handleSolomachineMigration iterates over the solo machine clients and migrates client state from // protobuf definition v2 to v3. All consensus states stored outside of the client state are pruned. -func handleSolomachineMigration(ctx sdk.Context, store storetypes.KVStore, cdc codec.BinaryCodec, clientKeeper ClientKeeper) error { - clients, err := collectClients(ctx, store, exported.Solomachine) +func handleSolomachineMigration(ctx context.Context, logger log.Logger, store storetypes.KVStore, cdc codec.BinaryCodec, clientKeeper ClientKeeper) error { + clients, err := collectClients(logger, store, exported.Solomachine) if err != nil { return err } @@ -85,8 +86,8 @@ func handleSolomachineMigration(ctx sdk.Context, store storetypes.KVStore, cdc c // handleTendermintMigration asserts that the tendermint client in state can be decoded properly. // This ensures the upgrading chain properly registered the tendermint client types on the chain codec. -func handleTendermintMigration(ctx sdk.Context, store storetypes.KVStore, clientKeeper ClientKeeper) error { - clients, err := collectClients(ctx, store, exported.Tendermint) +func handleTendermintMigration(ctx context.Context, logger log.Logger, store storetypes.KVStore, clientKeeper ClientKeeper) error { + clients, err := collectClients(logger, store, exported.Tendermint) if err != nil { return err } @@ -117,8 +118,8 @@ func handleTendermintMigration(ctx sdk.Context, store storetypes.KVStore, client } // handleLocalhostMigration removes all client and consensus states associated with the localhost client type. -func handleLocalhostMigration(ctx sdk.Context, store storetypes.KVStore, clientKeeper ClientKeeper) error { - clients, err := collectClients(ctx, store, Localhost) +func handleLocalhostMigration(ctx context.Context, logger log.Logger, store storetypes.KVStore, clientKeeper ClientKeeper) error { + clients, err := collectClients(logger, store, Localhost) if err != nil { return err } @@ -140,11 +141,11 @@ func handleLocalhostMigration(ctx sdk.Context, store storetypes.KVStore, clientK // avoid state corruption as modifying state during iteration is unsafe. A special case // for tendermint clients is included as only one tendermint clientID is required for // v7 migrations. -func collectClients(ctx sdk.Context, store storetypes.KVStore, clientType string) (clients []string, err error) { +func collectClients(logger log.Logger, store storetypes.KVStore, clientType string) (clients []string, err error) { clientPrefix := host.PrefixedClientStoreKey([]byte(clientType)) iterator := storetypes.KVStorePrefixIterator(store, clientPrefix) - defer coretypes.LogDeferred(ctx.Logger(), func() error { return iterator.Close() }) + defer coretypes.LogDeferred(logger, func() error { return iterator.Close() }) for ; iterator.Valid(); iterator.Next() { path := string(iterator.Key()) if !strings.Contains(path, host.KeyClientState) { diff --git a/modules/core/02-client/migrations/v7/store_test.go b/modules/core/02-client/migrations/v7/store_test.go index f9e104e823f..223ad91987a 100644 --- a/modules/core/02-client/migrations/v7/store_test.go +++ b/modules/core/02-client/migrations/v7/store_test.go @@ -6,6 +6,8 @@ import ( testifysuite "github.com/stretchr/testify/suite" + "cosmossdk.io/log" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/runtime" @@ -62,7 +64,7 @@ func (suite *MigrationsV7TestSuite) TestMigrateStore() { suite.createSolomachineClients(solomachines) suite.createLocalhostClients() - err := v7.MigrateStore(suite.chainA.GetContext(), runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(ibcexported.StoreKey)), suite.chainA.App.AppCodec(), suite.chainA.GetSimApp().IBCKeeper.ClientKeeper) + err := v7.MigrateStore(suite.chainA.GetContext(), log.NewTestLogger(suite.T()), runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(ibcexported.StoreKey)), suite.chainA.App.AppCodec(), suite.chainA.GetSimApp().IBCKeeper.ClientKeeper) suite.Require().NoError(err) suite.assertSolomachineClients(solomachines) @@ -78,7 +80,7 @@ func (suite *MigrationsV7TestSuite) TestMigrateStoreNoTendermintClients() { suite.createSolomachineClients(solomachines) suite.createLocalhostClients() - err := v7.MigrateStore(suite.chainA.GetContext(), runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(ibcexported.StoreKey)), suite.chainA.App.AppCodec(), suite.chainA.GetSimApp().IBCKeeper.ClientKeeper) + err := v7.MigrateStore(suite.chainA.GetContext(), log.NewTestLogger(suite.T()), runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(ibcexported.StoreKey)), suite.chainA.App.AppCodec(), suite.chainA.GetSimApp().IBCKeeper.ClientKeeper) suite.Require().NoError(err) suite.assertSolomachineClients(solomachines) diff --git a/modules/core/03-connection/keeper/migrations.go b/modules/core/03-connection/keeper/migrations.go index 83503ebf971..5220d00669f 100644 --- a/modules/core/03-connection/keeper/migrations.go +++ b/modules/core/03-connection/keeper/migrations.go @@ -1,6 +1,8 @@ package keeper import ( + "context" + sdk "github.com/cosmos/cosmos-sdk/types" connectionv7 "github.com/cosmos/ibc-go/v9/modules/core/03-connection/migrations/v7" @@ -19,7 +21,7 @@ func NewMigrator(keeper *Keeper) Migrator { // Migrate3to4 migrates from version 3 to 4. // This migration writes the sentinel localhost connection end to state. -func (m Migrator) Migrate3to4(ctx sdk.Context) error { +func (m Migrator) Migrate3to4(ctx context.Context) error { connectionv7.MigrateLocalhostConnection(ctx, m.keeper) return nil } @@ -27,9 +29,9 @@ func (m Migrator) Migrate3to4(ctx sdk.Context) error { // MigrateParams migrates from consensus version 4 to 5. // This migration takes the parameters that are currently stored and managed by x/params // and stores them directly in the ibc module's state. -func (m Migrator) MigrateParams(ctx sdk.Context) error { +func (m Migrator) MigrateParams(ctx context.Context) error { var params types.Params - m.keeper.legacySubspace.GetParamSet(ctx, ¶ms) + m.keeper.legacySubspace.GetParamSet(sdk.UnwrapSDKContext(ctx), ¶ms) if err := params.Validate(); err != nil { return err } diff --git a/modules/core/04-channel/keeper/migrations.go b/modules/core/04-channel/keeper/migrations.go index c83cf865022..23d9cc1f231 100644 --- a/modules/core/04-channel/keeper/migrations.go +++ b/modules/core/04-channel/keeper/migrations.go @@ -1,7 +1,7 @@ package keeper import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "context" channeltypes "github.com/cosmos/ibc-go/v9/modules/core/04-channel/types" ) @@ -17,7 +17,7 @@ func NewMigrator(keeper *Keeper) Migrator { } // MigrateParams migrates params to the default channel params. -func (m Migrator) MigrateParams(ctx sdk.Context) error { +func (m Migrator) MigrateParams(ctx context.Context) error { params := channeltypes.DefaultParams() m.keeper.SetParams(ctx, params) m.keeper.Logger.Info("successfully migrated ibc channel params") diff --git a/modules/core/migrations/v7/genesis_test.go b/modules/core/migrations/v7/genesis_test.go index fd5d6add051..860cd84a1a7 100644 --- a/modules/core/migrations/v7/genesis_test.go +++ b/modules/core/migrations/v7/genesis_test.go @@ -5,6 +5,8 @@ import ( testifysuite "github.com/stretchr/testify/suite" + "cosmossdk.io/log" + "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/runtime" @@ -136,7 +138,7 @@ func (suite *MigrationsV7TestSuite) TestMigrateGenesisSolomachine() { // migrate store get expected genesis // store migration and genesis migration should produce identical results // NOTE: tendermint clients are not pruned in genesis so the test should not have expired tendermint clients - err = clientv7.MigrateStore(suite.chainA.GetContext(), runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(ibcexported.StoreKey)), suite.chainA.App.AppCodec(), suite.chainA.GetSimApp().IBCKeeper.ClientKeeper) + err = clientv7.MigrateStore(suite.chainA.GetContext(), log.NewTestLogger(suite.T()), runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(ibcexported.StoreKey)), suite.chainA.App.AppCodec(), suite.chainA.GetSimApp().IBCKeeper.ClientKeeper) suite.Require().NoError(err) expectedClientGenState, err := ibcclient.ExportGenesis(suite.chainA.GetContext(), suite.chainA.App.GetIBCKeeper().ClientKeeper) suite.Require().NoError(err) diff --git a/modules/core/module.go b/modules/core/module.go index 3d39cdd72d0..8e7d401a752 100644 --- a/modules/core/module.go +++ b/modules/core/module.go @@ -7,6 +7,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + "google.golang.org/grpc" "cosmossdk.io/client/v2/autocli" "cosmossdk.io/core/appmodule" @@ -14,7 +15,6 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -37,11 +37,11 @@ var ( _ appmodule.HasBeginBlocker = (*AppModule)(nil) _ appmodule.HasConsensusVersion = (*AppModule)(nil) _ appmodule.HasRegisterInterfaces = (*AppModule)(nil) + _ appmodule.HasMigrations = (*AppModule)(nil) _ module.AppModule = (*AppModule)(nil) _ module.HasGRPCGateway = (*AppModule)(nil) _ module.HasGenesis = (*AppModule)(nil) - _ module.HasServices = (*AppModule)(nil) _ module.HasLegacyProposalMsgs = (*AppModule)(nil) _ module.AppModuleSimulation = (*AppModule)(nil) @@ -122,43 +122,48 @@ func (AppModule) RegisterInterfaces(registry coreregistry.InterfaceRegistrar) { types.RegisterInterfaces(registry) } -// RegisterServices registers module services. -func (am AppModule) RegisterServices(cfg module.Configurator) { - clienttypes.RegisterMsgServer(cfg.MsgServer(), am.keeper) - connectiontypes.RegisterMsgServer(cfg.MsgServer(), am.keeper) - channeltypes.RegisterMsgServer(cfg.MsgServer(), am.keeper) - clienttypes.RegisterQueryServer(cfg.QueryServer(), clientkeeper.NewQueryServer(am.keeper.ClientKeeper)) - connectiontypes.RegisterQueryServer(cfg.QueryServer(), connectionkeeper.NewQueryServer(am.keeper.ConnectionKeeper)) - channeltypes.RegisterQueryServer(cfg.QueryServer(), channelkeeper.NewQueryServer(am.keeper.ChannelKeeper)) - +func (am AppModule) RegisterMigrations(registrar appmodule.MigrationRegistrar) error { clientMigrator := clientkeeper.NewMigrator(am.keeper.ClientKeeper) - if err := cfg.RegisterMigration(exported.ModuleName, 2, clientMigrator.Migrate2to3); err != nil { - panic(err) + if err := registrar.Register(exported.ModuleName, 2, clientMigrator.Migrate2to3); err != nil { + return err } connectionMigrator := connectionkeeper.NewMigrator(am.keeper.ConnectionKeeper) - if err := cfg.RegisterMigration(exported.ModuleName, 3, connectionMigrator.Migrate3to4); err != nil { - panic(err) + if err := registrar.Register(exported.ModuleName, 3, connectionMigrator.Migrate3to4); err != nil { + return err } - if err := cfg.RegisterMigration(exported.ModuleName, 4, func(ctx sdk.Context) error { + if err := registrar.Register(exported.ModuleName, 4, func(ctx context.Context) error { if err := clientMigrator.MigrateParams(ctx); err != nil { return err } return connectionMigrator.MigrateParams(ctx) }); err != nil { - panic(err) + return err } channelMigrator := channelkeeper.NewMigrator(am.keeper.ChannelKeeper) - if err := cfg.RegisterMigration(exported.ModuleName, 5, channelMigrator.MigrateParams); err != nil { - panic(err) + if err := registrar.Register(exported.ModuleName, 5, channelMigrator.MigrateParams); err != nil { + return err } - if err := cfg.RegisterMigration(exported.ModuleName, 6, clientMigrator.MigrateToStatelessLocalhost); err != nil { - panic(err) + if err := registrar.Register(exported.ModuleName, 6, clientMigrator.MigrateToStatelessLocalhost); err != nil { + return err } + + return nil +} + +// RegisterServices registers module services. +func (am AppModule) RegisterServices(cfg grpc.ServiceRegistrar) error { + clienttypes.RegisterMsgServer(cfg, am.keeper) + connectiontypes.RegisterMsgServer(cfg, am.keeper) + channeltypes.RegisterMsgServer(cfg, am.keeper) + clienttypes.RegisterQueryServer(cfg, clientkeeper.NewQueryServer(am.keeper.ClientKeeper)) + connectiontypes.RegisterQueryServer(cfg, connectionkeeper.NewQueryServer(am.keeper.ConnectionKeeper)) + channeltypes.RegisterQueryServer(cfg, channelkeeper.NewQueryServer(am.keeper.ChannelKeeper)) + return nil } // InitGenesis performs genesis initialization for the ibc module. It returns diff --git a/modules/light-clients/08-wasm/keeper/migrations.go b/modules/light-clients/08-wasm/keeper/migrations.go index bf0a1488494..45005d625df 100644 --- a/modules/light-clients/08-wasm/keeper/migrations.go +++ b/modules/light-clients/08-wasm/keeper/migrations.go @@ -1,6 +1,8 @@ package keeper import ( + "context" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" @@ -24,7 +26,8 @@ func NewMigrator(keeper Keeper) Migrator { // It grabs the checksums stored previously under the old key and stores // them in the global KeySet collection. It then deletes the old key and // the checksums stored under it. -func (m Migrator) MigrateChecksums(ctx sdk.Context) error { +func (m Migrator) MigrateChecksums(goCtx context.Context) error { + ctx := sdk.UnwrapSDKContext(goCtx) checksums, err := m.getStoredChecksums(ctx) if err != nil { return err diff --git a/modules/light-clients/08-wasm/module.go b/modules/light-clients/08-wasm/module.go index bda17444165..6123b48d9cc 100644 --- a/modules/light-clients/08-wasm/module.go +++ b/modules/light-clients/08-wasm/module.go @@ -7,6 +7,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + "google.golang.org/grpc" "cosmossdk.io/client/v2/autocli" "cosmossdk.io/core/appmodule" @@ -25,11 +26,11 @@ var ( _ appmodule.AppModule = (*AppModule)(nil) _ appmodule.HasConsensusVersion = (*AppModule)(nil) _ appmodule.HasRegisterInterfaces = (*AppModule)(nil) + _ appmodule.HasMigrations = (*AppModule)(nil) _ module.AppModule = (*AppModule)(nil) _ module.HasGRPCGateway = (*AppModule)(nil) _ module.HasGenesis = (*AppModule)(nil) - _ module.HasServices = (*AppModule)(nil) _ autocli.HasCustomTxCommand = (*AppModule)(nil) _ autocli.HasCustomQueryCommand = (*AppModule)(nil) @@ -102,14 +103,18 @@ func (AppModule) GetQueryCmd() *cobra.Command { } // RegisterServices registers module services. -func (am AppModule) RegisterServices(cfg module.Configurator) { - types.RegisterMsgServer(cfg.MsgServer(), am.keeper) - types.RegisterQueryServer(cfg.QueryServer(), am.keeper) +func (am AppModule) RegisterServices(cfg grpc.ServiceRegistrar) error { + types.RegisterMsgServer(cfg, am.keeper) + types.RegisterQueryServer(cfg, am.keeper) + return nil +} +func (am AppModule) RegisterMigrations(registrar appmodule.MigrationRegistrar) error { wasmMigrator := keeper.NewMigrator(am.keeper) - if err := cfg.RegisterMigration(types.ModuleName, 1, wasmMigrator.MigrateChecksums); err != nil { - panic(fmt.Errorf("failed to migrate 08-wasm module from version 1 to 2 (checksums migration to collections): %v", err)) + if err := registrar.Register(types.ModuleName, 1, wasmMigrator.MigrateChecksums); err != nil { + return err } + return nil } // ConsensusVersion implements AppModule/ConsensusVersion. From ef7620aafdb5fea6d86940e103374a035421c66c Mon Sep 17 00:00:00 2001 From: ChicKen Bump <89718971+NisTun@users.noreply.github.com> Date: Mon, 27 Jan 2025 01:38:42 +0700 Subject: [PATCH 3/6] add setup order (#7840) Co-authored-by: Gjermund Garaba --- modules/core/keeper/msg_server_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/core/keeper/msg_server_test.go b/modules/core/keeper/msg_server_test.go index fef6d2acfb5..59503420c99 100644 --- a/modules/core/keeper/msg_server_test.go +++ b/modules/core/keeper/msg_server_test.go @@ -372,6 +372,7 @@ func (suite *KeeperTestSuite) TestHandleAcknowledgePacket() { packet = channeltypes.NewPacket(ibctesting.MockPacketData, sequence, path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, timeoutHeight, 0) }, errors.New("invalid proof"), false}, {"successful no-op: ORDERED - packet already acknowledged (replay)", func() { + path.SetChannelOrdered() path.Setup() sequence, err := path.EndpointA.SendPacket(timeoutHeight, 0, ibctesting.MockPacketData) From c0365a37d158e9c87612ba4ba72d8f921312db65 Mon Sep 17 00:00:00 2001 From: Tyler <48813565+technicallyty@users.noreply.github.com> Date: Tue, 28 Jan 2025 06:43:46 -0800 Subject: [PATCH 4/6] chore: migrate to address codec in transfer (#7892) * Replace deprecated usage of AddressFromBech32 with address.Codec * Add method ConvertToAccAddress on the E2ETestSuite * address cdc migration * linter --------- Co-authored-by: hungdinh82 Co-authored-by: Hung Dinh <76930315+hungdinh82@users.noreply.github.com> --- e2e/testsuite/tx.go | 30 ++++++++++++++----- .../controller/types/msgs_test.go | 6 +++- modules/apps/callbacks/testing/simapp/app.go | 1 + modules/apps/transfer/keeper/forwarding.go | 3 +- modules/apps/transfer/keeper/keeper.go | 4 +++ modules/apps/transfer/keeper/keeper_test.go | 4 +++ modules/apps/transfer/keeper/msg_server.go | 3 +- modules/apps/transfer/keeper/relay.go | 3 +- modules/apps/transfer/types/msgs.go | 4 ++- .../08-wasm/testing/simapp/app.go | 1 + simapp/app.go | 1 + testing/chain.go | 2 ++ testing/simapp/app.go | 1 + 13 files changed, 51 insertions(+), 12 deletions(-) diff --git a/e2e/testsuite/tx.go b/e2e/testsuite/tx.go index c037ebb3d3b..3ed4e496d07 100644 --- a/e2e/testsuite/tx.go +++ b/e2e/testsuite/tx.go @@ -21,6 +21,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" + addresscodec "github.com/cosmos/cosmos-sdk/codec/address" sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/cometbft/cometbft/api/cometbft/abci/v1" @@ -153,14 +154,13 @@ func (s *E2ETestSuite) ExecuteAndPassGovV1Proposal(ctx context.Context, msg sdk. // ExecuteGovV1Proposal submits a v1 governance proposal using the provided user and message and uses all validators // to vote yes on the proposal. func (s *E2ETestSuite) ExecuteGovV1Proposal(ctx context.Context, msg sdk.Msg, chain ibc.Chain, user ibc.Wallet) error { + sender := s.ConvertToAccAddress(chain, user.FormattedAddress()) + cosmosChain, ok := chain.(*cosmos.CosmosChain) if !ok { - panic("ExecuteAndPassGovV1Proposal must be passed a cosmos.CosmosChain") + panic("ExecuteGovV1Proposal must be passed a cosmos.CosmosChain") } - sender, err := sdk.AccAddressFromBech32(user.FormattedAddress()) - s.Require().NoError(err) - proposalID := s.proposalIDs[cosmosChain.Config().ChainID] defer func() { s.proposalIDs[cosmosChain.Config().ChainID] = proposalID + 1 @@ -189,6 +189,19 @@ func (s *E2ETestSuite) ExecuteGovV1Proposal(ctx context.Context, msg sdk.Msg, ch return s.waitForGovV1ProposalToPass(ctx, cosmosChain, proposalID) } +func (s *E2ETestSuite) ConvertToAccAddress(chain ibc.Chain, formattedAddress string) sdk.AccAddress { + cosmosChain, ok := chain.(*cosmos.CosmosChain) + if !ok { + panic("ConvertToAccAddress must be passed a cosmos.CosmosChain") + } + + addrCdc := addresscodec.NewBech32Codec(cosmosChain.Config().Bech32Prefix) + senderBytes, err := addrCdc.StringToBytes(formattedAddress) + s.Require().NoError(err) + + return sdk.AccAddress(senderBytes) +} + // waitForGovV1ProposalToPass polls for the entire voting period to see if the proposal has passed. // if the proposal has not passed within the duration of the voting period, an error is returned. func (s *E2ETestSuite) waitForGovV1ProposalToPass(ctx context.Context, chain ibc.Chain, proposalID uint64) error { @@ -276,10 +289,13 @@ func (*E2ETestSuite) waitForGovV1Beta1ProposalToPass(ctx context.Context, chain // ExecuteGovV1Beta1Proposal submits a v1beta1 governance proposal using the provided content. func (s *E2ETestSuite) ExecuteGovV1Beta1Proposal(ctx context.Context, chain ibc.Chain, user ibc.Wallet, content govtypesv1beta1.Content) sdk.TxResponse { - sender, err := sdk.AccAddressFromBech32(user.FormattedAddress()) - s.Require().NoError(err) + sender := s.ConvertToAccAddress(chain, user.FormattedAddress()) - msgSubmitProposal, err := govtypesv1beta1.NewMsgSubmitProposal(content, sdk.NewCoins(sdk.NewCoin(chain.Config().Denom, govtypesv1beta1.DefaultMinDepositTokens)), sender.String()) + msgSubmitProposal, err := govtypesv1beta1.NewMsgSubmitProposal( + content, + sdk.NewCoins(sdk.NewCoin(chain.Config().Denom, govtypesv1beta1.DefaultMinDepositTokens)), + sender.String(), + ) s.Require().NoError(err) return s.BroadcastMessages(ctx, chain, user, msgSubmitProposal) diff --git a/modules/apps/27-interchain-accounts/controller/types/msgs_test.go b/modules/apps/27-interchain-accounts/controller/types/msgs_test.go index 33f89d81faf..8f1933b6ba2 100644 --- a/modules/apps/27-interchain-accounts/controller/types/msgs_test.go +++ b/modules/apps/27-interchain-accounts/controller/types/msgs_test.go @@ -9,6 +9,7 @@ import ( banktypes "cosmossdk.io/x/bank/types" + addresscodec "github.com/cosmos/cosmos-sdk/codec/address" "github.com/cosmos/cosmos-sdk/codec/testutil" sdk "github.com/cosmos/cosmos-sdk/types" moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" @@ -108,7 +109,10 @@ func TestMsgRegisterInterchainAccountValidateBasic(t *testing.T) { } func TestMsgRegisterInterchainAccountGetSigners(t *testing.T) { - expSigner, err := sdk.AccAddressFromBech32(ibctesting.TestAccAddress) + addrCdc := addresscodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()) + expSigerBytes, err := addrCdc.StringToBytes(ibctesting.TestAccAddress) + expSigner := sdk.AccAddress(expSigerBytes) + require.NoError(t, err) msg := types.NewMsgRegisterInterchainAccount(ibctesting.FirstConnectionID, ibctesting.TestAccAddress, "", channeltypes.ORDERED) diff --git a/modules/apps/callbacks/testing/simapp/app.go b/modules/apps/callbacks/testing/simapp/app.go index a17ba33d992..14badd2282f 100644 --- a/modules/apps/callbacks/testing/simapp/app.go +++ b/modules/apps/callbacks/testing/simapp/app.go @@ -469,6 +469,7 @@ func NewSimApp( // NOTE: the Transfer Keeper's ICS4Wrapper can later be replaced. app.TransferKeeper = ibctransferkeeper.NewKeeper( appCodec, + signingCtx.AddressCodec(), runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibctransfertypes.StoreKey]), logger.With(log.ModuleKey, fmt.Sprintf("x/%s-%s", ibcexported.ModuleName, ibctransfertypes.ModuleName))), app.GetSubspace(ibctransfertypes.ModuleName), app.IBCFeeKeeper, // ISC4 Wrapper: fee IBC middleware diff --git a/modules/apps/transfer/keeper/forwarding.go b/modules/apps/transfer/keeper/forwarding.go index fbf015d0413..4d3df776000 100644 --- a/modules/apps/transfer/keeper/forwarding.go +++ b/modules/apps/transfer/keeper/forwarding.go @@ -104,7 +104,8 @@ func (k Keeper) getReceiverFromPacketData(data types.FungibleTokenPacketDataV2) return k.authKeeper.GetModuleAddress(types.ModuleName), nil } - receiver, err := sdk.AccAddressFromBech32(data.Receiver) + receiverBytes, err := k.addrCdc.StringToBytes(data.Receiver) + receiver := sdk.AccAddress(receiverBytes) if err != nil { return nil, errorsmod.Wrapf(ibcerrors.ErrInvalidAddress, "failed to decode receiver address %s: %v", data.Receiver, err) } diff --git a/modules/apps/transfer/keeper/keeper.go b/modules/apps/transfer/keeper/keeper.go index 786ae1b536c..3300d25df29 100644 --- a/modules/apps/transfer/keeper/keeper.go +++ b/modules/apps/transfer/keeper/keeper.go @@ -6,6 +6,7 @@ import ( "fmt" "strings" + "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" sdkmath "cosmossdk.io/math" "cosmossdk.io/store/prefix" @@ -29,6 +30,7 @@ import ( type Keeper struct { appmodule.Environment + addrCdc address.Codec cdc codec.BinaryCodec legacySubspace types.ParamSubspace @@ -45,6 +47,7 @@ type Keeper struct { // NewKeeper creates a new IBC transfer Keeper instance func NewKeeper( cdc codec.BinaryCodec, + addrCdc address.Codec, env appmodule.Environment, legacySubspace types.ParamSubspace, ics4Wrapper porttypes.ICS4Wrapper, @@ -64,6 +67,7 @@ func NewKeeper( return Keeper{ cdc: cdc, + addrCdc: addrCdc, Environment: env, legacySubspace: legacySubspace, ics4Wrapper: ics4Wrapper, diff --git a/modules/apps/transfer/keeper/keeper_test.go b/modules/apps/transfer/keeper/keeper_test.go index 3ff56bd7998..c48eed91846 100644 --- a/modules/apps/transfer/keeper/keeper_test.go +++ b/modules/apps/transfer/keeper/keeper_test.go @@ -12,6 +12,7 @@ import ( minttypes "cosmossdk.io/x/mint/types" "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/codec/address" "github.com/cosmos/cosmos-sdk/runtime" sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" @@ -58,6 +59,7 @@ func (suite *KeeperTestSuite) TestNewKeeper() { {"success", func() { keeper.NewKeeper( suite.chainA.GetSimApp().AppCodec(), + address.NewBech32Codec(suite.chainA.Bech32Prefix), runtime.NewEnvironment(runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(types.StoreKey)), log.NewNopLogger()), suite.chainA.GetSimApp().GetSubspace(types.ModuleName), suite.chainA.GetSimApp().IBCKeeper.ChannelKeeper, @@ -70,6 +72,7 @@ func (suite *KeeperTestSuite) TestNewKeeper() { {"failure: transfer module account does not exist", func() { keeper.NewKeeper( suite.chainA.GetSimApp().AppCodec(), + address.NewBech32Codec(suite.chainA.Bech32Prefix), runtime.NewEnvironment(runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(types.StoreKey)), log.NewNopLogger()), suite.chainA.GetSimApp().GetSubspace(types.ModuleName), suite.chainA.GetSimApp().IBCKeeper.ChannelKeeper, @@ -82,6 +85,7 @@ func (suite *KeeperTestSuite) TestNewKeeper() { {"failure: empty authority", func() { keeper.NewKeeper( suite.chainA.GetSimApp().AppCodec(), + address.NewBech32Codec(suite.chainA.Bech32Prefix), runtime.NewEnvironment(runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(types.StoreKey)), log.NewNopLogger()), suite.chainA.GetSimApp().GetSubspace(types.ModuleName), suite.chainA.GetSimApp().IBCKeeper.ChannelKeeper, diff --git a/modules/apps/transfer/keeper/msg_server.go b/modules/apps/transfer/keeper/msg_server.go index de57080adeb..13b0f556075 100644 --- a/modules/apps/transfer/keeper/msg_server.go +++ b/modules/apps/transfer/keeper/msg_server.go @@ -20,10 +20,11 @@ func (k Keeper) Transfer(ctx context.Context, msg *types.MsgTransfer) (*types.Ms return nil, types.ErrSendDisabled } - sender, err := sdk.AccAddressFromBech32(msg.Sender) + senderBytes, err := k.addrCdc.StringToBytes(msg.Sender) if err != nil { return nil, err } + sender := sdk.AccAddress(senderBytes) coins := msg.GetCoins() diff --git a/modules/apps/transfer/keeper/relay.go b/modules/apps/transfer/keeper/relay.go index 07043402a4c..721a2133938 100644 --- a/modules/apps/transfer/keeper/relay.go +++ b/modules/apps/transfer/keeper/relay.go @@ -348,7 +348,8 @@ func (k Keeper) OnTimeoutPacket(ctx context.Context, packet channeltypes.Packet, func (k Keeper) refundPacketTokens(ctx context.Context, packet channeltypes.Packet, data types.FungibleTokenPacketDataV2) error { // NOTE: packet data type already checked in handler.go - sender, err := sdk.AccAddressFromBech32(data.Sender) + senderBytes, err := k.addrCdc.StringToBytes(data.Sender) + sender := sdk.AccAddress(senderBytes) if err != nil { return err } diff --git a/modules/apps/transfer/types/msgs.go b/modules/apps/transfer/types/msgs.go index a9392292191..83e4ba70dd3 100644 --- a/modules/apps/transfer/types/msgs.go +++ b/modules/apps/transfer/types/msgs.go @@ -5,6 +5,7 @@ import ( errorsmod "cosmossdk.io/errors" + addresscodec "github.com/cosmos/cosmos-sdk/codec/address" sdk "github.com/cosmos/cosmos-sdk/types" clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types" @@ -35,7 +36,8 @@ func NewMsgUpdateParams(signer string, params Params) *MsgUpdateParams { // ValidateBasic implements sdk.Msg func (msg MsgUpdateParams) ValidateBasic() error { - _, err := sdk.AccAddressFromBech32(msg.Signer) + addrCdc := addresscodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()) + _, err := addrCdc.StringToBytes(msg.Signer) if err != nil { return errorsmod.Wrapf(ibcerrors.ErrInvalidAddress, "string could not be parsed as address: %v", err) } diff --git a/modules/light-clients/08-wasm/testing/simapp/app.go b/modules/light-clients/08-wasm/testing/simapp/app.go index 4a1cf36282b..fa34fdc6f85 100644 --- a/modules/light-clients/08-wasm/testing/simapp/app.go +++ b/modules/light-clients/08-wasm/testing/simapp/app.go @@ -595,6 +595,7 @@ func NewSimApp( // since fee middleware will wrap the IBCKeeper for underlying application. app.TransferKeeper = ibctransferkeeper.NewKeeper( appCodec, + signingCtx.AddressCodec(), runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibctransfertypes.StoreKey]), logger.With(log.ModuleKey, fmt.Sprintf("x/%s-%s", ibcexported.ModuleName, ibctransfertypes.ModuleName))), app.GetSubspace(ibctransfertypes.ModuleName), app.IBCFeeKeeper, // ISC4 Wrapper: fee IBC middleware diff --git a/simapp/app.go b/simapp/app.go index bb90ceb6379..c2e25dd396c 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -577,6 +577,7 @@ func NewSimApp( // since fee middleware will wrap the IBCKeeper for underlying application. app.TransferKeeper = ibctransferkeeper.NewKeeper( appCodec, + signingCtx.AddressCodec(), runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibctransfertypes.StoreKey]), logger.With(log.ModuleKey, fmt.Sprintf("x/%s-%s", ibcexported.ModuleName, ibctransfertypes.ModuleName))), app.GetSubspace(ibctransfertypes.ModuleName), app.IBCFeeKeeper, // ISC4 Wrapper: fee IBC middleware diff --git a/testing/chain.go b/testing/chain.go index 357406cb6f5..75e4d6c83c8 100644 --- a/testing/chain.go +++ b/testing/chain.go @@ -61,6 +61,7 @@ type TestChain struct { ProposedHeader cmtproto.Header // proposed (uncommitted) header for current block height TxConfig client.TxConfig Codec codec.Codec + Bech32Prefix string Vals *cmttypes.ValidatorSet NextVals *cmttypes.ValidatorSet @@ -162,6 +163,7 @@ func NewTestChainWithValSet(tb testing.TB, coord *Coordinator, chainID string, v SenderPrivKey: senderAccs[0].SenderPrivKey, SenderAccount: senderAccs[0].SenderAccount, SenderAccounts: senderAccs, + Bech32Prefix: sdk.GetConfig().GetBech32AccountAddrPrefix(), } // commit genesis block diff --git a/testing/simapp/app.go b/testing/simapp/app.go index 0825efc8d37..8b0a588850f 100644 --- a/testing/simapp/app.go +++ b/testing/simapp/app.go @@ -547,6 +547,7 @@ func NewSimApp( // since fee middleware will wrap the IBCKeeper for underlying application. app.TransferKeeper = ibctransferkeeper.NewKeeper( appCodec, + signingCtx.AddressCodec(), runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibctransfertypes.StoreKey]), logger.With(log.ModuleKey, fmt.Sprintf("x/%s-%s", ibcexported.ModuleName, ibctransfertypes.ModuleName))), app.GetSubspace(ibctransfertypes.ModuleName), app.IBCFeeKeeper, // ISC4 Wrapper: fee IBC middleware From 6a1986c265d54ce31ac2468449ebb749ce3e58ca Mon Sep 17 00:00:00 2001 From: Tyler <48813565+technicallyty@users.noreply.github.com> Date: Wed, 29 Jan 2025 00:58:46 -0800 Subject: [PATCH 5/6] chore: make all keepers use address codecs (#7896) * all keepers now use addr codec * linter --- modules/apps/29-fee/ibc_middleware.go | 4 ++-- modules/apps/29-fee/keeper/escrow.go | 10 +++++----- modules/apps/29-fee/keeper/keeper.go | 19 +++++++++++-------- modules/apps/29-fee/keeper/migrations.go | 2 +- modules/apps/29-fee/keeper/msg_server.go | 8 +++----- modules/apps/callbacks/testing/simapp/app.go | 2 ++ modules/core/keeper/keeper.go | 7 +++++-- modules/core/keeper/keeper_test.go | 3 +++ modules/core/keeper/msg_server.go | 8 ++++---- .../08-wasm/testing/simapp/app.go | 2 ++ simapp/app.go | 2 ++ testing/simapp/app.go | 2 ++ 12 files changed, 42 insertions(+), 27 deletions(-) diff --git a/modules/apps/29-fee/ibc_middleware.go b/modules/apps/29-fee/ibc_middleware.go index 08d8c227a3f..410c58da73d 100644 --- a/modules/apps/29-fee/ibc_middleware.go +++ b/modules/apps/29-fee/ibc_middleware.go @@ -283,7 +283,7 @@ func (im IBCMiddleware) OnAcknowledgementPacket( payee = relayer.String() } - payeeAddr, err := sdk.AccAddressFromBech32(payee) + payeeAddr, err := im.keeper.AddrCodec.StringToBytes(payee) if err != nil { return errorsmod.Wrapf(err, "failed to create sdk.Address from payee: %s", payee) } @@ -329,7 +329,7 @@ func (im IBCMiddleware) OnTimeoutPacket( payee = relayer.String() } - payeeAddr, err := sdk.AccAddressFromBech32(payee) + payeeAddr, err := im.keeper.AddrCodec.StringToBytes(payee) if err != nil { return errorsmod.Wrapf(err, "failed to create sdk.Address from payee: %s", payee) } diff --git a/modules/apps/29-fee/keeper/escrow.go b/modules/apps/29-fee/keeper/escrow.go index c18935ef7ac..9a5f98a7b09 100644 --- a/modules/apps/29-fee/keeper/escrow.go +++ b/modules/apps/29-fee/keeper/escrow.go @@ -18,7 +18,7 @@ import ( // escrowPacketFee sends the packet fee to the 29-fee module account to hold in escrow func (k Keeper) escrowPacketFee(ctx context.Context, packetID channeltypes.PacketId, packetFee types.PacketFee) error { // check if the refund address is valid - refundAddr, err := sdk.AccAddressFromBech32(packetFee.RefundAddress) + refundAddr, err := k.AddrCodec.StringToBytes(packetFee.RefundAddress) if err != nil { return err } @@ -52,7 +52,7 @@ func (k Keeper) DistributePacketFeesOnAcknowledgement(ctx context.Context, forwa // if the escrow account has insufficient balance then we want to avoid partially distributing fees if err := k.BranchService.Execute(ctx, func(ctx context.Context) error { // forward relayer address will be empty if conversion fails - forwardAddr, _ := sdk.AccAddressFromBech32(forwardRelayer) + forwardAddr, _ := k.AddrCodec.StringToBytes(forwardRelayer) for _, packetFee := range packetFees { if !k.EscrowAccountHasBalance(ctx, packetFee.Fee.Total()) { @@ -61,7 +61,7 @@ func (k Keeper) DistributePacketFeesOnAcknowledgement(ctx context.Context, forwa } // check if refundAcc address works - refundAddr, err := sdk.AccAddressFromBech32(packetFee.RefundAddress) + refundAddr, err := k.AddrCodec.StringToBytes(packetFee.RefundAddress) if err != nil { panic(fmt.Errorf("could not parse refundAcc %s to sdk.AccAddress", packetFee.RefundAddress)) } @@ -117,7 +117,7 @@ func (k Keeper) DistributePacketFeesOnTimeout(ctx context.Context, timeoutRelaye } // check if refundAcc address works - refundAddr, err := sdk.AccAddressFromBech32(packetFee.RefundAddress) + refundAddr, err := k.AddrCodec.StringToBytes(packetFee.RefundAddress) if err != nil { panic(fmt.Errorf("could not parse refundAcc %s to sdk.AccAddress", packetFee.RefundAddress)) } @@ -206,7 +206,7 @@ func (k Keeper) RefundFeesOnChannelClosure(ctx context.Context, portID, channelI return ibcerrors.ErrInsufficientFunds } - refundAddr, err := sdk.AccAddressFromBech32(packetFee.RefundAddress) + refundAddr, err := k.AddrCodec.StringToBytes(packetFee.RefundAddress) if err != nil { unRefundedFees = append(unRefundedFees, packetFee) continue diff --git a/modules/apps/29-fee/keeper/keeper.go b/modules/apps/29-fee/keeper/keeper.go index 2b027f96da7..282ebb7eb76 100644 --- a/modules/apps/29-fee/keeper/keeper.go +++ b/modules/apps/29-fee/keeper/keeper.go @@ -3,6 +3,7 @@ package keeper import ( "context" + "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" storetypes "cosmossdk.io/store/types" @@ -24,7 +25,8 @@ var _ types.ChannelKeeper = (*Keeper)(nil) type Keeper struct { appmodule.Environment - cdc codec.BinaryCodec + cdc codec.BinaryCodec + AddrCodec address.Codec authKeeper types.AuthKeeper ics4Wrapper porttypes.ICS4Wrapper @@ -34,12 +36,13 @@ type Keeper struct { // NewKeeper creates a new 29-fee Keeper instance func NewKeeper( - cdc codec.BinaryCodec, env appmodule.Environment, + cdc codec.BinaryCodec, addrCdc address.Codec, env appmodule.Environment, ics4Wrapper porttypes.ICS4Wrapper, channelKeeper types.ChannelKeeper, authKeeper types.AuthKeeper, bankKeeper types.BankKeeper, ) Keeper { return Keeper{ cdc: cdc, + AddrCodec: addrCdc, Environment: env, ics4Wrapper: ics4Wrapper, channelKeeper: channelKeeper, @@ -220,17 +223,17 @@ func (k Keeper) GetAllPayees(ctx context.Context) []types.RegisteredPayee { // SetCounterpartyPayeeAddress maps the destination chain counterparty payee address to the source relayer address // The receiving chain must store the mapping from: address -> counterpartyPayeeAddress for the given channel -func (k Keeper) SetCounterpartyPayeeAddress(ctx context.Context, address, counterpartyAddress, channelID string) { +func (k Keeper) SetCounterpartyPayeeAddress(ctx context.Context, addr, counterpartyAddress, channelID string) { store := k.KVStoreService.OpenKVStore(ctx) - if err := store.Set(types.KeyCounterpartyPayee(address, channelID), []byte(counterpartyAddress)); err != nil { + if err := store.Set(types.KeyCounterpartyPayee(addr, channelID), []byte(counterpartyAddress)); err != nil { panic(err) } } // GetCounterpartyPayeeAddress gets the counterparty payee address given a destination relayer address -func (k Keeper) GetCounterpartyPayeeAddress(ctx context.Context, address, channelID string) (string, bool) { +func (k Keeper) GetCounterpartyPayeeAddress(ctx context.Context, relayerAddr, channelID string) (string, bool) { store := k.KVStoreService.OpenKVStore(ctx) - key := types.KeyCounterpartyPayee(address, channelID) + key := types.KeyCounterpartyPayee(relayerAddr, channelID) addr, err := store.Get(key) if err != nil { @@ -269,9 +272,9 @@ func (k Keeper) GetAllCounterpartyPayees(ctx context.Context) []types.Registered } // SetRelayerAddressForAsyncAck sets the forward relayer address during OnRecvPacket in case of async acknowledgement -func (k Keeper) SetRelayerAddressForAsyncAck(ctx context.Context, packetID channeltypes.PacketId, address string) { +func (k Keeper) SetRelayerAddressForAsyncAck(ctx context.Context, packetID channeltypes.PacketId, addr string) { store := k.KVStoreService.OpenKVStore(ctx) - if err := store.Set(types.KeyRelayerAddressForAsyncAck(packetID), []byte(address)); err != nil { + if err := store.Set(types.KeyRelayerAddressForAsyncAck(packetID), []byte(addr)); err != nil { panic(err) } } diff --git a/modules/apps/29-fee/keeper/migrations.go b/modules/apps/29-fee/keeper/migrations.go index 0b9477b569d..94556d578ae 100644 --- a/modules/apps/29-fee/keeper/migrations.go +++ b/modules/apps/29-fee/keeper/migrations.go @@ -37,7 +37,7 @@ func (m Migrator) Migrate1to2(ctx context.Context) error { for _, packetFee := range feesInEscrow.PacketFees { refundCoins := legacyTotal(packetFee.Fee).Sub(packetFee.Fee.Total()...) - refundAddr, err := sdk.AccAddressFromBech32(packetFee.RefundAddress) + refundAddr, err := m.keeper.AddrCodec.StringToBytes(packetFee.RefundAddress) if err != nil { return err } diff --git a/modules/apps/29-fee/keeper/msg_server.go b/modules/apps/29-fee/keeper/msg_server.go index 87cf093ad9f..253f41ec093 100644 --- a/modules/apps/29-fee/keeper/msg_server.go +++ b/modules/apps/29-fee/keeper/msg_server.go @@ -5,8 +5,6 @@ import ( errorsmod "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/ibc-go/v9/modules/apps/29-fee/types" channeltypes "github.com/cosmos/ibc-go/v9/modules/core/04-channel/types" ibcerrors "github.com/cosmos/ibc-go/v9/modules/core/errors" @@ -20,7 +18,7 @@ var _ types.MsgServer = (*Keeper)(nil) // the source chain from which packets originate as this is where fee distribution takes place. This function may be // called more than once by a relayer, in which case, the latest payee is always used. func (k Keeper) RegisterPayee(ctx context.Context, msg *types.MsgRegisterPayee) (*types.MsgRegisterPayeeResponse, error) { - payee, err := sdk.AccAddressFromBech32(msg.Payee) + payee, err := k.AddrCodec.StringToBytes(msg.Payee) if err != nil { return nil, err } @@ -87,7 +85,7 @@ func (k Keeper) PayPacketFee(ctx context.Context, msg *types.MsgPayPacketFee) (* return nil, types.ErrFeeModuleLocked } - refundAcc, err := sdk.AccAddressFromBech32(msg.Signer) + refundAcc, err := k.AddrCodec.StringToBytes(msg.Signer) if err != nil { return nil, err } @@ -130,7 +128,7 @@ func (k Keeper) PayPacketFeeAsync(ctx context.Context, msg *types.MsgPayPacketFe return nil, types.ErrFeeModuleLocked } - refundAcc, err := sdk.AccAddressFromBech32(msg.PacketFee.RefundAddress) + refundAcc, err := k.AddrCodec.StringToBytes(msg.PacketFee.RefundAddress) if err != nil { return nil, err } diff --git a/modules/apps/callbacks/testing/simapp/app.go b/modules/apps/callbacks/testing/simapp/app.go index 14badd2282f..b1e260384be 100644 --- a/modules/apps/callbacks/testing/simapp/app.go +++ b/modules/apps/callbacks/testing/simapp/app.go @@ -405,6 +405,7 @@ func NewSimApp( app.IBCKeeper = ibckeeper.NewKeeper( appCodec, + signingCtx.AddressCodec(), runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibcexported.StoreKey]), logger.With(log.ModuleKey, "x/ibc")), app.GetSubspace(ibcexported.ModuleName), app.UpgradeKeeper, @@ -431,6 +432,7 @@ func NewSimApp( // IBC Fee Module keeper app.IBCFeeKeeper = ibcfeekeeper.NewKeeper( appCodec, + signingCtx.AddressCodec(), runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibcfeetypes.StoreKey]), logger.With(log.ModuleKey, fmt.Sprintf("x/%s-%s", ibcexported.ModuleName, ibcfeetypes.ModuleName))), app.IBCKeeper.ChannelKeeper, // may be replaced with IBC middleware app.IBCKeeper.ChannelKeeper, diff --git a/modules/core/keeper/keeper.go b/modules/core/keeper/keeper.go index 9c9350071ec..c55e3b61fa8 100644 --- a/modules/core/keeper/keeper.go +++ b/modules/core/keeper/keeper.go @@ -5,6 +5,7 @@ import ( "reflect" "strings" + "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" "github.com/cosmos/cosmos-sdk/codec" @@ -27,14 +28,15 @@ type Keeper struct { ChannelKeeper *channelkeeper.Keeper PortKeeper *portkeeper.Keeper - cdc codec.BinaryCodec + cdc codec.BinaryCodec + AddrCdc address.Codec authority string } // NewKeeper creates a new ibc Keeper func NewKeeper( - cdc codec.BinaryCodec, env appmodule.Environment, paramSpace types.ParamSubspace, + cdc codec.BinaryCodec, addrCdc address.Codec, env appmodule.Environment, paramSpace types.ParamSubspace, upgradeKeeper clienttypes.UpgradeKeeper, authority string, ) *Keeper { // panic if any of the keepers passed in is empty @@ -54,6 +56,7 @@ func NewKeeper( return &Keeper{ Environment: env, cdc: cdc, + AddrCdc: addrCdc, ClientKeeper: clientKeeper, ConnectionKeeper: connectionKeeper, ChannelKeeper: channelKeeper, diff --git a/modules/core/keeper/keeper_test.go b/modules/core/keeper/keeper_test.go index fa4e01238c3..5162589e02d 100644 --- a/modules/core/keeper/keeper_test.go +++ b/modules/core/keeper/keeper_test.go @@ -8,6 +8,7 @@ import ( "cosmossdk.io/log" upgradekeeper "cosmossdk.io/x/upgrade/keeper" + "github.com/cosmos/cosmos-sdk/codec/address" "github.com/cosmos/cosmos-sdk/runtime" clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types" @@ -76,6 +77,7 @@ func (suite *KeeperTestSuite) TestNewKeeper() { newIBCKeeperFn = func() { ibckeeper.NewKeeper( suite.chainA.GetSimApp().AppCodec(), + address.NewBech32Codec(suite.chainA.Bech32Prefix), runtime.NewEnvironment(runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(ibcexported.StoreKey)), log.NewNopLogger()), suite.chainA.GetSimApp().GetSubspace(ibcexported.ModuleName), upgradeKeeper, @@ -96,6 +98,7 @@ func (suite *KeeperTestSuite) TestNewKeeper() { newIBCKeeperFn = func() { ibckeeper.NewKeeper( suite.chainA.GetSimApp().AppCodec(), + address.NewBech32Codec(suite.chainA.Bech32Prefix), runtime.NewEnvironment(runtime.NewKVStoreService(suite.chainA.GetSimApp().GetKey(ibcexported.StoreKey)), log.NewNopLogger()), suite.chainA.GetSimApp().GetSubspace(ibcexported.ModuleName), upgradeKeeper, diff --git a/modules/core/keeper/msg_server.go b/modules/core/keeper/msg_server.go index d6aac0335f2..d58cd30edcb 100644 --- a/modules/core/keeper/msg_server.go +++ b/modules/core/keeper/msg_server.go @@ -361,7 +361,7 @@ func (k *Keeper) ChannelCloseConfirm(ctx context.Context, msg *channeltypes.MsgC func (k *Keeper) RecvPacket(goCtx context.Context, msg *channeltypes.MsgRecvPacket) (*channeltypes.MsgRecvPacketResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - relayer, err := sdk.AccAddressFromBech32(msg.Signer) + relayer, err := k.AddrCdc.StringToBytes(msg.Signer) if err != nil { k.Logger.Error("receive packet failed", "error", errorsmod.Wrap(err, "Invalid address for msg Signer")) return nil, errorsmod.Wrap(err, "Invalid address for msg Signer") @@ -424,7 +424,7 @@ func (k *Keeper) RecvPacket(goCtx context.Context, msg *channeltypes.MsgRecvPack // Timeout defines a rpc handler method for MsgTimeout. func (k *Keeper) Timeout(ctx context.Context, msg *channeltypes.MsgTimeout) (*channeltypes.MsgTimeoutResponse, error) { - relayer, err := sdk.AccAddressFromBech32(msg.Signer) + relayer, err := k.AddrCdc.StringToBytes(msg.Signer) if err != nil { k.Logger.Error("timeout failed", "error", errorsmod.Wrap(err, "Invalid address for msg Signer")) return nil, errorsmod.Wrap(err, "Invalid address for msg Signer") @@ -482,7 +482,7 @@ func (k *Keeper) Timeout(ctx context.Context, msg *channeltypes.MsgTimeout) (*ch // TimeoutOnClose defines a rpc handler method for MsgTimeoutOnClose. func (k *Keeper) TimeoutOnClose(ctx context.Context, msg *channeltypes.MsgTimeoutOnClose) (*channeltypes.MsgTimeoutOnCloseResponse, error) { - relayer, err := sdk.AccAddressFromBech32(msg.Signer) + relayer, err := k.AddrCdc.StringToBytes(msg.Signer) if err != nil { k.Logger.Error("timeout on close failed", "error", errorsmod.Wrap(err, "Invalid address for msg Signer")) return nil, errorsmod.Wrap(err, "Invalid address for msg Signer") @@ -541,7 +541,7 @@ func (k *Keeper) TimeoutOnClose(ctx context.Context, msg *channeltypes.MsgTimeou // Acknowledgement defines a rpc handler method for MsgAcknowledgement. func (k *Keeper) Acknowledgement(ctx context.Context, msg *channeltypes.MsgAcknowledgement) (*channeltypes.MsgAcknowledgementResponse, error) { - relayer, err := sdk.AccAddressFromBech32(msg.Signer) + relayer, err := k.AddrCdc.StringToBytes(msg.Signer) if err != nil { k.Logger.Error("acknowledgement failed", "error", errorsmod.Wrap(err, "Invalid address for msg Signer")) return nil, errorsmod.Wrap(err, "Invalid address for msg Signer") diff --git a/modules/light-clients/08-wasm/testing/simapp/app.go b/modules/light-clients/08-wasm/testing/simapp/app.go index fa34fdc6f85..ee74bd75f6c 100644 --- a/modules/light-clients/08-wasm/testing/simapp/app.go +++ b/modules/light-clients/08-wasm/testing/simapp/app.go @@ -471,6 +471,7 @@ func NewSimApp( app.IBCKeeper = ibckeeper.NewKeeper( appCodec, + signingCtx.AddressCodec(), runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibcexported.StoreKey]), logger.With(log.ModuleKey, "x/ibc")), app.GetSubspace(ibcexported.ModuleName), app.UpgradeKeeper, @@ -559,6 +560,7 @@ func NewSimApp( // IBC Fee Module keeper app.IBCFeeKeeper = ibcfeekeeper.NewKeeper( appCodec, + signingCtx.AddressCodec(), runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibcfeetypes.StoreKey]), logger.With(log.ModuleKey, fmt.Sprintf("x/%s-%s", ibcexported.ModuleName, ibcfeetypes.ModuleName))), app.IBCKeeper.ChannelKeeper, // may be replaced with IBC middleware app.IBCKeeper.ChannelKeeper, diff --git a/simapp/app.go b/simapp/app.go index c2e25dd396c..ccac26e4a27 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -487,6 +487,7 @@ func NewSimApp( app.IBCKeeper = ibckeeper.NewKeeper( appCodec, + signingCtx.AddressCodec(), runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibcexported.StoreKey]), logger.With(log.ModuleKey, "x/ibc")), app.GetSubspace(ibcexported.ModuleName), app.UpgradeKeeper, @@ -541,6 +542,7 @@ func NewSimApp( // IBC Fee Module keeper app.IBCFeeKeeper = ibcfeekeeper.NewKeeper( appCodec, + signingCtx.AddressCodec(), runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibcfeetypes.StoreKey]), logger.With(log.ModuleKey, fmt.Sprintf("x/%s-%s", ibcexported.ModuleName, ibcfeetypes.ModuleName))), app.IBCKeeper.ChannelKeeper, // may be replaced with IBC middleware app.IBCKeeper.ChannelKeeper, diff --git a/testing/simapp/app.go b/testing/simapp/app.go index 8b0a588850f..15430a455fe 100644 --- a/testing/simapp/app.go +++ b/testing/simapp/app.go @@ -457,6 +457,7 @@ func NewSimApp( app.IBCKeeper = ibckeeper.NewKeeper( appCodec, + signingCtx.AddressCodec(), runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibcexported.StoreKey]), logger.With(log.ModuleKey, "x/ibc")), app.GetSubspace(ibcexported.ModuleName), app.UpgradeKeeper, @@ -511,6 +512,7 @@ func NewSimApp( // IBC Fee Module keeper app.IBCFeeKeeper = ibcfeekeeper.NewKeeper( appCodec, + signingCtx.AddressCodec(), runtime.NewEnvironment(runtime.NewKVStoreService(keys[ibcfeetypes.StoreKey]), logger.With(log.ModuleKey, fmt.Sprintf("x/%s-%s", ibcexported.ModuleName, ibcfeetypes.ModuleName))), app.IBCKeeper.ChannelKeeper, // may be replaced with IBC middleware app.IBCKeeper.ChannelKeeper, From 3e0a689b9ccab63f84cdab1efd57c63761027742 Mon Sep 17 00:00:00 2001 From: ChicKen Bump <89718971+NisTun@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:18:13 +0700 Subject: [PATCH 6/6] chore: change usage of deprecated module.NewManager in SimApps (#7886) * change module newmanager * lint * add lack of module --------- Co-authored-by: Gjermund Garaba --- modules/apps/callbacks/testing/simapp/app.go | 47 +++++++------- .../08-wasm/testing/simapp/app.go | 53 ++++++++-------- simapp/app.go | 61 ++++++++++--------- testing/simapp/app.go | 59 +++++++++--------- 4 files changed, 112 insertions(+), 108 deletions(-) diff --git a/modules/apps/callbacks/testing/simapp/app.go b/modules/apps/callbacks/testing/simapp/app.go index b1e260384be..54be2c89580 100644 --- a/modules/apps/callbacks/testing/simapp/app.go +++ b/modules/apps/callbacks/testing/simapp/app.go @@ -12,6 +12,7 @@ import ( "github.com/spf13/cast" coreaddress "cosmossdk.io/core/address" + appmodule "cosmossdk.io/core/appmodule" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" "cosmossdk.io/x/accounts" @@ -587,33 +588,33 @@ func NewSimApp( // NOTE: Any module instantiated in the module manager that is later modified // must be passed by reference here. - app.ModuleManager = module.NewManager( - genutil.NewAppModule(appCodec, app.AuthKeeper, app.StakingKeeper, app, txConfig, genutiltypes.DefaultMessageValidator), - accounts.NewAppModule(appCodec, app.AccountsKeeper), - auth.NewAppModule(appCodec, app.AuthKeeper, app.AccountsKeeper, authsims.RandomGenesisAccounts, nil), - vesting.NewAppModule(app.AuthKeeper, app.BankKeeper), - bank.NewAppModule(appCodec, app.BankKeeper, app.AuthKeeper), - feegrantmodule.NewAppModule(appCodec, app.FeeGrantKeeper, app.interfaceRegistry), - gov.NewAppModule(appCodec, &app.GovKeeper, app.AuthKeeper, app.BankKeeper, app.PoolKeeper), - mint.NewAppModule(appCodec, app.MintKeeper, app.AuthKeeper), - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AuthKeeper, app.BankKeeper, app.StakingKeeper, app.interfaceRegistry, cometService), - distr.NewAppModule(appCodec, app.DistrKeeper, app.StakingKeeper), - staking.NewAppModule(appCodec, app.StakingKeeper), - upgrade.NewAppModule(app.UpgradeKeeper), - params.NewAppModule(app.ParamsKeeper), - consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper), + app.ModuleManager = module.NewManagerFromMap(map[string]appmodule.AppModule{ + genutiltypes.ModuleName: genutil.NewAppModule(appCodec, app.AuthKeeper, app.StakingKeeper, app, txConfig, genutiltypes.DefaultMessageValidator), + accounts.ModuleName: accounts.NewAppModule(appCodec, app.AccountsKeeper), + authtypes.ModuleName: auth.NewAppModule(appCodec, app.AuthKeeper, app.AccountsKeeper, authsims.RandomGenesisAccounts, nil), + vestingtypes.ModuleName: vesting.NewAppModule(app.AuthKeeper, app.BankKeeper), + banktypes.ModuleName: bank.NewAppModule(appCodec, app.BankKeeper, app.AuthKeeper), + feegrant.ModuleName: feegrantmodule.NewAppModule(appCodec, app.FeeGrantKeeper, app.interfaceRegistry), + govtypes.ModuleName: gov.NewAppModule(appCodec, &app.GovKeeper, app.AuthKeeper, app.BankKeeper, app.PoolKeeper), + minttypes.ModuleName: mint.NewAppModule(appCodec, app.MintKeeper, app.AuthKeeper), + slashingtypes.ModuleName: slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AuthKeeper, app.BankKeeper, app.StakingKeeper, app.interfaceRegistry, cometService), + distrtypes.ModuleName: distr.NewAppModule(appCodec, app.DistrKeeper, app.StakingKeeper), + stakingtypes.ModuleName: staking.NewAppModule(appCodec, app.StakingKeeper), + upgradetypes.ModuleName: upgrade.NewAppModule(app.UpgradeKeeper), + paramstypes.ModuleName: params.NewAppModule(app.ParamsKeeper), + consensusparamtypes.ModuleName: consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper), // IBC modules - ibc.NewAppModule(appCodec, app.IBCKeeper), - transfer.NewAppModule(appCodec, app.TransferKeeper), - ibcfee.NewAppModule(appCodec, app.IBCFeeKeeper), - ica.NewAppModule(appCodec, &app.ICAControllerKeeper, &app.ICAHostKeeper), - mockModule, + ibcexported.ModuleName: ibc.NewAppModule(appCodec, app.IBCKeeper), + ibctransfertypes.ModuleName: transfer.NewAppModule(appCodec, app.TransferKeeper), + ibcfeetypes.ModuleName: ibcfee.NewAppModule(appCodec, app.IBCFeeKeeper), + icatypes.ModuleName: ica.NewAppModule(appCodec, &app.ICAControllerKeeper, &app.ICAHostKeeper), + mockModule.Name(): mockModule, // IBC light clients - ibctm.NewAppModule(tmLightClientModule), - solomachine.NewAppModule(smLightClientModule), - ) + ibctm.ModuleName: ibctm.NewAppModule(tmLightClientModule), + solomachine.ModuleName: solomachine.NewAppModule(smLightClientModule), + }) app.ModuleManager.RegisterLegacyAminoCodec(legacyAmino) app.ModuleManager.RegisterInterfaces(interfaceRegistry) diff --git a/modules/light-clients/08-wasm/testing/simapp/app.go b/modules/light-clients/08-wasm/testing/simapp/app.go index ee74bd75f6c..90cc9d4e8de 100644 --- a/modules/light-clients/08-wasm/testing/simapp/app.go +++ b/modules/light-clients/08-wasm/testing/simapp/app.go @@ -17,6 +17,7 @@ import ( apisigning "cosmossdk.io/api/cosmos/tx/signing/v1beta1" "cosmossdk.io/client/v2/autocli" coreaddress "cosmossdk.io/core/address" + appmodule "cosmossdk.io/core/appmodule" corestore "cosmossdk.io/core/store" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" @@ -698,36 +699,36 @@ func NewSimApp( // NOTE: Any module instantiated in the module manager that is later modified // must be passed by reference here. - app.ModuleManager = module.NewManager( - genutil.NewAppModule(appCodec, app.AuthKeeper, app.StakingKeeper, app, txConfig, genutiltypes.DefaultMessageValidator), - auth.NewAppModule(appCodec, app.AuthKeeper, app.AccountsKeeper, authsims.RandomGenesisAccounts, nil), - vesting.NewAppModule(app.AuthKeeper, app.BankKeeper), - bank.NewAppModule(appCodec, app.BankKeeper, app.AuthKeeper), - feegrantmodule.NewAppModule(appCodec, app.FeeGrantKeeper, app.interfaceRegistry), - gov.NewAppModule(appCodec, &app.GovKeeper, app.AuthKeeper, app.BankKeeper, app.PoolKeeper), - mint.NewAppModule(appCodec, app.MintKeeper, app.AuthKeeper), - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AuthKeeper, app.BankKeeper, app.StakingKeeper, app.interfaceRegistry, cometService), - distr.NewAppModule(appCodec, app.DistrKeeper, app.StakingKeeper), - staking.NewAppModule(appCodec, app.StakingKeeper), - upgrade.NewAppModule(app.UpgradeKeeper), - evidence.NewAppModule(appCodec, app.EvidenceKeeper, cometService), - params.NewAppModule(app.ParamsKeeper), - authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.interfaceRegistry), - groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AuthKeeper, app.BankKeeper, app.interfaceRegistry), - consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper), + app.ModuleManager = module.NewManagerFromMap(map[string]appmodule.AppModule{ + genutiltypes.ModuleName: genutil.NewAppModule(appCodec, app.AuthKeeper, app.StakingKeeper, app, txConfig, genutiltypes.DefaultMessageValidator), + authtypes.ModuleName: auth.NewAppModule(appCodec, app.AuthKeeper, app.AccountsKeeper, authsims.RandomGenesisAccounts, nil), + vestingtypes.ModuleName: vesting.NewAppModule(app.AuthKeeper, app.BankKeeper), + banktypes.ModuleName: bank.NewAppModule(appCodec, app.BankKeeper, app.AuthKeeper), + feegrant.ModuleName: feegrantmodule.NewAppModule(appCodec, app.FeeGrantKeeper, app.interfaceRegistry), + govtypes.ModuleName: gov.NewAppModule(appCodec, &app.GovKeeper, app.AuthKeeper, app.BankKeeper, app.PoolKeeper), + minttypes.ModuleName: mint.NewAppModule(appCodec, app.MintKeeper, app.AuthKeeper), + slashingtypes.ModuleName: slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AuthKeeper, app.BankKeeper, app.StakingKeeper, app.interfaceRegistry, cometService), + distrtypes.ModuleName: distr.NewAppModule(appCodec, app.DistrKeeper, app.StakingKeeper), + stakingtypes.ModuleName: staking.NewAppModule(appCodec, app.StakingKeeper), + upgradetypes.ModuleName: upgrade.NewAppModule(app.UpgradeKeeper), + evidencetypes.ModuleName: evidence.NewAppModule(appCodec, app.EvidenceKeeper, cometService), + paramstypes.ModuleName: params.NewAppModule(app.ParamsKeeper), + authz.ModuleName: authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.interfaceRegistry), + group.ModuleName: groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AuthKeeper, app.BankKeeper, app.interfaceRegistry), + consensusparamtypes.ModuleName: consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper), // IBC modules - ibc.NewAppModule(appCodec, app.IBCKeeper), - transfer.NewAppModule(appCodec, app.TransferKeeper), - ibcfee.NewAppModule(appCodec, app.IBCFeeKeeper), - ica.NewAppModule(appCodec, &app.ICAControllerKeeper, &app.ICAHostKeeper), - mockModule, + ibcexported.ModuleName: ibc.NewAppModule(appCodec, app.IBCKeeper), + ibctransfertypes.ModuleName: transfer.NewAppModule(appCodec, app.TransferKeeper), + ibcfeetypes.ModuleName: ibcfee.NewAppModule(appCodec, app.IBCFeeKeeper), + icatypes.ModuleName: ica.NewAppModule(appCodec, &app.ICAControllerKeeper, &app.ICAHostKeeper), + mockModule.Name(): mockModule, // IBC light clients - wasm.NewAppModule(appCodec, app.WasmClientKeeper), // TODO(damian): see if we want to pass the lightclient module here, keeper is used in AppModule.RegisterServices etc - ibctm.NewAppModule(tmLightClientModule), - solomachine.NewAppModule(smLightClientModule), - ) + wasmtypes.ModuleName: wasm.NewAppModule(appCodec, app.WasmClientKeeper), // TODO(damian): see if we want to pass the lightclient module here, keeper is used in AppModule.RegisterServices etc + ibctm.ModuleName: ibctm.NewAppModule(tmLightClientModule), + solomachine.ModuleName: solomachine.NewAppModule(smLightClientModule), + }) app.ModuleManager.RegisterLegacyAminoCodec(legacyAmino) app.ModuleManager.RegisterInterfaces(interfaceRegistry) diff --git a/simapp/app.go b/simapp/app.go index ccac26e4a27..2ac4e0c639e 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -17,6 +17,7 @@ import ( "cosmossdk.io/client/v2/autocli" clienthelpers "cosmossdk.io/client/v2/helpers" coreaddress "cosmossdk.io/core/address" + appmodule "cosmossdk.io/core/appmodule" corestore "cosmossdk.io/core/store" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" @@ -685,40 +686,40 @@ func NewSimApp( // NOTE: Any module instantiated in the module manager that is later modified // must be passed by reference here. - app.ModuleManager = module.NewManager( - genutil.NewAppModule(appCodec, app.AuthKeeper, app.StakingKeeper, app, txConfig, genutiltypes.DefaultMessageValidator), - accounts.NewAppModule(appCodec, app.AccountsKeeper), - auth.NewAppModule(appCodec, app.AuthKeeper, app.AccountsKeeper, authsims.RandomGenesisAccounts, nil), - vesting.NewAppModule(app.AuthKeeper, app.BankKeeper), - bank.NewAppModule(appCodec, app.BankKeeper, app.AuthKeeper), - feegrantmodule.NewAppModule(appCodec, app.FeeGrantKeeper, app.interfaceRegistry), - gov.NewAppModule(appCodec, &app.GovKeeper, app.AuthKeeper, app.BankKeeper, app.PoolKeeper), - mint.NewAppModule(appCodec, app.MintKeeper, app.AuthKeeper), - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AuthKeeper, app.BankKeeper, app.StakingKeeper, app.interfaceRegistry, cometService), - distr.NewAppModule(appCodec, app.DistrKeeper, app.StakingKeeper), - staking.NewAppModule(appCodec, app.StakingKeeper), - upgrade.NewAppModule(app.UpgradeKeeper), - params.NewAppModule(app.ParamsKeeper), - evidence.NewAppModule(appCodec, app.EvidenceKeeper, cometService), - authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.interfaceRegistry), - groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AuthKeeper, app.BankKeeper, app.interfaceRegistry), - nftmodule.NewAppModule(appCodec, app.NFTKeeper, app.AuthKeeper, app.BankKeeper, app.interfaceRegistry), - consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper), - circuit.NewAppModule(appCodec, app.CircuitKeeper), - protocolpool.NewAppModule(appCodec, app.PoolKeeper, app.AuthKeeper, app.BankKeeper), - epochs.NewAppModule(appCodec, app.EpochsKeeper), + app.ModuleManager = module.NewManagerFromMap(map[string]appmodule.AppModule{ + genutiltypes.ModuleName: genutil.NewAppModule(appCodec, app.AuthKeeper, app.StakingKeeper, app, txConfig, genutiltypes.DefaultMessageValidator), + accounts.ModuleName: accounts.NewAppModule(appCodec, app.AccountsKeeper), + authtypes.ModuleName: auth.NewAppModule(appCodec, app.AuthKeeper, app.AccountsKeeper, authsims.RandomGenesisAccounts, nil), + vestingtypes.ModuleName: vesting.NewAppModule(app.AuthKeeper, app.BankKeeper), + banktypes.ModuleName: bank.NewAppModule(appCodec, app.BankKeeper, app.AuthKeeper), + feegrant.ModuleName: feegrantmodule.NewAppModule(appCodec, app.FeeGrantKeeper, app.interfaceRegistry), + govtypes.ModuleName: gov.NewAppModule(appCodec, &app.GovKeeper, app.AuthKeeper, app.BankKeeper, app.PoolKeeper), + minttypes.ModuleName: mint.NewAppModule(appCodec, app.MintKeeper, app.AuthKeeper), + slashingtypes.ModuleName: slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AuthKeeper, app.BankKeeper, app.StakingKeeper, app.interfaceRegistry, cometService), + distrtypes.ModuleName: distr.NewAppModule(appCodec, app.DistrKeeper, app.StakingKeeper), + stakingtypes.ModuleName: staking.NewAppModule(appCodec, app.StakingKeeper), + upgradetypes.ModuleName: upgrade.NewAppModule(app.UpgradeKeeper), + evidencetypes.ModuleName: evidence.NewAppModule(appCodec, app.EvidenceKeeper, cometService), + paramstypes.ModuleName: params.NewAppModule(app.ParamsKeeper), + authz.ModuleName: authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.interfaceRegistry), + group.ModuleName: groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AuthKeeper, app.BankKeeper, app.interfaceRegistry), + nft.ModuleName: nftmodule.NewAppModule(appCodec, app.NFTKeeper, app.AuthKeeper, app.BankKeeper, app.interfaceRegistry), + consensustypes.ModuleName: consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper), + circuittypes.ModuleName: circuit.NewAppModule(appCodec, app.CircuitKeeper), + pooltypes.ModuleName: protocolpool.NewAppModule(appCodec, app.PoolKeeper, app.AuthKeeper, app.BankKeeper), + epochstypes.ModuleName: epochs.NewAppModule(appCodec, app.EpochsKeeper), // IBC modules - ibc.NewAppModule(appCodec, app.IBCKeeper), - transfer.NewAppModule(appCodec, app.TransferKeeper), - ibcfee.NewAppModule(appCodec, app.IBCFeeKeeper), - ica.NewAppModule(appCodec, &app.ICAControllerKeeper, &app.ICAHostKeeper), - mockModule, + ibcexported.ModuleName: ibc.NewAppModule(appCodec, app.IBCKeeper), + ibctransfertypes.ModuleName: transfer.NewAppModule(appCodec, app.TransferKeeper), + ibcfeetypes.ModuleName: ibcfee.NewAppModule(appCodec, app.IBCFeeKeeper), + icatypes.ModuleName: ica.NewAppModule(appCodec, &app.ICAControllerKeeper, &app.ICAHostKeeper), + mockModule.Name(): mockModule, // IBC light clients - ibctm.NewAppModule(tmLightClientModule), - solomachine.NewAppModule(smLightClientModule), - ) + ibctm.ModuleName: ibctm.NewAppModule(tmLightClientModule), + solomachine.ModuleName: solomachine.NewAppModule(smLightClientModule), + }) app.ModuleManager.RegisterLegacyAminoCodec(legacyAmino) app.ModuleManager.RegisterInterfaces(interfaceRegistry) diff --git a/testing/simapp/app.go b/testing/simapp/app.go index 15430a455fe..d7ca75cc6ed 100644 --- a/testing/simapp/app.go +++ b/testing/simapp/app.go @@ -16,6 +16,7 @@ import ( "cosmossdk.io/client/v2/autocli" clienthelpers "cosmossdk.io/client/v2/helpers" coreaddress "cosmossdk.io/core/address" + appmodule "cosmossdk.io/core/appmodule" corestore "cosmossdk.io/core/store" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" @@ -655,39 +656,39 @@ func NewSimApp( // NOTE: Any module instantiated in the module manager that is later modified // must be passed by reference here. - app.ModuleManager = module.NewManager( - genutil.NewAppModule(appCodec, app.AuthKeeper, app.StakingKeeper, app, txConfig, genutiltypes.DefaultMessageValidator), - accounts.NewAppModule(appCodec, app.AccountsKeeper), - auth.NewAppModule(appCodec, app.AuthKeeper, app.AccountsKeeper, authsims.RandomGenesisAccounts, nil), - vesting.NewAppModule(app.AuthKeeper, app.BankKeeper), - bank.NewAppModule(appCodec, app.BankKeeper, app.AuthKeeper), - feegrantmodule.NewAppModule(appCodec, app.FeeGrantKeeper, app.interfaceRegistry), - gov.NewAppModule(appCodec, &app.GovKeeper, app.AuthKeeper, app.BankKeeper, app.PoolKeeper), - mint.NewAppModule(appCodec, app.MintKeeper, app.AuthKeeper), - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AuthKeeper, app.BankKeeper, app.StakingKeeper, app.interfaceRegistry, cometService), - distr.NewAppModule(appCodec, app.DistrKeeper, app.StakingKeeper), - staking.NewAppModule(appCodec, app.StakingKeeper), - upgrade.NewAppModule(app.UpgradeKeeper), - params.NewAppModule(app.ParamsKeeper), - evidence.NewAppModule(appCodec, app.EvidenceKeeper, cometService), - authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.interfaceRegistry), - groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AuthKeeper, app.BankKeeper, app.interfaceRegistry), - nftmodule.NewAppModule(appCodec, app.NFTKeeper, app.AuthKeeper, app.BankKeeper, app.interfaceRegistry), - consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper), - protocolpool.NewAppModule(appCodec, app.PoolKeeper, app.AuthKeeper, app.BankKeeper), - epochs.NewAppModule(appCodec, app.EpochsKeeper), + app.ModuleManager = module.NewManagerFromMap(map[string]appmodule.AppModule{ + genutiltypes.ModuleName: genutil.NewAppModule(appCodec, app.AuthKeeper, app.StakingKeeper, app, txConfig, genutiltypes.DefaultMessageValidator), + accounts.ModuleName: accounts.NewAppModule(appCodec, app.AccountsKeeper), + authtypes.ModuleName: auth.NewAppModule(appCodec, app.AuthKeeper, app.AccountsKeeper, authsims.RandomGenesisAccounts, nil), + vestingtypes.ModuleName: vesting.NewAppModule(app.AuthKeeper, app.BankKeeper), + banktypes.ModuleName: bank.NewAppModule(appCodec, app.BankKeeper, app.AuthKeeper), + feegrant.ModuleName: feegrantmodule.NewAppModule(appCodec, app.FeeGrantKeeper, app.interfaceRegistry), + govtypes.ModuleName: gov.NewAppModule(appCodec, &app.GovKeeper, app.AuthKeeper, app.BankKeeper, app.PoolKeeper), + minttypes.ModuleName: mint.NewAppModule(appCodec, app.MintKeeper, app.AuthKeeper), + slashingtypes.ModuleName: slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AuthKeeper, app.BankKeeper, app.StakingKeeper, app.interfaceRegistry, cometService), + distrtypes.ModuleName: distr.NewAppModule(appCodec, app.DistrKeeper, app.StakingKeeper), + stakingtypes.ModuleName: staking.NewAppModule(appCodec, app.StakingKeeper), + upgradetypes.ModuleName: upgrade.NewAppModule(app.UpgradeKeeper), + paramstypes.ModuleName: params.NewAppModule(app.ParamsKeeper), + evidencetypes.ModuleName: evidence.NewAppModule(appCodec, app.EvidenceKeeper, cometService), + authz.ModuleName: authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.interfaceRegistry), + group.ModuleName: groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AuthKeeper, app.BankKeeper, app.interfaceRegistry), + nft.ModuleName: nftmodule.NewAppModule(appCodec, app.NFTKeeper, app.AuthKeeper, app.BankKeeper, app.interfaceRegistry), + consensustypes.ModuleName: consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper), + pooltypes.ModuleName: protocolpool.NewAppModule(appCodec, app.PoolKeeper, app.AuthKeeper, app.BankKeeper), + epochstypes.ModuleName: epochs.NewAppModule(appCodec, app.EpochsKeeper), // IBC modules - ibc.NewAppModule(appCodec, app.IBCKeeper), - transfer.NewAppModule(appCodec, app.TransferKeeper), - ibcfee.NewAppModule(appCodec, app.IBCFeeKeeper), - ica.NewAppModule(appCodec, &app.ICAControllerKeeper, &app.ICAHostKeeper), - mockModule, + ibcexported.ModuleName: ibc.NewAppModule(appCodec, app.IBCKeeper), + ibctransfertypes.ModuleName: transfer.NewAppModule(appCodec, app.TransferKeeper), + ibcfeetypes.ModuleName: ibcfee.NewAppModule(appCodec, app.IBCFeeKeeper), + icatypes.ModuleName: ica.NewAppModule(appCodec, &app.ICAControllerKeeper, &app.ICAHostKeeper), + mockModule.Name(): mockModule, // IBC light clients - ibctm.NewAppModule(tmLightClientModule), - solomachine.NewAppModule(smLightClientModule), - ) + ibctm.ModuleName: ibctm.NewAppModule(tmLightClientModule), + solomachine.ModuleName: solomachine.NewAppModule(smLightClientModule), + }) app.ModuleManager.RegisterLegacyAminoCodec(legacyAmino) app.ModuleManager.RegisterInterfaces(interfaceRegistry)