From 1c64d49a3fa019c91ced4522634a89e552520195 Mon Sep 17 00:00:00 2001 From: Igor Sirotin Date: Mon, 25 Aug 2025 16:03:44 +0100 Subject: [PATCH] chore: upgrade to Go 1.23 --- Dockerfile | 2 +- examples/basic-light-client/go.mod | 4 +--- examples/basic-relay/go.mod | 4 +--- examples/chat2-reliable/go.mod | 5 ++--- examples/chat2-reliable/go.sum | 2 ++ examples/chat2/go.mod | 4 +--- examples/filter2/go.mod | 4 +--- examples/noise/go.mod | 4 +--- examples/rln/go.mod | 4 +--- go.mod | 8 +++----- 10 files changed, 14 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9b6bd1fb..78c65959 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # BUILD IMAGE -------------------------------------------------------- -FROM golang:1.21 as builder +FROM golang:1.23 as builder WORKDIR /app COPY . . diff --git a/examples/basic-light-client/go.mod b/examples/basic-light-client/go.mod index e54a79b7..a34eb757 100644 --- a/examples/basic-light-client/go.mod +++ b/examples/basic-light-client/go.mod @@ -1,8 +1,6 @@ module basic2 -go 1.21 - -toolchain go1.21.10 +go 1.23 replace github.com/waku-org/go-waku => ../.. diff --git a/examples/basic-relay/go.mod b/examples/basic-relay/go.mod index c5ac2cc3..fb6bd48f 100644 --- a/examples/basic-relay/go.mod +++ b/examples/basic-relay/go.mod @@ -1,8 +1,6 @@ module basic2 -go 1.21 - -toolchain go1.21.10 +go 1.23 replace github.com/waku-org/go-waku => ../.. diff --git a/examples/chat2-reliable/go.mod b/examples/chat2-reliable/go.mod index 388373fe..88625f35 100644 --- a/examples/chat2-reliable/go.mod +++ b/examples/chat2-reliable/go.mod @@ -1,8 +1,6 @@ module chat2-reliable -go 1.21 - -toolchain go1.21.10 +go 1.23 replace github.com/waku-org/go-waku => ../.. @@ -74,6 +72,7 @@ require ( github.com/ipfs/go-cid v0.4.1 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect + github.com/jellydator/ttlcache/v3 v3.3.0 // indirect github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/koron/go-ssdp v0.0.4 // indirect diff --git a/examples/chat2-reliable/go.sum b/examples/chat2-reliable/go.sum index ab7a1435..97e1925f 100644 --- a/examples/chat2-reliable/go.sum +++ b/examples/chat2-reliable/go.sum @@ -353,6 +353,8 @@ github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABo github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= +github.com/jellydator/ttlcache/v3 v3.3.0 h1:BdoC9cE81qXfrxeb9eoJi9dWrdhSuwXMAnHTbnBm4Wc= +github.com/jellydator/ttlcache/v3 v3.3.0/go.mod h1:bj2/e0l4jRnQdrnSTaGTsh4GSXvMjQcy41i7th0GVGw= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= diff --git a/examples/chat2/go.mod b/examples/chat2/go.mod index 6c134479..92c07850 100644 --- a/examples/chat2/go.mod +++ b/examples/chat2/go.mod @@ -1,8 +1,6 @@ module chat2 -go 1.21 - -toolchain go1.21.10 +go 1.23 replace github.com/waku-org/go-waku => ../.. diff --git a/examples/filter2/go.mod b/examples/filter2/go.mod index 3ca4bd51..a4a0ad0b 100644 --- a/examples/filter2/go.mod +++ b/examples/filter2/go.mod @@ -1,8 +1,6 @@ module filter2 -go 1.21 - -toolchain go1.21.10 +go 1.23 replace github.com/waku-org/go-waku => ../.. diff --git a/examples/noise/go.mod b/examples/noise/go.mod index 471b5f01..2e85322f 100644 --- a/examples/noise/go.mod +++ b/examples/noise/go.mod @@ -1,8 +1,6 @@ module noise -go 1.21 - -toolchain go1.21.10 +go 1.23 replace github.com/waku-org/go-waku => ../.. diff --git a/examples/rln/go.mod b/examples/rln/go.mod index 1d87befd..5d51ed78 100644 --- a/examples/rln/go.mod +++ b/examples/rln/go.mod @@ -1,8 +1,6 @@ module rln -go 1.21 - -toolchain go1.21.10 +go 1.23 replace github.com/waku-org/go-waku => ../.. diff --git a/go.mod b/go.mod index 2dc2bf34..6166dec8 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,13 @@ module github.com/waku-org/go-waku -go 1.21 - -toolchain go1.21.10 +go 1.23 replace github.com/ethereum/go-ethereum v1.10.26 => github.com/status-im/go-ethereum v1.10.25-status.15 replace github.com/libp2p/go-libp2p-pubsub v0.12.0 => github.com/waku-org/go-libp2p-pubsub v0.12.0-gowaku.0.20240823143342-b0f2429ca27f require ( - github.com/btcsuite/btcd/btcec/v2 v2.2.1 + github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect github.com/cruxic/go-hmac-drbg v0.0.0-20170206035330-84c46983886d github.com/ethereum/go-ethereum v1.10.26 github.com/golang-migrate/migrate/v4 v4.15.2 @@ -112,7 +110,7 @@ require ( github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 github.com/docker/go-units v0.5.0 // indirect github.com/elastic/gosigar v0.14.3 // indirect github.com/flynn/noise v1.1.0 // indirect