Skip to content

Commit 2ab2f74

Browse files
committed
Upgrade to Boxo v0.35.2
- upgrade to boxo v0.35.2 - upgrade to go-libp2p v0.45.0 - upgrade to go-log/v2 v2.9.0
1 parent 19a9405 commit 2ab2f74

File tree

4 files changed

+38
-20
lines changed

4 files changed

+38
-20
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ The following emojis are used to highlight certain changes:
2121

2222
### Changed
2323

24+
- upgrade to `boxo` [v0.35.2](https://github.com/ipfs/boxo/releases/tag/v0.35.2)
25+
- upgrade to `go-libp2p` [v0.45.0](https://github.com/libp2p/go-libp2p/releases/tag/v0.45.0)
26+
- upgrade to `go-log/v2` [v2.9.0](https://github.com/ipfs/go-log/releases/tag/v2.9.0)
27+
2428
### Fixed
2529

2630
- Upgrade go-ds-pebble to [v0.5.6](https://github.com/ipfs/go-ds-pebble/releases/tag/v0.5.6) and pebble to [v2.1.1](https://github.com/cockroachdb/pebble/releases/tag/v2.1.1)

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ require (
1111
github.com/felixge/httpsnoop v1.0.4
1212
github.com/ipfs-shipyard/nopfs v0.0.14
1313
github.com/ipfs-shipyard/nopfs/ipfs v0.25.0
14-
github.com/ipfs/boxo v0.35.1
14+
github.com/ipfs/boxo v0.35.2
1515
github.com/ipfs/go-block-format v0.2.3
1616
github.com/ipfs/go-cid v0.5.0
1717
github.com/ipfs/go-datastore v0.9.0
1818
github.com/ipfs/go-ds-badger4 v0.1.8
1919
github.com/ipfs/go-ds-flatfs v0.5.5
2020
github.com/ipfs/go-ds-leveldb v0.5.2
2121
github.com/ipfs/go-ds-pebble v0.5.6
22-
github.com/ipfs/go-log/v2 v2.8.2
22+
github.com/ipfs/go-log/v2 v2.9.0
2323
github.com/ipfs/go-metrics-interface v0.3.0
2424
github.com/ipfs/go-metrics-prometheus v0.1.0
2525
github.com/ipfs/go-test v0.2.3
2626
github.com/ipfs/go-unixfsnode v1.10.2
2727
github.com/ipld/go-codec-dagpb v1.7.0
28-
github.com/libp2p/go-libp2p v0.43.0
28+
github.com/libp2p/go-libp2p v0.45.0
2929
github.com/libp2p/go-libp2p-kad-dht v0.35.1
3030
github.com/libp2p/go-libp2p-record v0.3.1
3131
github.com/libp2p/go-libp2p-routing-helpers v0.7.5
@@ -81,7 +81,7 @@ require (
8181
github.com/fsnotify/fsnotify v1.7.0 // indirect
8282
github.com/gabriel-vasile/mimetype v1.4.10 // indirect
8383
github.com/gammazero/chanqueue v1.1.1 // indirect
84-
github.com/gammazero/deque v1.1.0 // indirect
84+
github.com/gammazero/deque v1.2.0 // indirect
8585
github.com/getsentry/sentry-go v0.27.0 // indirect
8686
github.com/go-kit/log v0.2.1 // indirect
8787
github.com/go-logfmt/logfmt v0.6.0 // indirect
@@ -103,7 +103,7 @@ require (
103103
github.com/ipfs/bbloom v0.0.4 // indirect
104104
github.com/ipfs/go-bitfield v1.1.0 // indirect
105105
github.com/ipfs/go-cidutil v0.1.0 // indirect
106-
github.com/ipfs/go-dsqueue v0.1.0 // indirect
106+
github.com/ipfs/go-dsqueue v0.1.1 // indirect
107107
github.com/ipfs/go-ipfs-pq v0.0.3 // indirect
108108
github.com/ipfs/go-ipfs-redirects-file v0.1.2 // indirect
109109
github.com/ipfs/go-ipld-cbor v0.2.1 // indirect
@@ -210,7 +210,7 @@ require (
210210
go.uber.org/multierr v1.11.0 // indirect
211211
go.uber.org/zap v1.27.0 // indirect
212212
go.yaml.in/yaml/v2 v2.4.3 // indirect
213-
golang.org/x/exp v0.0.0-20251009144603-d2f985daa21b // indirect
213+
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
214214
golang.org/x/mod v0.29.0 // indirect
215215
golang.org/x/net v0.46.0 // indirect
216216
golang.org/x/sync v0.17.0 // indirect

go.sum

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIp
180180
github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
181181
github.com/gammazero/chanqueue v1.1.1 h1:n9Y+zbBxw2f7uUE9wpgs0rOSkP/I/yhDLiNuhyVjojQ=
182182
github.com/gammazero/chanqueue v1.1.1/go.mod h1:fMwpwEiuUgpab0sH4VHiVcEoji1pSi+EIzeG4TPeKPc=
183-
github.com/gammazero/deque v1.1.0 h1:OyiyReBbnEG2PP0Bnv1AASLIYvyKqIFN5xfl1t8oGLo=
184-
github.com/gammazero/deque v1.1.0/go.mod h1:JVrR+Bj1NMQbPnYclvDlvSX0nVGReLrQZ0aUMuWLctg=
183+
github.com/gammazero/deque v1.2.0 h1:scEFO8Uidhw6KDU5qg1HA5fYwM0+us2qdeJqm43bitU=
184+
github.com/gammazero/deque v1.2.0/go.mod h1:JVrR+Bj1NMQbPnYclvDlvSX0nVGReLrQZ0aUMuWLctg=
185185
github.com/garyburd/redigo v1.1.1-0.20170914051019-70e1b1943d4f/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
186186
github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps=
187187
github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
@@ -345,8 +345,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.25.0 h1:OqNqsGZPX8zh3eFMO8Lf8EHRRnSGBMqcd
345345
github.com/ipfs-shipyard/nopfs/ipfs v0.25.0/go.mod h1:BxhUdtBgOXg1B+gAPEplkg/GpyTZY+kCMSfsJvvydqU=
346346
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
347347
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
348-
github.com/ipfs/boxo v0.35.1 h1:MGL3aaaxnu/h9KKq+X/6FxapI/qlDmnRNk33U7tz/fQ=
349-
github.com/ipfs/boxo v0.35.1/go.mod h1:/p1XZVp+Yzv78RuKjb3BESBYEQglRgDrWvmN5mFrsus=
348+
github.com/ipfs/boxo v0.35.2 h1:0QZJJh6qrak28abENOi5OA8NjBnZM4p52SxeuIDqNf8=
349+
github.com/ipfs/boxo v0.35.2/go.mod h1:bZn02OFWwJtY8dDW9XLHaki59EC5o+TGDECXEbe1w8U=
350350
github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
351351
github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
352352
github.com/ipfs/go-block-format v0.2.3 h1:mpCuDaNXJ4wrBJLrtEaGFGXkferrw5eqVvzaHhtFKQk=
@@ -372,8 +372,8 @@ github.com/ipfs/go-ds-leveldb v0.5.2 h1:6nmxlQ2zbp4LCNdJVsmHfs9GP0eylfBNxpmY1csp
372372
github.com/ipfs/go-ds-leveldb v0.5.2/go.mod h1:2fAwmcvD3WoRT72PzEekHBkQmBDhc39DJGoREiuGmYo=
373373
github.com/ipfs/go-ds-pebble v0.5.6 h1:mxTlfqILdcVue/hbuYpF89ihrRz8qcv0YWk2UsdGC3c=
374374
github.com/ipfs/go-ds-pebble v0.5.6/go.mod h1:q5C8c138Y/jWIJ6sfOnpKHkhJ4vVVI+e5J8OafhEr3U=
375-
github.com/ipfs/go-dsqueue v0.1.0 h1:OrahKDtT/Q+iMgKaM9XWdxrYPVASFpTuLah8QpKjboc=
376-
github.com/ipfs/go-dsqueue v0.1.0/go.mod h1:iLNkodSOSKTLn0gCvL9ikArz5rZfNh8F9/BRvHe7RbY=
375+
github.com/ipfs/go-dsqueue v0.1.1 h1:6PQlHDyf9PSTN69NmwUir5+0is3tU0vRJj8zLlgK8Mc=
376+
github.com/ipfs/go-dsqueue v0.1.1/go.mod h1:Xxg353WSwwzYn3FGSzZ+taSQII3pIZ+EJC8/oWRDM10=
377377
github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
378378
github.com/ipfs/go-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ=
379379
github.com/ipfs/go-ipfs-delay v0.0.1/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
@@ -389,8 +389,8 @@ github.com/ipfs/go-ipld-format v0.6.3/go.mod h1:74ilVN12NXVMIV+SrBAyC05UJRk0jVvG
389389
github.com/ipfs/go-ipld-legacy v0.2.2 h1:DThbqCPVLpWBcGtU23KDLiY2YRZZnTkXQyfz8aOfBkQ=
390390
github.com/ipfs/go-ipld-legacy v0.2.2/go.mod h1:hhkj+b3kG9b2BcUNw8IFYAsfeNo8E3U7eYlWeAOPyDU=
391391
github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
392-
github.com/ipfs/go-log/v2 v2.8.2 h1:nVG4nNHUwwI/sTs9Bi5iE8sXFQwXs3AjkkuWhg7+Y2I=
393-
github.com/ipfs/go-log/v2 v2.8.2/go.mod h1:UhIYAwMV7Nb4ZmihUxfIRM2Istw/y9cAk3xaK+4Zs2c=
392+
github.com/ipfs/go-log/v2 v2.9.0 h1:l4b06AwVXwldIzbVPZy5z7sKp9lHFTX0KWfTBCtHaOk=
393+
github.com/ipfs/go-log/v2 v2.9.0/go.mod h1:UhIYAwMV7Nb4ZmihUxfIRM2Istw/y9cAk3xaK+4Zs2c=
394394
github.com/ipfs/go-metrics-interface v0.3.0 h1:YwG7/Cy4R94mYDUuwsBfeziJCVm9pBMJ6q/JR9V40TU=
395395
github.com/ipfs/go-metrics-interface v0.3.0/go.mod h1:OxxQjZDGocXVdyTPocns6cOLwHieqej/jos7H4POwoY=
396396
github.com/ipfs/go-metrics-prometheus v0.1.0 h1:bApWOHkrH3VTBHzTHrZSfq4n4weOZDzZFxUXv+HyKcA=
@@ -470,8 +470,8 @@ github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZ
470470
github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
471471
github.com/libp2p/go-flow-metrics v0.3.0 h1:q31zcHUvHnwDO0SHaukewPYgwOBSxtt830uJtUx6784=
472472
github.com/libp2p/go-flow-metrics v0.3.0/go.mod h1:nuhlreIwEguM1IvHAew3ij7A8BMlyHQJ279ao24eZZo=
473-
github.com/libp2p/go-libp2p v0.43.0 h1:b2bg2cRNmY4HpLK8VHYQXLX2d3iND95OjodLFymvqXU=
474-
github.com/libp2p/go-libp2p v0.43.0/go.mod h1:IiSqAXDyP2sWH+J2gs43pNmB/y4FOi2XQPbsb+8qvzc=
473+
github.com/libp2p/go-libp2p v0.45.0 h1:Pdhr2HsFXaYjtfiNcBP4CcRUONvbMFdH3puM9vV4Tiw=
474+
github.com/libp2p/go-libp2p v0.45.0/go.mod h1:NovCojezAt4dnDd4fH048K7PKEqH0UFYYqJRjIIu8zc=
475475
github.com/libp2p/go-libp2p-asn-util v0.4.1 h1:xqL7++IKD9TBFMgnLPZR6/6iYhawHKHl950SO9L6n94=
476476
github.com/libp2p/go-libp2p-asn-util v0.4.1/go.mod h1:d/NI6XZ9qxw67b4e+NgpQexCIiFYJjErASrYW4PFDN8=
477477
github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=
@@ -506,6 +506,8 @@ github.com/magiconair/properties v1.7.4-0.20170902060319-8d7837e64d3c/go.mod h1:
506506
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
507507
github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
508508
github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
509+
github.com/marcopolo/simnet v0.0.1 h1:rSMslhPz6q9IvJeFWDoMGxMIrlsbXau3NkuIXHGJxfg=
510+
github.com/marcopolo/simnet v0.0.1/go.mod h1:WDaQkgLAjqDUEBAOXz22+1j6wXKfGlC5sD5XWt3ddOs=
509511
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk=
510512
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU=
511513
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -933,8 +935,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
933935
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
934936
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
935937
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
936-
golang.org/x/exp v0.0.0-20251009144603-d2f985daa21b h1:18qgiDvlvH7kk8Ioa8Ov+K6xCi0GMvmGfGW0sgd/SYA=
937-
golang.org/x/exp v0.0.0-20251009144603-d2f985daa21b/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
938+
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
939+
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
938940
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
939941
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
940942
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

setup.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"errors"
77
"fmt"
88
"io/fs"
9+
"log/slog"
910
"os"
1011
"path/filepath"
1112
"time"
@@ -29,6 +30,7 @@ import (
2930
badger4 "github.com/ipfs/go-ds-badger4"
3031
flatfs "github.com/ipfs/go-ds-flatfs"
3132
pebbleds "github.com/ipfs/go-ds-pebble"
33+
logging "github.com/ipfs/go-log/v2"
3234
mprome "github.com/ipfs/go-metrics-prometheus"
3335
"github.com/ipfs/go-unixfsnode"
3436
dagpb "github.com/ipld/go-codec-dagpb"
@@ -38,8 +40,9 @@ import (
3840
"github.com/libp2p/go-libp2p/core/metrics"
3941
"github.com/libp2p/go-libp2p/core/peer"
4042
"github.com/libp2p/go-libp2p/core/routing"
43+
"github.com/libp2p/go-libp2p/gologshim"
44+
"github.com/libp2p/go-libp2p/p2p/host/observedaddrs"
4145
"github.com/libp2p/go-libp2p/p2p/net/connmgr"
42-
"github.com/libp2p/go-libp2p/p2p/protocol/identify"
4346
"github.com/multiformats/go-multiaddr"
4447
madns "github.com/multiformats/go-multiaddr-dns"
4548
)
@@ -48,6 +51,15 @@ func init() {
4851
if err := mprome.Inject(); err != nil {
4952
panic(err)
5053
}
54+
55+
// Set go-log's slog handler as the application-wide default.
56+
// This ensures all slog-based logging uses go-log's formatting.
57+
slog.SetDefault(slog.New(logging.SlogHandler()))
58+
59+
// Wire go-log's slog bridge to go-libp2p's gologshim.
60+
// This provides go-libp2p loggers with the "logger" attribute
61+
// for per-subsystem level control (e.g., `ipfs log level libp2p-swarm debug`).
62+
gologshim.SetDefaultHandler(logging.SlogHandler())
5163
}
5264

5365
const httpRouterGatewayProtocol = "transport-ipfs-gateway-http"
@@ -71,7 +83,7 @@ const (
7183

7284
func init() {
7385
// Lets us discover our own public address with a single observation
74-
identify.ActivationThresh = 1
86+
observedaddrs.ActivationThresh = 1
7587
}
7688

7789
type Node struct {

0 commit comments

Comments
 (0)