Skip to content

Commit 394d411

Browse files
authored
Merge branch 'main' into fix/state-pollution
2 parents 17a9f9a + 84e841a commit 394d411

File tree

96 files changed

+156
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+156
-149
lines changed

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
pull-requests: write # For reading the PR and adding the label
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/stale@v9
13+
- uses: actions/stale@v10
1414
with:
1515
repo-token: ${{ secrets.GITHUB_TOKEN }}
1616
stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed in 7 days-before-close if no further activity occurs."

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ benchmark:
379379
### Linting ###
380380
###############################################################################
381381

382-
golangci_version=v2.5.0
382+
golangci_version=v2.6.0
383383

384384
lint-install:
385385
@echo "--> Installing golangci-lint $(golangci_version)"

api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.0
44

55
require (
66
github.com/cosmos/cosmos-proto v1.0.0-beta.5
7-
github.com/cosmos/gogoproto v1.7.0
7+
github.com/cosmos/gogoproto v1.7.2
88
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b
99
google.golang.org/grpc v1.76.0
1010
google.golang.org/protobuf v1.36.10

api/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA=
22
github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec=
3-
github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro=
4-
github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
3+
github.com/cosmos/gogoproto v1.7.2 h1:5G25McIraOC0mRFv9TVO139Uh3OklV2hczr13KKVHCA=
4+
github.com/cosmos/gogoproto v1.7.2/go.mod h1:8S7w53P1Y1cHwND64o0BnArT6RmdgIvsBuco6uTllsk=
55
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
66
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
77
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=

client/context.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ func (ctx Context) PrintProto(toPrint proto.Message) error {
348348

349349
// PrintObjectLegacy is a variant of PrintProto that doesn't require a proto.Message type
350350
// and uses amino JSON encoding.
351+
//
351352
// Deprecated: It will be removed in the near future!
352353
func (ctx Context) PrintObjectLegacy(toPrint any) error {
353354
out, err := ctx.LegacyAmino.MarshalJSON(toPrint)

client/keys/add_ledger_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build ledger || test_ledger_mock
2-
// +build ledger test_ledger_mock
32

43
package keys
54

client/v2/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/cockroachdb/errors v1.12.0
1212
github.com/cosmos/cosmos-proto v1.0.0-beta.5
1313
github.com/cosmos/cosmos-sdk v0.54.0-beta.0
14-
github.com/cosmos/gogoproto v1.7.0
14+
github.com/cosmos/gogoproto v1.7.2
1515
github.com/spf13/cobra v1.10.1
1616
github.com/spf13/pflag v1.0.10
1717
github.com/stretchr/testify v1.11.1

client/v2/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4x
156156
github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE=
157157
github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI=
158158
github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU=
159-
github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro=
160-
github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
159+
github.com/cosmos/gogoproto v1.7.2 h1:5G25McIraOC0mRFv9TVO139Uh3OklV2hczr13KKVHCA=
160+
github.com/cosmos/gogoproto v1.7.2/go.mod h1:8S7w53P1Y1cHwND64o0BnArT6RmdgIvsBuco6uTllsk=
161161
github.com/cosmos/iavl v1.2.6 h1:Hs3LndJbkIB+rEvToKJFXZvKo6Vy0Ex1SJ54hhtioIs=
162162
github.com/cosmos/iavl v1.2.6/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw=
163163
github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU=

codec/proto_codec.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323

2424
// ProtoCodecMarshaler defines an interface for codecs that utilize Protobuf for both
2525
// binary and JSON encoding.
26+
//
2627
// Deprecated: Use Codec instead.
2728
type ProtoCodecMarshaler interface {
2829
Codec

collections/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.2
55
require (
66
cosmossdk.io/schema v1.1.0
77
github.com/cosmos/cosmos-db v1.1.3
8-
github.com/cosmos/gogoproto v1.7.0
8+
github.com/cosmos/gogoproto v1.7.2
99
github.com/google/go-cmp v0.7.0
1010
github.com/stretchr/testify v1.11.1
1111
github.com/tidwall/btree v1.8.1
@@ -44,8 +44,8 @@ require (
4444
github.com/spf13/cast v1.8.0 // indirect
4545
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
4646
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
47-
golang.org/x/sys v0.33.0 // indirect
48-
golang.org/x/text v0.25.0 // indirect
47+
golang.org/x/sys v0.34.0 // indirect
48+
golang.org/x/text v0.27.0 // indirect
4949
gopkg.in/yaml.v3 v3.0.1 // indirect
5050
)
5151

0 commit comments

Comments
 (0)