Skip to content

Commit ac77ab8

Browse files
fix: update DecodeValue to handle multiple types (#1031)
* fix: update DecodeValue to handle multiple types * Bump flagged versions of dependencies * fix: wire ICA host query router to prevent startup panic with ibc-go v8.6.1 * build golangci-lint with go1.24.13 toolchain to match module go version --------- Co-authored-by: brendaloya <35778124+brendaloya@users.noreply.github.com>
1 parent 33c4113 commit ac77ab8

13 files changed

Lines changed: 264 additions & 234 deletions

File tree

.github/workflows/e2e.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- /go/bin/layerd
3838
heighliner-tag: v1.7.5
3939
additional-args: |
40-
--go-version 1.23.12 --alpine-version 3.22
40+
--go-version 1.24.13 --alpine-version 3.22
4141
4242
- name: Publish Primary Tarball as Artifact
4343
uses: actions/upload-artifact@v4
@@ -73,7 +73,7 @@ jobs:
7373
- /go/bin/layerd
7474
heighliner-tag: v1.7.5
7575
additional-args: |
76-
--go-version 1.23.12 --alpine-version 3.22
76+
--go-version 1.24.13 --alpine-version 3.22
7777
7878
- name: Publish IBC Tarball as Artifact
7979
uses: actions/upload-artifact@v4
@@ -97,7 +97,7 @@ jobs:
9797
- name: Install Go
9898
uses: actions/setup-go@v5
9999
with:
100-
go-version: '1.23'
100+
go-version: '1.24'
101101

102102
- name: Generate Matrix
103103
id: set-matrix
@@ -129,7 +129,7 @@ jobs:
129129
- name: Install Go
130130
uses: actions/setup-go@v5
131131
with:
132-
go-version: '1.23'
132+
go-version: '1.24'
133133

134134
- name: Download Primary Tarball
135135
uses: actions/download-artifact@v4

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v4
2424
with:
25-
go-version: '1.21'
25+
go-version: '1.24'
2626

2727
- name: Build
2828
run: go build -v ./...

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v3
1717
- uses: actions/setup-go@v4
1818
with:
19-
go-version: "1.21"
19+
go-version: "1.24"
2020
check-latest: true
2121
- uses: technote-space/get-diff-action@v6.1.2
2222
id: git_diff

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v5
2222
with:
23-
go-version: '1.23.12'
23+
go-version: '1.24.13'
2424
- name: Run GoReleaser
2525
uses: goreleaser/goreleaser-action@v6
2626
with:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
# Separating the builder and runtime image allows the runtime image to be
88
# considerably smaller because it doesn't need to have Golang installed.
9-
ARG BUILDER_IMAGE=docker.io/golang:1.23.2-alpine
9+
ARG BUILDER_IMAGE=docker.io/golang:1.24.13-alpine
1010
ARG RUNTIME_IMAGE=docker.io/alpine:3.20
1111
ARG TARGETOS
1212
ARG TARGETARCH

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ build-with-checksum: build-linux-with-checksum build-darwin-with-checksum
8080
###############################################################################
8181
# Golangci-lint version
8282
golangci_version=v1.64.0
83+
golangci_toolchain=go1.24.13
8384

8485
#? setup-pre-commit: Set pre-commit git hook
8586
setup-pre-commit:
@@ -91,7 +92,7 @@ setup-pre-commit:
9192
#? lint-install: Install golangci-lint
9293
lint-install:
9394
@echo "--> Installing golangci-lint $(golangci_version)"
94-
@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
95+
@GOTOOLCHAIN=$(golangci_toolchain) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
9596

9697
#? lint: Run golangci-lint
9798
lint:
@@ -295,7 +296,7 @@ local-image:
295296
ifeq (,$(shell which heighliner))
296297
echo 'heighliner' binary not found. Consider running `make get-heighliner`
297298
else
298-
heighliner build -c layer --local --dockerfile cosmos --go-version "1.23.2-alpine3.20" --build-target "make install" --binaries "/go/bin/layerd"
299+
heighliner build -c layer --local --dockerfile cosmos --go-version "1.24.13-alpine3.20" --build-target "make install" --binaries "/go/bin/layerd"
299300
endif
300301

301302
get-localic:

app/app.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,10 @@ func New(
498498
app.MsgServiceRouter(),
499499
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
500500
)
501+
// ibc-go v8.3.0 (PR #5785) added a host-side query message, so the ICA host
502+
// keeper's gRPC query router must be set explicitly or NewMsgServerImpl panics
503+
// with "query router must not be nil".
504+
app.ICAHostKeeper.WithQueryRouter(bApp.GRPCQueryRouter())
501505
icaControllerKeeper := icacontrollerkeeper.NewKeeper(
502506
appCodec, keys[icacontrollertypes.StoreKey],
503507
nil,

e2e/go.mod

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/tellor-io/layer/e2e
22

3-
go 1.23.2
3+
go 1.24.0
44

5-
toolchain go1.23.7
5+
toolchain go1.24.13
66

77
require (
88
cosmossdk.io/math v1.5.3
@@ -15,11 +15,11 @@ require (
1515
)
1616

1717
require (
18-
cel.dev/expr v0.24.0 // indirect
18+
cel.dev/expr v0.25.1 // indirect
1919
cloud.google.com/go v0.116.0 // indirect
2020
cloud.google.com/go/auth v0.13.0 // indirect
2121
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
22-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
22+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
2323
cloud.google.com/go/iam v1.2.2 // indirect
2424
cloud.google.com/go/monitoring v1.21.2 // indirect
2525
cloud.google.com/go/storage v1.49.0 // indirect
@@ -46,7 +46,7 @@ require (
4646
github.com/DataDog/zstd v1.5.7 // indirect
4747
github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e // indirect
4848
github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec // indirect
49-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
49+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
5050
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
5151
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
5252
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -67,7 +67,7 @@ require (
6767
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6868
github.com/chzyer/readline v1.5.1 // indirect
6969
github.com/cloudwego/base64x v0.1.5 // indirect
70-
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
70+
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
7171
github.com/cockroachdb/errors v1.12.0 // indirect
7272
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
7373
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 // indirect
@@ -86,7 +86,7 @@ require (
8686
github.com/cosmos/gogoproto v1.7.0 // indirect
8787
github.com/cosmos/iavl v1.2.2 // indirect
8888
github.com/cosmos/ibc-go/modules/capability v1.0.1 // indirect
89-
github.com/cosmos/ibc-go/v8 v8.5.1 // indirect
89+
github.com/cosmos/ibc-go/v8 v8.6.1 // indirect
9090
github.com/cosmos/ics23/go v0.11.0 // indirect
9191
github.com/cosmos/interchain-security/v5 v5.1.1 // indirect
9292
github.com/cosmos/ledger-cosmos-go v0.14.0 // indirect
@@ -109,14 +109,14 @@ require (
109109
github.com/dustin/go-humanize v1.0.1 // indirect
110110
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
111111
github.com/emicklei/dot v1.6.2 // indirect
112-
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
113-
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
112+
github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
113+
github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
114114
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
115115
github.com/fatih/color v1.17.0 // indirect
116116
github.com/felixge/httpsnoop v1.0.4 // indirect
117117
github.com/fsnotify/fsnotify v1.9.0 // indirect
118118
github.com/getsentry/sentry-go v0.33.0 // indirect
119-
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
119+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
120120
github.com/go-kit/kit v0.13.0 // indirect
121121
github.com/go-kit/log v0.2.1 // indirect
122122
github.com/go-logfmt/logfmt v0.6.0 // indirect
@@ -212,7 +212,7 @@ require (
212212
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
213213
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
214214
github.com/prometheus/client_golang v1.22.0 // indirect
215-
github.com/prometheus/client_model v0.6.1 // indirect
215+
github.com/prometheus/client_model v0.6.2 // indirect
216216
github.com/prometheus/common v0.63.0 // indirect
217217
github.com/prometheus/procfs v0.15.1 // indirect
218218
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
@@ -230,7 +230,7 @@ require (
230230
github.com/spf13/cobra v1.9.1 // indirect
231231
github.com/spf13/pflag v1.0.7 // indirect
232232
github.com/spf13/viper v1.20.1 // indirect
233-
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
233+
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
234234
github.com/subosito/gotenv v1.6.0 // indirect
235235
github.com/supranational/blst v0.3.11 // indirect
236236
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
@@ -246,41 +246,40 @@ require (
246246
github.com/tyler-smith/go-bip32 v1.0.0 // indirect
247247
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
248248
github.com/ulikunitz/xz v0.5.11 // indirect
249-
github.com/zeebo/errs v1.4.0 // indirect
250249
github.com/zondax/hid v0.9.2 // indirect
251250
github.com/zondax/ledger-go v0.14.3 // indirect
252251
go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5 // indirect
253252
go.opencensus.io v0.24.0 // indirect
254-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
255-
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
253+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
254+
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
256255
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
257256
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
258-
go.opentelemetry.io/otel v1.38.0 // indirect
259-
go.opentelemetry.io/otel/metric v1.38.0 // indirect
260-
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
261-
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
262-
go.opentelemetry.io/otel/trace v1.38.0 // indirect
257+
go.opentelemetry.io/otel v1.39.0 // indirect
258+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
259+
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
260+
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
261+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
263262
go.uber.org/mock v0.5.2 // indirect
264263
go.uber.org/multierr v1.11.0 // indirect
265264
go.yaml.in/yaml/v2 v2.4.2 // indirect
266265
golang.org/x/arch v0.15.0 // indirect
267-
golang.org/x/crypto v0.40.0 // indirect
266+
golang.org/x/crypto v0.46.0 // indirect
268267
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
269-
golang.org/x/mod v0.26.0 // indirect
270-
golang.org/x/net v0.42.0 // indirect
271-
golang.org/x/oauth2 v0.30.0 // indirect
272-
golang.org/x/sync v0.16.0 // indirect
273-
golang.org/x/sys v0.35.0 // indirect
274-
golang.org/x/term v0.33.0 // indirect
275-
golang.org/x/text v0.28.0 // indirect
268+
golang.org/x/mod v0.30.0 // indirect
269+
golang.org/x/net v0.48.0 // indirect
270+
golang.org/x/oauth2 v0.34.0 // indirect
271+
golang.org/x/sync v0.19.0 // indirect
272+
golang.org/x/sys v0.39.0 // indirect
273+
golang.org/x/term v0.38.0 // indirect
274+
golang.org/x/text v0.32.0 // indirect
276275
golang.org/x/time v0.8.0 // indirect
277-
golang.org/x/tools v0.35.0 // indirect
276+
golang.org/x/tools v0.39.0 // indirect
278277
google.golang.org/api v0.215.0 // indirect
279278
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
280-
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
281-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
282-
google.golang.org/grpc v1.75.0 // indirect
283-
google.golang.org/protobuf v1.36.8 // indirect
279+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
280+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
281+
google.golang.org/grpc v1.79.3 // indirect
282+
google.golang.org/protobuf v1.36.10 // indirect
284283
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
285284
gopkg.in/yaml.v2 v2.4.0 // indirect
286285
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -314,5 +313,4 @@ replace (
314313
github.com/tellor-io/layer => ../
315314

316315
github.com/vedhavyas/go-subkey => github.com/strangelove-ventures/go-subkey v1.0.7
317-
318316
)

0 commit comments

Comments
 (0)