diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go
index 52addcc072cedd0a01b15f523cd423e82d96b89f..2964716a3b26172e7d532e73d53336bd1bfc3d17 100644
--- a/cmd/ipfs/daemon.go
+++ b/cmd/ipfs/daemon.go
@@ -413,19 +413,9 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
case routingOptionSupernodeKwd:
return errors.New("supernode routing was never fully implemented and has been removed")
case routingOptionDefaultKwd, routingOptionAutoKwd:
- ncfg.Routing = libp2p.ConstructDefaultRouting(
- cfg.Identity.PeerID,
- cfg.Addresses.Swarm,
- cfg.Identity.PrivKey,
- libp2p.DHTOption,
- )
+ ncfg.Routing = libp2p.ConstructDefaultRouting(cfg, libp2p.DHTOption)
case routingOptionAutoClientKwd:
- ncfg.Routing = libp2p.ConstructDefaultRouting(
- cfg.Identity.PeerID,
- cfg.Addresses.Swarm,
- cfg.Identity.PrivKey,
- libp2p.DHTClientOption,
- )
+ ncfg.Routing = libp2p.ConstructDefaultRouting(cfg, libp2p.DHTClientOption)
case routingOptionDHTClientKwd:
ncfg.Routing = libp2p.DHTClientOption
case routingOptionDHTKwd:
diff --git a/core/node/groups.go b/core/node/groups.go
index 866204ce36b27d7667b4352f8b46833b8d5f9820..086d71d14733ec664117fc2780a9cfcff5388049 100644
--- a/core/node/groups.go
+++ b/core/node/groups.go
@@ -165,7 +165,7 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config, userResourceOverrides rcmgr.Part
fx.Provide(libp2p.Routing),
fx.Provide(libp2p.ContentRouting),
- fx.Provide(libp2p.BaseRouting(cfg.Experimental.AcceleratedDHTClient)),
+ fx.Provide(libp2p.BaseRouting(cfg)),
maybeProvide(libp2p.PubsubRouter, bcfg.getOpt("ipnsps")),
maybeProvide(libp2p.BandwidthCounter, !cfg.Swarm.DisableBandwidthMetrics),
diff --git a/core/node/libp2p/routing.go b/core/node/libp2p/routing.go
index 8014d4142ac9e6d6ed38350135ffb79e9a80a2a5..0fc138cadfb1a06a0df97f0133896b804c675b80 100644
--- a/core/node/libp2p/routing.go
+++ b/core/node/libp2p/routing.go
@@ -63,35 +63,34 @@ type processInitialRoutingOut struct {
type AddrInfoChan chan peer.AddrInfo
-func BaseRouting(experimentalDHTClient bool) interface{} {
+func BaseRouting(cfg *config.Config) interface{} {
return func(lc fx.Lifecycle, in processInitialRoutingIn) (out processInitialRoutingOut, err error) {
- var dr *ddht.DHT
+ var dualDHT *ddht.DHT
if dht, ok := in.Router.(*ddht.DHT); ok {
- dr = dht
+ dualDHT = dht
lc.Append(fx.Hook{
OnStop: func(ctx context.Context) error {
- return dr.Close()
+ return dualDHT.Close()
},
})
}
- if pr, ok := in.Router.(routinghelpers.ComposableRouter); ok {
- for _, r := range pr.Routers() {
+ if cr, ok := in.Router.(routinghelpers.ComposableRouter); ok {
+ for _, r := range cr.Routers() {
if dht, ok := r.(*ddht.DHT); ok {
- dr = dht
+ dualDHT = dht
lc.Append(fx.Hook{
OnStop: func(ctx context.Context) error {
- return dr.Close()
+ return dualDHT.Close()
},
})
-
break
}
}
}
- if dr != nil && experimentalDHTClient {
+ if dualDHT != nil && cfg.Experimental.AcceleratedDHTClient {
cfg, err := in.Repo.Config()
if err != nil {
return out, err
@@ -101,7 +100,7 @@ func BaseRouting(experimentalDHTClient bool) interface{} {
return out, err
}
- expClient, err := fullrt.NewFullRT(in.Host,
+ fullRTClient, err := fullrt.NewFullRT(in.Host,
dht.DefaultPrefix,
fullrt.DHTOption(
dht.Validator(in.Validator),
@@ -116,18 +115,30 @@ func BaseRouting(experimentalDHTClient bool) interface{} {
lc.Append(fx.Hook{
OnStop: func(ctx context.Context) error {
- return expClient.Close()
+ return fullRTClient.Close()
},
})
+ // we want to also use the default HTTP routers, so wrap the FullRT client
+ // in a parallel router that calls them in parallel
+ httpRouters, err := constructDefaultHTTPRouters(cfg)
+ if err != nil {
+ return out, err
+ }
+ routers := []*routinghelpers.ParallelRouter{
+ {Router: fullRTClient},
+ }
+ routers = append(routers, httpRouters...)
+ router := routinghelpers.NewComposableParallel(routers)
+
return processInitialRoutingOut{
Router: Router{
- Routing: expClient,
Priority: 1000,
+ Routing: router,
},
- DHT: dr,
- DHTClient: expClient,
- ContentRouter: expClient,
+ DHT: dualDHT,
+ DHTClient: fullRTClient,
+ ContentRouter: fullRTClient,
}, nil
}
@@ -136,8 +147,8 @@ func BaseRouting(experimentalDHTClient bool) interface{} {
Priority: 1000,
Routing: in.Router,
},
- DHT: dr,
- DHTClient: dr,
+ DHT: dualDHT,
+ DHTClient: dualDHT,
ContentRouter: in.Router,
}, nil
}
diff --git a/core/node/libp2p/routingopt.go b/core/node/libp2p/routingopt.go
index 8a69e181b66dbf69971f290f6d639371ac1d4677..62d3320f831f3e35e5f49e68032dcd4c13ec6502 100644
--- a/core/node/libp2p/routingopt.go
+++ b/core/node/libp2p/routingopt.go
@@ -39,8 +39,35 @@ func init() {
}
}
+func constructDefaultHTTPRouters(cfg *config.Config) ([]*routinghelpers.ParallelRouter, error) {
+ var routers []*routinghelpers.ParallelRouter
+ // Append HTTP routers for additional speed
+ for _, endpoint := range defaultHTTPRouters {
+ httpRouter, err := irouting.ConstructHTTPRouter(endpoint, cfg.Identity.PeerID, cfg.Addresses.Swarm, cfg.Identity.PrivKey)
+ if err != nil {
+ return nil, err
+ }
+
+ r := &irouting.Composer{
+ GetValueRouter: routinghelpers.Null{},
+ PutValueRouter: routinghelpers.Null{},
+ ProvideRouter: routinghelpers.Null{}, // modify this when indexers supports provide
+ FindPeersRouter: routinghelpers.Null{},
+ FindProvidersRouter: httpRouter,
+ }
+
+ routers = append(routers, &routinghelpers.ParallelRouter{
+ Router: r,
+ IgnoreError: true, // https://github.com/ipfs/kubo/pull/9475#discussion_r1042507387
+ Timeout: 15 * time.Second, // 5x server value from https://github.com/ipfs/kubo/pull/9475#discussion_r1042428529
+ ExecuteAfter: 0,
+ })
+ }
+ return routers, nil
+}
+
// ConstructDefaultRouting returns routers used when Routing.Type is unset or set to "auto"
-func ConstructDefaultRouting(peerID string, addrs []string, privKey string, routingOpt RoutingOption) func(
+func ConstructDefaultRouting(cfg *config.Config, routingOpt RoutingOption) func(
ctx context.Context,
host host.Host,
dstore datastore.Batching,
@@ -68,29 +95,13 @@ func ConstructDefaultRouting(peerID string, addrs []string, privKey string, rout
ExecuteAfter: 0,
})
- // Append HTTP routers for additional speed
- for _, endpoint := range defaultHTTPRouters {
- httpRouter, err := irouting.ConstructHTTPRouter(endpoint, peerID, addrs, privKey)
- if err != nil {
- return nil, err
- }
-
- r := &irouting.Composer{
- GetValueRouter: routinghelpers.Null{},
- PutValueRouter: routinghelpers.Null{},
- ProvideRouter: routinghelpers.Null{}, // modify this when indexers supports provide
- FindPeersRouter: routinghelpers.Null{},
- FindProvidersRouter: httpRouter,
- }
-
- routers = append(routers, &routinghelpers.ParallelRouter{
- Router: r,
- IgnoreError: true, // https://github.com/ipfs/kubo/pull/9475#discussion_r1042507387
- Timeout: 15 * time.Second, // 5x server value from https://github.com/ipfs/kubo/pull/9475#discussion_r1042428529
- ExecuteAfter: 0,
- })
+ httpRouters, err := constructDefaultHTTPRouters(cfg)
+ if err != nil {
+ return nil, err
}
+ routers = append(routers, httpRouters...)
+
routing := routinghelpers.NewComposableParallel(routers)
return routing, nil
}
diff --git a/docs/changelogs/v0.19.md b/docs/changelogs/v0.19.md
index 1abc2e518b2a37cd4cd32853887c759384e77569..f7e190a7e9c0da3324c2a6aecd8087da17afa889 100644
--- a/docs/changelogs/v0.19.md
+++ b/docs/changelogs/v0.19.md
@@ -1,6 +1,33 @@
<!-- omit in toc -->
# Kubo changelog v0.19
+## v0.19.2
+
+### Highlights
+
+#### FullRT DHT HTTP Routers
+
+The default HTTP routers are now used when the FullRT DHT client is used. This fixes
+the issue where cid.contact is not being queried by default when the accelerated
+DHT client was enabled. Read more in ([ipfs/kubo#9841](https://github.com/ipfs/kubo/pull/9841)).
+
+### Changelog
+
+<details><summary>Full Changelog</summary>
+
+- github.com/ipfs/kubo:
+ - fix: use default HTTP routers when FullRT DHT client is used (#9841) ([ipfs/kubo#9841](https://github.com/ipfs/kubo/pull/9841))
+ - chore: update version
+
+</details>
+
+### Contributors
+
+| Contributor | Commits | Lines ± | Files Changed |
+|-------------|---------|---------|---------------|
+| Gus Eggert | 1 | +65/-53 | 4 |
+| Henrique Dias | 1 | +1/-1 | 1 |
+
## v0.19.1
### 🔦 Highlights
diff --git a/version.go b/version.go
index 52c34a4088d28b08987f6ee190e5d9dd22537fdb..4a515f82ced045d20fd10e47bc700a93f07d41ac 100644
--- a/version.go
+++ b/version.go
@@ -11,7 +11,7 @@ import (
var CurrentCommit string
// CurrentVersionNumber is the current application's version literal
-const CurrentVersionNumber = "0.19.1"
+const CurrentVersionNumber = "0.19.2"
const ApiVersion = "/kubo/" + CurrentVersionNumber + "/" //nolint