From c58aadb887a5ca88256ac8f3a8fbf60b0263c978 Mon Sep 17 00:00:00 2001
From: Piotr Galar <piotr.galar@gmail.com>
Date: Fri, 7 Apr 2023 09:28:40 +0200
Subject: [PATCH 01/17] chore: update version (#9805)

---
 version.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.go b/version.go
index 992f4a988..bf6419ec6 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.20.0-dev"
+const CurrentVersionNumber = "0.21.0-dev"
 
 const ApiVersion = "/kubo/" + CurrentVersionNumber + "/" //nolint
 

From a97bf4271d54898ca7f2447d2308fad1ebb8968b Mon Sep 17 00:00:00 2001
From: Gus Eggert <gus@gus.dev>
Date: Mon, 10 Apr 2023 06:59:40 -0400
Subject: [PATCH 02/17] chore: set kubo-maintainers as default code owners
 (#9808)

---
 .github/CODEOWNERS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5151ad178..7d17855e0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,6 +2,9 @@
 # request that modifies code that they own. Code owners are not automatically
 # requested to review draft pull requests.
 
+# Default
+* @ipfs/kubo-maintainers 
+
 # HTTP Gateway
 core/corehttp/  @lidel
 test/sharness/*gateway*.sh  @lidel

From 03a98280e3e642774776cd3d0435ab53e5dfa867 Mon Sep 17 00:00:00 2001
From: Gus Eggert <gus@gus.dev>
Date: Fri, 7 Apr 2023 08:57:21 -0400
Subject: [PATCH 03/17] test: port twonode test to Go, remove multinode test

The multinode test is effectively the same as the twonode test. There
are some problems with it too: it *looks* like it's testing the
Websocket transport with the "listentype,ws" IPTB attribute, but that
attribute doesn't actually exist in ipfs/iptb-plugins, so it does
nothing, so that test actually just runs the same test twice (Yamux
disabled). Furthermore, this is just the same test as in the mplex
twonode test. So this just removes the useless multinode test
entirely.

Also, this removes the part of the twonode test that checks the amount
of data transferred over Bitswap. This is an implementation detail of
Bitswap, it's not appropriate to test this in an end-to-end test as it
depends on algorithmic details of how Bitswap works, and has nothing
to do with transports. This is probably more appropriate as a perf or
benchmark test of Bitswap.

This also moves equivalent functionality from jbenet/go-random-files
into the testutils package. This just copies the code and modifies it
slightly for better ergonomics.
---
 test/cli/testutils/random_files.go | 116 +++++++++++++++++++
 test/cli/transports_test.go        | 127 ++++++++++++++++++++
 test/sharness/t0125-twonode.sh     | 178 -----------------------------
 test/sharness/t0130-multinode.sh   | 115 -------------------
 4 files changed, 243 insertions(+), 293 deletions(-)
 create mode 100644 test/cli/testutils/random_files.go
 create mode 100644 test/cli/transports_test.go
 delete mode 100755 test/sharness/t0125-twonode.sh
 delete mode 100755 test/sharness/t0130-multinode.sh

diff --git a/test/cli/testutils/random_files.go b/test/cli/testutils/random_files.go
new file mode 100644
index 000000000..0e550a125
--- /dev/null
+++ b/test/cli/testutils/random_files.go
@@ -0,0 +1,116 @@
+package testutils
+
+import (
+	"fmt"
+	"io"
+	"math/rand"
+	"os"
+	"path"
+	"time"
+)
+
+var AlphabetEasy = []rune("abcdefghijklmnopqrstuvwxyz01234567890-_")
+var AlphabetHard = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890!@#$%^&*()-_+= ;.,<>'\"[]{}() ")
+
+type RandFiles struct {
+	Rand         *rand.Rand
+	FileSize     int // the size per file.
+	FilenameSize int
+	Alphabet     []rune // for filenames
+
+	FanoutDepth int // how deep the hierarchy goes
+	FanoutFiles int // how many files per dir
+	FanoutDirs  int // how many dirs per dir
+
+	RandomSize   bool // randomize file sizes
+	RandomFanout bool // randomize fanout numbers
+}
+
+func NewRandFiles() *RandFiles {
+	return &RandFiles{
+		Rand:         rand.New(rand.NewSource(time.Now().UnixNano())),
+		FileSize:     4096,
+		FilenameSize: 16,
+		Alphabet:     AlphabetEasy,
+		FanoutDepth:  2,
+		FanoutDirs:   5,
+		FanoutFiles:  10,
+		RandomSize:   true,
+	}
+}
+
+func (r *RandFiles) WriteRandomFiles(root string, depth int) error {
+	numfiles := r.FanoutFiles
+	if r.RandomFanout {
+		numfiles = rand.Intn(r.FanoutFiles) + 1
+	}
+
+	for i := 0; i < numfiles; i++ {
+		if err := r.WriteRandomFile(root); err != nil {
+			return err
+		}
+	}
+
+	if depth+1 <= r.FanoutDepth {
+		numdirs := r.FanoutDirs
+		if r.RandomFanout {
+			numdirs = r.Rand.Intn(numdirs) + 1
+		}
+
+		for i := 0; i < numdirs; i++ {
+			if err := r.WriteRandomDir(root, depth+1); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func (r *RandFiles) RandomFilename(length int) string {
+	b := make([]rune, length)
+	for i := range b {
+		b[i] = r.Alphabet[r.Rand.Intn(len(r.Alphabet))]
+	}
+	return string(b)
+}
+
+func (r *RandFiles) WriteRandomFile(root string) error {
+	filesize := int64(r.FileSize)
+	if r.RandomSize {
+		filesize = r.Rand.Int63n(filesize) + 1
+	}
+
+	n := rand.Intn(r.FilenameSize-4) + 4
+	name := r.RandomFilename(n)
+	filepath := path.Join(root, name)
+	f, err := os.Create(filepath)
+	if err != nil {
+		return fmt.Errorf("creating random file: %w", err)
+	}
+
+	if _, err := io.CopyN(f, r.Rand, filesize); err != nil {
+		return fmt.Errorf("copying random file: %w", err)
+	}
+
+	return f.Close()
+}
+
+func (r *RandFiles) WriteRandomDir(root string, depth int) error {
+	if depth > r.FanoutDepth {
+		return nil
+	}
+
+	n := rand.Intn(r.FilenameSize-4) + 4
+	name := r.RandomFilename(n)
+	root = path.Join(root, name)
+	if err := os.MkdirAll(root, 0755); err != nil {
+		return fmt.Errorf("creating random dir: %w", err)
+	}
+
+	err := r.WriteRandomFiles(root, depth)
+	if err != nil {
+		return fmt.Errorf("writing random files in random dir: %w", err)
+	}
+	return nil
+}
diff --git a/test/cli/transports_test.go b/test/cli/transports_test.go
new file mode 100644
index 000000000..78f21fd05
--- /dev/null
+++ b/test/cli/transports_test.go
@@ -0,0 +1,127 @@
+package cli
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/ipfs/kubo/config"
+	"github.com/ipfs/kubo/test/cli/harness"
+	"github.com/ipfs/kubo/test/cli/testutils"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestTransports(t *testing.T) {
+	disableRouting := func(nodes harness.Nodes) {
+		nodes.ForEachPar(func(n *harness.Node) {
+			n.UpdateConfig(func(cfg *config.Config) {
+				cfg.Routing.Type = config.NewOptionalString("none")
+				cfg.Bootstrap = nil
+			})
+		})
+	}
+	checkSingleFile := func(nodes harness.Nodes) {
+		s := testutils.RandomStr(100)
+		hash := nodes[0].IPFSAddStr(s)
+		nodes.ForEachPar(func(n *harness.Node) {
+			val := n.IPFS("cat", hash).Stdout.String()
+			assert.Equal(t, s, val)
+		})
+	}
+	checkRandomDir := func(nodes harness.Nodes) {
+		randDir := filepath.Join(nodes[0].Dir, "foobar")
+		require.NoError(t, os.Mkdir(randDir, 0777))
+		rf := testutils.NewRandFiles()
+		rf.FanoutDirs = 3
+		rf.FanoutFiles = 6
+		require.NoError(t, rf.WriteRandomFiles(randDir, 4))
+
+		hash := nodes[1].IPFS("add", "-r", "-Q", randDir).Stdout.Trimmed()
+		nodes.ForEachPar(func(n *harness.Node) {
+			res := n.RunIPFS("refs", "-r", hash)
+			assert.Equal(t, 0, res.ExitCode())
+		})
+	}
+
+	runTests := func(nodes harness.Nodes) {
+		checkSingleFile(nodes)
+		checkRandomDir(nodes)
+	}
+
+	tcpNodes := func(t *testing.T) harness.Nodes {
+		nodes := harness.NewT(t).NewNodes(2).Init()
+		nodes.ForEachPar(func(n *harness.Node) {
+			n.UpdateConfig(func(cfg *config.Config) {
+				cfg.Addresses.Swarm = []string{"/ip4/127.0.0.1/tcp/0"}
+				cfg.Swarm.Transports.Network.QUIC = config.False
+				cfg.Swarm.Transports.Network.Relay = config.False
+				cfg.Swarm.Transports.Network.WebTransport = config.False
+				cfg.Swarm.Transports.Network.Websocket = config.False
+			})
+		})
+		disableRouting(nodes)
+		return nodes
+	}
+
+	t.Run("tcp", func(t *testing.T) {
+		t.Parallel()
+		nodes := tcpNodes(t).StartDaemons().Connect()
+		runTests(nodes)
+	})
+
+	t.Run("tcp with mplex", func(t *testing.T) {
+		t.Parallel()
+		nodes := tcpNodes(t)
+		nodes.ForEachPar(func(n *harness.Node) {
+			n.UpdateConfig(func(cfg *config.Config) {
+				cfg.Swarm.Transports.Multiplexers.Yamux = config.Disabled
+			})
+		})
+		nodes.StartDaemons().Connect()
+		runTests(nodes)
+	})
+
+	t.Run("tcp with NOISE", func(t *testing.T) {
+		t.Parallel()
+		nodes := tcpNodes(t)
+		nodes.ForEachPar(func(n *harness.Node) {
+			n.UpdateConfig(func(cfg *config.Config) {
+				cfg.Swarm.Transports.Security.TLS = config.Disabled
+			})
+		})
+		nodes.StartDaemons().Connect()
+		runTests(nodes)
+	})
+
+	t.Run("QUIC", func(t *testing.T) {
+		t.Parallel()
+		nodes := harness.NewT(t).NewNodes(5).Init()
+		nodes.ForEachPar(func(n *harness.Node) {
+			n.UpdateConfig(func(cfg *config.Config) {
+				cfg.Addresses.Swarm = []string{"/ip4/127.0.0.1/udp/0/quic-v1"}
+				cfg.Swarm.Transports.Network.QUIC = config.True
+				cfg.Swarm.Transports.Network.TCP = config.False
+			})
+		})
+		disableRouting(nodes)
+		nodes.StartDaemons().Connect()
+		runTests(nodes)
+	})
+
+	t.Run("QUIC", func(t *testing.T) {
+		t.Parallel()
+		nodes := harness.NewT(t).NewNodes(5).Init()
+		nodes.ForEachPar(func(n *harness.Node) {
+			n.UpdateConfig(func(cfg *config.Config) {
+				cfg.Addresses.Swarm = []string{"/ip4/127.0.0.1/udp/0/quic-v1/webtransport"}
+				cfg.Swarm.Transports.Network.QUIC = config.True
+				cfg.Swarm.Transports.Network.WebTransport = config.True
+			})
+		})
+		disableRouting(nodes)
+		nodes.StartDaemons().Connect()
+		runTests(nodes)
+	})
+
+}
diff --git a/test/sharness/t0125-twonode.sh b/test/sharness/t0125-twonode.sh
deleted file mode 100755
index 8ea1c9e5d..000000000
--- a/test/sharness/t0125-twonode.sh
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2017 Jeromy Johnson
-# MIT Licensed; see the LICENSE file in this repository.
-#
-
-test_description="Test two ipfs nodes transferring a file"
-
-. lib/test-lib.sh
-
-check_file_fetch() {
-  node=$1
-  fhash=$2
-  fname=$3
-
-  test_expect_success "can fetch file" '
-    ipfsi $node cat $fhash > fetch_out
-  '
-
-  test_expect_success "file looks good" '
-    test_cmp $fname fetch_out
-  '
-}
-
-check_dir_fetch() {
-  node=$1
-  ref=$2
-
-  test_expect_success "node can fetch all refs for dir" '
-    ipfsi $node refs -r $ref > /dev/null
-  '
-}
-
-run_single_file_test() {
-  test_expect_success "add a file on node1" '
-    random 1000000 > filea &&
-    FILEA_HASH=$(ipfsi 1 add -q filea)
-  '
-
-  check_file_fetch 0 $FILEA_HASH filea
-}
-
-run_random_dir_test() {
-  test_expect_success "create a bunch of random files" '
-    random-files -depth=3 -dirs=4 -files=5 -seed=5 foobar > /dev/null
-  '
-
-  test_expect_success "add those on node 0" '
-    DIR_HASH=$(ipfsi 0 add -r -Q foobar)
-  '
-
-  check_dir_fetch 1 $DIR_HASH
-}
-
-flaky_advanced_test() {
-  startup_cluster 2 "$@"
-
-  test_expect_success "clean repo before test" '
-    ipfsi 0 repo gc > /dev/null &&
-    ipfsi 1 repo gc > /dev/null
-  '
-
-  run_single_file_test
-
-  run_random_dir_test
-
-  test_expect_success "gather bitswap stats" '
-    ipfsi 0 bitswap stat -v > stat0 &&
-    ipfsi 1 bitswap stat -v > stat1
-  '
-
-  test_expect_success "shut down nodes" '
-    iptb stop && iptb_wait_stop
-  '
-
-  # NOTE: data transferred stats checks are flaky
-  #       trying to debug them by printing out the stats hides the flakiness
-  #       my theory is that the extra time cat calls take to print out the stats
-  #       allow for proper cleanup to happen
-  go-sleep 1s
-}
-
-run_advanced_test() {
-  # TODO: investigate why flaky_advanced_test is flaky
-  # Context: https://github.com/ipfs/kubo/pull/9486
-  # sometimes, bitswap status returns  unexpected block transfers
-  # and everyone has been re-running circleci until is passes for at least a year.
-  # this re-runs test until it passes or a timeout hits
-
-  BLOCKS_0=126
-  BLOCKS_1=5
-  DATA_0=228113
-  DATA_1=1000256
-  for i in $(test_seq 1 600); do
-    flaky_advanced_test
-    (grep -q "$DATA_0" stat0 && grep -q "$DATA_1" stat1) && break
-    go-sleep 100ms
-  done
-
-  test_expect_success "node0 data transferred looks correct" '
-    test_should_contain "blocks sent: $BLOCKS_0" stat0 &&
-    test_should_contain "blocks received: $BLOCKS_1" stat0 &&
-    test_should_contain "data sent: $DATA_0" stat0 &&
-    test_should_contain "data received: $DATA_1" stat0
-  '
-
-  test_expect_success "node1 data transferred looks correct" '
-    test_should_contain "blocks received: $BLOCKS_0" stat1 &&
-    test_should_contain "blocks sent: $BLOCKS_1" stat1 &&
-    test_should_contain "data received: $DATA_0" stat1 &&
-    test_should_contain "data sent: $DATA_1" stat1
-  '
-
-}
-
-test_expect_success "set up tcp testbed" '
-  iptb testbed create -type localipfs -count 2 -force -init
-'
-
-test_expect_success "disable routing, use direct peering" '
-  iptb run -- ipfs config Routing.Type none &&
-  iptb run -- ipfs config --json Bootstrap "[]"
-'
-
-# Test TCP transport
-echo "Testing TCP"
-addrs='"[\"/ip4/127.0.0.1/tcp/0\"]"'
-test_expect_success "use TCP only" '
-  iptb run -- ipfs config --json Addresses.Swarm '"${addrs}"' &&
-  iptb run -- ipfs config --json Swarm.Transports.Network.QUIC false &&
-  iptb run -- ipfs config --json Swarm.Transports.Network.Relay false &&
-  iptb run -- ipfs config --json Swarm.Transports.Network.WebTransport false &&
-  iptb run -- ipfs config --json Swarm.Transports.Network.Websocket false
-'
-run_advanced_test
-
-# test multiplex muxer
-echo "Running TCP tests with mplex"
-test_expect_success "disable yamux" '
-  iptb run -- ipfs config --json Swarm.Transports.Multiplexers.Yamux false
-'
-run_advanced_test
-
-test_expect_success "re-enable yamux" '
-  iptb run -- ipfs config --json Swarm.Transports.Multiplexers.Yamux null
-'
-# test Noise
-echo "Running TCP tests with NOISE"
-test_expect_success "use noise only" '
-  iptb run -- ipfs config --json Swarm.Transports.Security.TLS false
-'
-run_advanced_test
-
-test_expect_success "re-enable TLS" '
-  iptb run -- ipfs config --json Swarm.Transports.Security.TLS null
-'
-
-# test QUIC
-echo "Running advanced tests over QUIC"
-addrs='"[\"/ip4/127.0.0.1/udp/0/quic-v1\"]"'
-test_expect_success "use QUIC only" '
-  iptb run -- ipfs config --json Addresses.Swarm '"${addrs}"' &&
-  iptb run -- ipfs config --json Swarm.Transports.Network.QUIC true &&
-  iptb run -- ipfs config --json Swarm.Transports.Network.TCP false
-'
-run_advanced_test
-
-# test WebTransport
-echo "Running advanced tests over WebTransport"
-addrs='"[\"/ip4/127.0.0.1/udp/0/quic-v1/webtransport\"]"'
-test_expect_success "use WebTransport only" '
-  iptb run -- ipfs config --json Addresses.Swarm '"${addrs}"' &&
-  iptb run -- ipfs config --json Swarm.Transports.Network.QUIC true &&
-  iptb run -- ipfs config --json Swarm.Transports.Network.WebTransport true
-'
-run_advanced_test
-
-test_done
diff --git a/test/sharness/t0130-multinode.sh b/test/sharness/t0130-multinode.sh
deleted file mode 100755
index 04746850b..000000000
--- a/test/sharness/t0130-multinode.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2015 Jeromy Johnson
-# MIT Licensed; see the LICENSE file in this repository.
-#
-
-test_description="Test multiple ipfs nodes"
-
-. lib/test-lib.sh
-
-check_file_fetch() {
-  node=$1
-  fhash=$2
-  fname=$3
-
-  test_expect_success "can fetch file" '
-    ipfsi $node cat $fhash > fetch_out
-  '
-
-  test_expect_success "file looks good" '
-    test_cmp $fname fetch_out
-  '
-}
-
-check_dir_fetch() {
-  node=$1
-  ref=$2
-
-  test_expect_success "node can fetch all refs for dir" '
-    ipfsi $node refs -r $ref > /dev/null
-  '
-}
-
-run_single_file_test() {
-  test_expect_success "add a file on node1" '
-    random 1000000 > filea &&
-    FILEA_HASH=$(ipfsi 1 add -q filea)
-  '
-
-  check_file_fetch 4 $FILEA_HASH filea
-  check_file_fetch 3 $FILEA_HASH filea
-  check_file_fetch 2 $FILEA_HASH filea
-  check_file_fetch 1 $FILEA_HASH filea
-  check_file_fetch 0 $FILEA_HASH filea
-}
-
-run_random_dir_test() {
-  test_expect_success "create a bunch of random files" '
-    random-files -depth=4 -dirs=3 -files=6 foobar > /dev/null
-  '
-
-  test_expect_success "add those on node 2" '
-    DIR_HASH=$(ipfsi 2 add -r -Q foobar)
-  '
-
-  check_dir_fetch 0 $DIR_HASH
-  check_dir_fetch 1 $DIR_HASH
-  check_dir_fetch 2 $DIR_HASH
-  check_dir_fetch 3 $DIR_HASH
-  check_dir_fetch 4 $DIR_HASH
-}
-
-
-run_basic_test() {
-  startup_cluster 5
-
-  run_single_file_test
-
-  test_expect_success "shut down nodes" '
-    iptb stop && iptb_wait_stop
-  '
-}
-
-run_advanced_test() {
-  startup_cluster 5 "$@"
-
-  run_single_file_test
-
-  run_random_dir_test
-
-  test_expect_success "shut down nodes" '
-    iptb stop && iptb_wait_stop ||
-      test_fsh tail -n +1 .iptb/testbeds/default/*/daemon.std*
-  '
-}
-
-test_expect_success "set up /tcp testbed" '
-  iptb testbed create -type localipfs -count 5 -force -init
-'
-
-# test default configuration
-run_advanced_test
-
-# test multiplex muxer
-test_expect_success "disable yamux" '
-  iptb run -- ipfs config --json Swarm.Transports.Multiplexers.Yamux false
-'
-run_advanced_test
-
-test_expect_success "set up /ws testbed" '
-  iptb testbed create -type localipfs -count 5 -attr listentype,ws -force -init
-'
-
-# test default configuration
-run_advanced_test
-
-# test multiplex muxer
-test_expect_success "disable yamux" '
-  iptb run -- ipfs config --json Swarm.Transports.Multiplexers.Yamux false
-'
-
-run_advanced_test
-
-
-test_done

From f7cab554f9a8d1fc2b16742c10ea75f8f05e4190 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Wed, 12 Apr 2023 01:51:02 +0200
Subject: [PATCH 04/17] feat: boxo tracing and traceparent support (#9811)

https://www.w3.org/TR/trace-context/
https://github.com/ipfs/bifrost-gateway/issues/68
---
 docs/environment-variables.md          | 71 +--------------------
 docs/examples/kubo-as-a-library/go.mod |  2 +-
 docs/examples/kubo-as-a-library/go.sum |  4 +-
 go.mod                                 | 12 ++--
 go.sum                                 |  4 +-
 tracing/file_exporter.go               | 45 -------------
 tracing/tracing.go                     | 88 +-------------------------
 7 files changed, 14 insertions(+), 212 deletions(-)
 delete mode 100644 tracing/file_exporter.go

diff --git a/docs/environment-variables.md b/docs/environment-variables.md
index b3d03d1bd..4113be09b 100644
--- a/docs/environment-variables.md
+++ b/docs/environment-variables.md
@@ -164,74 +164,5 @@ and outputs it to `rcmgr.json.gz`
 Default: disabled (not set)
 
 # Tracing
-For advanced configuration (e.g. ratio-based sampling), see also: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/sdk-environment-variables.md
 
-## `OTEL_TRACES_EXPORTER`
-Specifies the exporters to use as a comma-separated string. Each exporter has a set of additional environment variables used to configure it. The following values are supported:
-
-- `otlp`
-- `jaeger`
-- `zipkin`
-- `file` -- appends traces to a JSON file on the filesystem
-
-Setting this enables OpenTelemetry tracing.
-
-**NOTE** Tracing support is experimental: releases may contain tracing-related breaking changes.
-
-Default: "" (no exporters)
-
-## `OTLP Exporter`
-Unless specified in this section, the OTLP exporter uses the environment variables documented here: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md
-
-### `OTEL_EXPORTER_OTLP_PROTOCOL`
-Specifies the OTLP protocol to use, which is one of:
-
-- `grpc`
-- `http/protobuf`
-
-Default: "grpc"
-
-## `Jaeger Exporter`
-
-See: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/sdk-environment-variables.md#jaeger-exporter
-
-## `Zipkin Exporter`
-See: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/sdk-environment-variables.md#zipkin-exporter
-
-## `File Exporter`
-### `OTEL_EXPORTER_FILE_PATH`
-Specifies the filesystem path for the JSON file.
-
-Default: "$PWD/traces.json"
-
-### How to use Jaeger UI
-
-One can use the `jaegertracing/all-in-one` Docker image to run a full Jaeger
-stack and configure Kubo to publish traces to it (here, in an ephemeral
-container):
-
-```console
-$ docker run --rm -it --name jaeger \
-    -e COLLECTOR_ZIPKIN_HOST_PORT=:9411 \
-    -p 5775:5775/udp \
-    -p 6831:6831/udp \
-    -p 6832:6832/udp \
-    -p 5778:5778 \
-    -p 16686:16686 \
-    -p 14268:14268 \
-    -p 14269:14269 \
-    -p 14250:14250 \
-    -p 9411:9411 \
-    jaegertracing/all-in-one
-```
-
-Then, in other terminal, start Kubo with Jaeger tracing enabled:
-```
-$ OTEL_TRACES_EXPORTER=jaeger ipfs daemon
-```
-
-Finally, the [Jaeger UI](https://github.com/jaegertracing/jaeger-ui#readme) is available at http://localhost:16686
-
-## `OTEL_PROPAGATORS`
-
-See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/sdk-environment-variables.md#general-sdk-configuration
+For tracing configuration, please check: https://github.com/ipfs/boxo/blob/main/docs/tracing.md
diff --git a/docs/examples/kubo-as-a-library/go.mod b/docs/examples/kubo-as-a-library/go.mod
index 1c2af1154..345f97f3f 100644
--- a/docs/examples/kubo-as-a-library/go.mod
+++ b/docs/examples/kubo-as-a-library/go.mod
@@ -7,7 +7,7 @@ go 1.18
 replace github.com/ipfs/kubo => ./../../..
 
 require (
-	github.com/ipfs/boxo v0.8.0
+	github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e
 	github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
 	github.com/libp2p/go-libp2p v0.27.0
 	github.com/multiformats/go-multiaddr v0.9.0
diff --git a/docs/examples/kubo-as-a-library/go.sum b/docs/examples/kubo-as-a-library/go.sum
index 802f84be6..755f9aceb 100644
--- a/docs/examples/kubo-as-a-library/go.sum
+++ b/docs/examples/kubo-as-a-library/go.sum
@@ -321,8 +321,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
-github.com/ipfs/boxo v0.8.0 h1:UdjAJmHzQHo/j3g3b1bAcAXCj/GM6iTwvSlBDvPBNBs=
-github.com/ipfs/boxo v0.8.0/go.mod h1:RIsi4CnTyQ7AUsNn5gXljJYZlQrHBMnJp94p73liFiA=
+github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e h1:8wmBhjwJk2drWZjNwoN7uc+IkG+N93laIhjY69rjMqw=
+github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e/go.mod h1:xJ2hVb4La5WyD7GvKYE0lq2g1rmQZoCD2K4WNrV6aZI=
 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
diff --git a/go.mod b/go.mod
index 58d943ac5..115bd5749 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/ipfs/boxo v0.8.0
+	github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e
 	github.com/ipfs/go-block-format v0.1.2
 	github.com/ipfs/go-cid v0.4.1
 	github.com/ipfs/go-cidutil v0.1.0
@@ -75,11 +75,6 @@ require (
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0
 	go.opentelemetry.io/contrib/propagators/autoprop v0.40.0
 	go.opentelemetry.io/otel v1.14.0
-	go.opentelemetry.io/otel/exporters/jaeger v1.14.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0
-	go.opentelemetry.io/otel/exporters/zipkin v1.14.0
 	go.opentelemetry.io/otel/sdk v1.14.0
 	go.opentelemetry.io/otel/trace v1.14.0
 	go.uber.org/dig v1.16.1
@@ -208,8 +203,13 @@ require (
 	go.opentelemetry.io/contrib/propagators/b3 v1.15.0 // indirect
 	go.opentelemetry.io/contrib/propagators/jaeger v1.15.0 // indirect
 	go.opentelemetry.io/contrib/propagators/ot v1.15.0 // indirect
+	go.opentelemetry.io/otel/exporters/jaeger v1.14.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/zipkin v1.14.0 // indirect
 	go.opentelemetry.io/otel/metric v0.37.0 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
diff --git a/go.sum b/go.sum
index c623a9d4d..90cd6eb79 100644
--- a/go.sum
+++ b/go.sum
@@ -356,8 +356,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
-github.com/ipfs/boxo v0.8.0 h1:UdjAJmHzQHo/j3g3b1bAcAXCj/GM6iTwvSlBDvPBNBs=
-github.com/ipfs/boxo v0.8.0/go.mod h1:RIsi4CnTyQ7AUsNn5gXljJYZlQrHBMnJp94p73liFiA=
+github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e h1:8wmBhjwJk2drWZjNwoN7uc+IkG+N93laIhjY69rjMqw=
+github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e/go.mod h1:xJ2hVb4La5WyD7GvKYE0lq2g1rmQZoCD2K4WNrV6aZI=
 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
diff --git a/tracing/file_exporter.go b/tracing/file_exporter.go
deleted file mode 100644
index 32ca20ee2..000000000
--- a/tracing/file_exporter.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package tracing
-
-import (
-	"context"
-	"fmt"
-	"os"
-
-	"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
-	"go.opentelemetry.io/otel/sdk/trace"
-)
-
-// fileExporter wraps a file-writing exporter and closes the file when the exporter is shutdown.
-type fileExporter struct {
-	file           *os.File
-	writerExporter *stdouttrace.Exporter
-}
-
-func newFileExporter(file string) (*fileExporter, error) {
-	f, err := os.OpenFile(file, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
-	if err != nil {
-		return nil, fmt.Errorf("opening '%s' for OpenTelemetry file exporter: %w", file, err)
-	}
-	stdoutExporter, err := stdouttrace.New(stdouttrace.WithWriter(f))
-	if err != nil {
-		return nil, err
-	}
-	return &fileExporter{
-		writerExporter: stdoutExporter,
-		file:           f,
-	}, nil
-}
-
-func (e *fileExporter) ExportSpans(ctx context.Context, spans []trace.ReadOnlySpan) error {
-	return e.writerExporter.ExportSpans(ctx, spans)
-}
-
-func (e *fileExporter) Shutdown(ctx context.Context) error {
-	if err := e.writerExporter.Shutdown(ctx); err != nil {
-		return err
-	}
-	if err := e.file.Close(); err != nil {
-		return fmt.Errorf("closing trace file: %w", err)
-	}
-	return nil
-}
diff --git a/tracing/tracing.go b/tracing/tracing.go
index b22930a6f..8fd898d7b 100644
--- a/tracing/tracing.go
+++ b/tracing/tracing.go
@@ -3,16 +3,10 @@ package tracing
 import (
 	"context"
 	"fmt"
-	"os"
-	"path"
-	"strings"
 
+	"github.com/ipfs/boxo/tracing"
 	version "github.com/ipfs/kubo"
 	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/exporters/jaeger"
-	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
-	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
-	"go.opentelemetry.io/otel/exporters/zipkin"
 	"go.opentelemetry.io/otel/sdk/resource"
 	"go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
@@ -33,87 +27,9 @@ type noopShutdownTracerProvider struct{ traceapi.TracerProvider }
 
 func (n *noopShutdownTracerProvider) Shutdown(ctx context.Context) error { return nil }
 
-func buildExporters(ctx context.Context) ([]trace.SpanExporter, error) {
-	// These env vars are standardized but not yet supported by opentelemetry-go.
-	// Once supported, we can remove most of this code.
-	//
-	// Specs:
-	// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/sdk-environment-variables.md#exporter-selection
-	// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md
-	var exporters []trace.SpanExporter
-	for _, exporterStr := range strings.Split(os.Getenv("OTEL_TRACES_EXPORTER"), ",") {
-		switch exporterStr {
-		case "otlp":
-			protocol := "http/protobuf"
-			if v := os.Getenv("OTEL_EXPORTER_OTLP_PROTOCOL"); v != "" {
-				protocol = v
-			}
-			if v := os.Getenv("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL"); v != "" {
-				protocol = v
-			}
-
-			switch protocol {
-			case "http/protobuf":
-				exporter, err := otlptracehttp.New(ctx)
-				if err != nil {
-					return nil, fmt.Errorf("building OTLP HTTP exporter: %w", err)
-				}
-				exporters = append(exporters, exporter)
-			case "grpc":
-				exporter, err := otlptracegrpc.New(ctx)
-				if err != nil {
-					return nil, fmt.Errorf("building OTLP gRPC exporter: %w", err)
-				}
-				exporters = append(exporters, exporter)
-			default:
-				return nil, fmt.Errorf("unknown or unsupported OTLP exporter '%s'", exporterStr)
-			}
-		case "jaeger":
-			exporter, err := jaeger.New(jaeger.WithCollectorEndpoint())
-			if err != nil {
-				return nil, fmt.Errorf("building Jaeger exporter: %w", err)
-			}
-			exporters = append(exporters, exporter)
-		case "zipkin":
-			exporter, err := zipkin.New("")
-			if err != nil {
-				return nil, fmt.Errorf("building Zipkin exporter: %w", err)
-			}
-			exporters = append(exporters, exporter)
-		case "file":
-			// This is not part of the spec, but provided for convenience
-			// so that you don't have to setup a collector,
-			// and because we don't support the stdout exporter.
-			filePath := os.Getenv("OTEL_EXPORTER_FILE_PATH")
-			if filePath == "" {
-				cwd, err := os.Getwd()
-				if err != nil {
-					return nil, fmt.Errorf("finding working directory for the OpenTelemetry file exporter: %w", err)
-				}
-				filePath = path.Join(cwd, "traces.json")
-			}
-			exporter, err := newFileExporter(filePath)
-			if err != nil {
-				return nil, err
-			}
-			exporters = append(exporters, exporter)
-		case "none":
-			continue
-		case "":
-			continue
-		case "stdout":
-			// stdout is already used for certain kinds of logging, so we don't support this
-			fallthrough
-		default:
-			return nil, fmt.Errorf("unknown or unsupported exporter '%s'", exporterStr)
-		}
-	}
-	return exporters, nil
-}
-
 // NewTracerProvider creates and configures a TracerProvider.
 func NewTracerProvider(ctx context.Context) (shutdownTracerProvider, error) {
-	exporters, err := buildExporters(ctx)
+	exporters, err := tracing.NewSpanExporters(ctx)
 	if err != nil {
 		return nil, err
 	}

From 3a15a0fc550b1307cf54ef6ea5606fbe1bf72410 Mon Sep 17 00:00:00 2001
From: Gus Eggert <gus@gus.dev>
Date: Wed, 12 Apr 2023 03:03:11 -0400
Subject: [PATCH 05/17] test: fix Docker tests in GH Actions (#9812)

GH Actions recently changed their Docker build implementation and it
has a different output than previously, causing the tests that parse
its output to fail.

This switches the test to not parse Docker build output. The parsing
was used to extract the image ID while still showing logs. A better
way to show logs and still know the image ID is to tag it, which is
what this now does.

This also renames the Docker tests so that they run earlier. This
takes better advantage of the fact that the sharness tests are run in
parallel. Since the Docker test are quite long, and are at the end of
the list, the test runner is not running other tests in parallel while
the Docker tests are running.
---
 test/ipfs-test-lib.sh                            | 12 ++++++------
 ...300-docker-image.sh => t0002-docker-image.sh} | 16 +++++-----------
 ...docker-migrate.sh => t0003-docker-migrate.sh} |  9 ++++-----
 3 files changed, 15 insertions(+), 22 deletions(-)
 rename test/sharness/{t0300-docker-image.sh => t0002-docker-image.sh} (87%)
 rename test/sharness/{t0301-docker-migrate.sh => t0003-docker-migrate.sh} (92%)

diff --git a/test/ipfs-test-lib.sh b/test/ipfs-test-lib.sh
index eabf17020..a3bc32bbb 100644
--- a/test/ipfs-test-lib.sh
+++ b/test/ipfs-test-lib.sh
@@ -50,19 +50,19 @@ test_path_cmp() {
 
 # Docker
 
-# This takes a Dockerfile, and a build context directory
+# This takes a Dockerfile, a tag name, and a build context directory
 docker_build() {
-    docker build --rm -f "$1" "$2" | ansi_strip
+    docker build --rm --tag "$1" --file "$2" "$3" | ansi_strip
 }
 
 # This takes an image as argument and writes a docker ID on stdout
 docker_run() {
-    docker run -d "$1"
+    docker run --detach "$1"
 }
 
 # This takes a docker ID and a command as arguments
 docker_exec() {
-    docker exec -t "$1" /bin/sh -c "$2"
+    docker exec --tty "$1" /bin/sh -c "$2"
 }
 
 # This takes a docker ID as argument
@@ -72,12 +72,12 @@ docker_stop() {
 
 # This takes a docker ID as argument
 docker_rm() {
-    docker rm -f -v "$1" > /dev/null
+    docker rm --force --volumes "$1" > /dev/null
 }
 
 # This takes a docker image name as argument
 docker_rmi() {
-    docker rmi -f "$1" > /dev/null
+    docker rmi --force "$1" > /dev/null
 }
 
 # Test whether all the expected lines are included in a file. The file
diff --git a/test/sharness/t0300-docker-image.sh b/test/sharness/t0002-docker-image.sh
similarity index 87%
rename from test/sharness/t0300-docker-image.sh
rename to test/sharness/t0002-docker-image.sh
index 3c390a453..11ccf01b7 100755
--- a/test/sharness/t0300-docker-image.sh
+++ b/test/sharness/t0002-docker-image.sh
@@ -27,18 +27,12 @@ TEST_TRASH_DIR=$(pwd)
 TEST_SCRIPTS_DIR=$(dirname "$TEST_TRASH_DIR")
 TEST_TESTS_DIR=$(dirname "$TEST_SCRIPTS_DIR")
 APP_ROOT_DIR=$(dirname "$TEST_TESTS_DIR")
+IMAGE_TAG=kubo_test
 
 test_expect_success "docker image build succeeds" '
-  docker_build "$TEST_TESTS_DIR/../Dockerfile" "$APP_ROOT_DIR" | tee build-actual ||
+  docker_build "$IMAGE_TAG" "$TEST_TESTS_DIR/../Dockerfile" "$APP_ROOT_DIR" ||
   test_fsh echo "TEST_TESTS_DIR: $TEST_TESTS_DIR" ||
-  test_fsh echo "APP_ROOT_DIR : $APP_ROOT_DIR" ||
-  test_fsh cat build-actual
-'
-
-test_expect_success "docker image build output looks good" '
-  SUCCESS_LINE=$(egrep "^Successfully built" build-actual) &&
-  IMAGE_ID=$(expr "$SUCCESS_LINE" : "^Successfully built \(.*\)") ||
-  test_fsh cat build-actual
+  test_fsh echo "APP_ROOT_DIR : $APP_ROOT_DIR"
 '
 
 test_expect_success "write init scripts" '
@@ -52,7 +46,7 @@ test_expect_success "docker image runs" '
                   -p 127.0.0.1:5001:5001 -p 127.0.0.1:8080:8080 \
                   -v "$PWD/001.sh":/container-init.d/001.sh \
                   -v "$PWD/002.sh":/container-init.d/002.sh \
-                  "$IMAGE_ID")
+                  "$IMAGE_TAG")
 '
 
 test_expect_success "docker container gateway is up" '
@@ -100,5 +94,5 @@ test_expect_success "stop docker container" '
 '
 
 docker_rm "$DOC_ID"
-docker_rmi "$IMAGE_ID"
+docker_rmi "$IMAGE_TAG"
 test_done
diff --git a/test/sharness/t0301-docker-migrate.sh b/test/sharness/t0003-docker-migrate.sh
similarity index 92%
rename from test/sharness/t0301-docker-migrate.sh
rename to test/sharness/t0003-docker-migrate.sh
index 3f7d32f21..ac3c7aee2 100755
--- a/test/sharness/t0301-docker-migrate.sh
+++ b/test/sharness/t0003-docker-migrate.sh
@@ -24,10 +24,10 @@ TEST_TRASH_DIR=$(pwd)
 TEST_SCRIPTS_DIR=$(dirname "$TEST_TRASH_DIR")
 TEST_TESTS_DIR=$(dirname "$TEST_SCRIPTS_DIR")
 APP_ROOT_DIR=$(dirname "$TEST_TESTS_DIR")
+IMAGE_TAG=kubo_migrate
 
 test_expect_success "docker image build succeeds" '
-  docker_build "$TEST_TESTS_DIR/../Dockerfile" "$APP_ROOT_DIR" >actual &&
-  IMAGE_ID=$(tail -n1 actual | cut -d " " -f 3)
+  docker_build "$IMAGE_TAG" "$TEST_TESTS_DIR/../Dockerfile" "$APP_ROOT_DIR"
 '
 
 test_init_ipfs
@@ -53,7 +53,7 @@ test_expect_success "startup fake dists server" '
 '
 
 test_expect_success "docker image runs" '
-  DOC_ID=$(docker run -d -v "$IPFS_PATH":/data/ipfs --net=host "$IMAGE_ID")
+  DOC_ID=$(docker run -d -v "$IPFS_PATH":/data/ipfs --net=host "$IMAGE_TAG")
 '
 
 test_expect_success "docker container tries to pull migrations from netcat" '
@@ -78,6 +78,5 @@ test_expect_success "correct version was requested" '
 '
 
 docker_rm "$DOC_ID"
-docker_rmi "$IMAGE_ID"
+docker_rmi "$IMAGE_TAG"
 test_done
-

From 0d38c369fda56d19e7d8c023ca1d4595c5bd52dc Mon Sep 17 00:00:00 2001
From: Steve Loeppky <biglep@protocol.ai>
Date: Thu, 13 Apr 2023 06:59:08 -0700
Subject: [PATCH 06/17] docs: preparing 0.20 changelog for release (#9799)

Co-authored-by: Gus Eggert <gus@gus.dev>
Co-authored-by: Marcin Rataj <lidel@lidel.org>
Co-authored-by: Henrique Dias <hacdias@gmail.com>
---
 docs/changelogs/v0.20.md | 98 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/docs/changelogs/v0.20.md b/docs/changelogs/v0.20.md
index c1c3e9639..9809d4703 100644
--- a/docs/changelogs/v0.20.md
+++ b/docs/changelogs/v0.20.md
@@ -6,6 +6,13 @@
 
 - [Overview](#overview)
 - [🔦 Highlights](#-highlights)
+  - [Boxo under the covers](#boxo-under-the-covers)
+  - [HTTP Gateway](#http-gateway)
+    - [Switch to `boxo/gateway` library](#switch-to-boxogateway-library)
+    - [Improved testing](#improved-testing)
+    - [Trace Context support](#trace-context-support)
+    - [Removed legacy features](#removed-legacy-features)
+  - [`--empty-repo` is now the default](#--empty-repo-is-now-the-default)
 - [📝 Changelog](#-changelog)
 - [👨‍👩‍👧‍👦 Contributors](#-contributors)
 
@@ -13,6 +20,97 @@
 
 ### 🔦 Highlights
 
+#### Boxo under the covers
+We have consolidated many IPFS repos into [Boxo](https://github.com/ipfs/boxo), and this release switches Kubo over to use Boxo instead of those repos, resulting in the removal of 27 dependencies from Kubo:
+
+- github.com/ipfs/go-bitswap
+- github.com/ipfs/go-ipfs-files
+- github.com/ipfs/tar-utils
+- gihtub.com/ipfs/go-block-format
+- github.com/ipfs/interface-go-ipfs-core
+- github.com/ipfs/go-unixfs
+- github.com/ipfs/go-pinning-service-http-client
+- github.com/ipfs/go-path
+- github.com/ipfs/go-namesys
+- github.com/ipfs/go-mfs
+- github.com/ipfs/go-ipfs-provider
+- github.com/ipfs/go-ipfs-pinner
+- github.com/ipfs/go-ipfs-keystore
+- github.com/ipfs/go-filestore
+- github.com/ipfs/go-ipns
+- github.com/ipfs/go-blockservice
+- github.com/ipfs/go-ipfs-chunker
+- github.com/ipfs/go-fetcher
+- github.com/ipfs/go-ipfs-blockstore
+- github.com/ipfs/go-ipfs-posinfo
+- github.com/ipfs/go-ipfs-util
+- github.com/ipfs/go-ipfs-ds-help
+- github.com/ipfs/go-verifcid
+- github.com/ipfs/go-ipfs-exchange-offline
+- github.com/ipfs/go-ipfs-routing
+- github.com/ipfs/go-ipfs-exchange-interface
+- github.com/ipfs/go-libipfs
+
+Note: if you consume these in your own code, we recommend migrating to Boxo. To ease this process, there's a [tool which will help migrate your code to Boxo](https://github.com/ipfs/boxo#migrating-to-box).
+
+You can learn more about the [Boxo 0.8 release](https://github.com/ipfs/boxo/releases/tag/v0.8.0) that Kubo now depends and the general effort to get Boxo to be a stable foundation [here](https://github.com/ipfs/boxo/issues/196).
+
+#### HTTP Gateway
+
+##### Switch to `boxo/gateway` library
+
+Gateway code was extracted and refactored into a standalone library that now
+lives in [boxo/gateway](https://github.com/ipfs/boxo/tree/main/gateway). This
+enabled us to clean up some legacy code and remove dependency on Kubo
+internals.
+
+The GO API is still being refined, but now operates on higher level abstraction
+defined by `gateway.IPFSBackend` interface.  It is now possible to embed
+gateway functionality without the rest of Kubo.
+
+See the [car](https://github.com/ipfs/boxo/tree/main/examples/gateway/car)
+and [proxy](https://github.com/ipfs/boxo/tree/main/examples/gateway/proxy)
+examples, or more advanced
+[bifrost-gateway](https://github.com/ipfs/bifrost-gateway).
+
+##### Improved testing
+
+We are also in the progress of moving away from gateway testing being based on
+Kubo sharness tests, and are working on
+[ipfs/gateway-conformance](https://github.com/ipfs/gateway-conformance) test
+suite that is vendor agnostic and can be run against arbitrary HTTP endpoint to
+test specific subset of [HTTP Gateways specifications](https://specs.ipfs.tech/http-gateways/).
+
+##### Trace Context support
+
+We've introduced initial support for `traceparent` header from [W3C's Trace
+Context spec](https://w3c.github.io/trace-context/).
+
+If `traceparent` header is
+present in the gateway request, one can use its `trace-id` part to inspect
+trace spans via selected exporter such as Jaeger UI
+([docs](https://github.com/ipfs/boxo/blob/main/docs/tracing.md#using-jaeger-ui),
+[demo](https://user-images.githubusercontent.com/157609/231312374-bafc2035-1fc6-4d6b-901b-9e4af039807c.png)).
+
+To learn more, see [tracing docs](https://github.com/ipfs/boxo/blob/main/docs/tracing.md).
+
+##### Removed legacy features
+
+- Some Kubo-specific prometheus metrics are no longer available.
+  - An up-to-date list of gateway metrics can be found in [boxo/gateway/metrics.go](https://github.com/ipfs/boxo/blob/main/gateway/metrics.go).
+- The legacy opt-in `Gateway.Writable` is no longer available as of Kubo 0.20.
+  - We are working on developing a modern replacement.
+    To support our efforts, please leave a comment describing your use case in
+    [ipfs/specs#375](https://github.com/ipfs/specs/issues/375).
+
+#### `--empty-repo` is now the default
+
+When creating a repository with `ipfs init`, `--empty-repo=true` is now the default. This means
+that your repository will be empty by default instead of containing the introduction files.
+You can read more about the rationale behind this decision on the [tracking issue](https://github.com/ipfs/kubo/issues/9757).
+
 ### 📝 Changelog
 
 ### 👨‍👩‍👧‍👦 Contributors
+
+

From 78895a11848a9ddab05231b7cbde99b406f1a01c Mon Sep 17 00:00:00 2001
From: Marco Munizaga <git@marcopolo.io>
Date: Fri, 14 Apr 2023 02:09:51 -0700
Subject: [PATCH 07/17] deps: bump go-libp2p to v0.27.1 (#9816)

Co-authored-by: Jorropo <jorropo.pgm@gmail.com>
---
 docs/examples/kubo-as-a-library/go.mod | 2 +-
 docs/examples/kubo-as-a-library/go.sum | 4 ++--
 go.mod                                 | 2 +-
 go.sum                                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/examples/kubo-as-a-library/go.mod b/docs/examples/kubo-as-a-library/go.mod
index 345f97f3f..e61559247 100644
--- a/docs/examples/kubo-as-a-library/go.mod
+++ b/docs/examples/kubo-as-a-library/go.mod
@@ -9,7 +9,7 @@ replace github.com/ipfs/kubo => ./../../..
 require (
 	github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e
 	github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
-	github.com/libp2p/go-libp2p v0.27.0
+	github.com/libp2p/go-libp2p v0.27.1
 	github.com/multiformats/go-multiaddr v0.9.0
 )
 
diff --git a/docs/examples/kubo-as-a-library/go.sum b/docs/examples/kubo-as-a-library/go.sum
index 755f9aceb..643c6ace0 100644
--- a/docs/examples/kubo-as-a-library/go.sum
+++ b/docs/examples/kubo-as-a-library/go.sum
@@ -489,8 +489,8 @@ github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZ
 github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
 github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=
 github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro=
-github.com/libp2p/go-libp2p v0.27.0 h1:QbhrTuB0ln9j9op6yAOR0o+cx/qa9NyNZ5ov0Tql8ZU=
-github.com/libp2p/go-libp2p v0.27.0/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
+github.com/libp2p/go-libp2p v0.27.1 h1:k1u6RHsX3hqKnslDjsSgLNURxJ3O1atIZCY4gpMbbus=
+github.com/libp2p/go-libp2p v0.27.1/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
 github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s=
 github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
 github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=
diff --git a/go.mod b/go.mod
index 115bd5749..a7737edef 100644
--- a/go.mod
+++ b/go.mod
@@ -45,7 +45,7 @@ require (
 	github.com/jbenet/goprocess v0.1.4
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/libp2p/go-doh-resolver v0.4.0
-	github.com/libp2p/go-libp2p v0.27.0
+	github.com/libp2p/go-libp2p v0.27.1
 	github.com/libp2p/go-libp2p-http v0.5.0
 	github.com/libp2p/go-libp2p-kad-dht v0.23.0
 	github.com/libp2p/go-libp2p-kbucket v0.5.0
diff --git a/go.sum b/go.sum
index 90cd6eb79..e060b4e25 100644
--- a/go.sum
+++ b/go.sum
@@ -540,8 +540,8 @@ github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZ
 github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
 github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=
 github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro=
-github.com/libp2p/go-libp2p v0.27.0 h1:QbhrTuB0ln9j9op6yAOR0o+cx/qa9NyNZ5ov0Tql8ZU=
-github.com/libp2p/go-libp2p v0.27.0/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
+github.com/libp2p/go-libp2p v0.27.1 h1:k1u6RHsX3hqKnslDjsSgLNURxJ3O1atIZCY4gpMbbus=
+github.com/libp2p/go-libp2p v0.27.1/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
 github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s=
 github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
 github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=

From f812f82574964322ee6a79ba76e4f2be25bb8edc Mon Sep 17 00:00:00 2001
From: Piotr Galar <piotr.galar@gmail.com>
Date: Mon, 24 Apr 2023 09:44:27 +0200
Subject: [PATCH 08/17] ci: update apt before installing deps (#9831)

---
 .github/workflows/build.yml    | 1 -
 .github/workflows/sharness.yml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 50889613b..1f16d9bf3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -148,7 +148,6 @@ jobs:
         with:
           repository: ipfs/go-ipfs-http-client
           path: go-ipfs-http-client
-          ref: bump-for-rcmgr-last-push
       - uses: protocol/cache-go-action@v1
         with:
           name: ${{ github.job }}
diff --git a/.github/workflows/sharness.yml b/.github/workflows/sharness.yml
index 012a6a982..2d9dfb41d 100644
--- a/.github/workflows/sharness.yml
+++ b/.github/workflows/sharness.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           path: kubo
       - name: Install missing tools
-        run: sudo apt install -y socat net-tools fish libxml2-utils
+        run: sudo apt update && sudo apt install -y socat net-tools fish libxml2-utils
       - name: Restore Go Cache
         uses: protocol/cache-go-action@v1
         with:

From 366546aae23bf4f673377b1e2a915bc71a177dfd Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Tue, 25 Apr 2023 09:55:40 +0200
Subject: [PATCH 09/17] docs: add `ipfs pubsub` deprecation reminder to
 changelog (#9827)

---
 docs/changelogs/v0.20.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/changelogs/v0.20.md b/docs/changelogs/v0.20.md
index 9809d4703..590ef5453 100644
--- a/docs/changelogs/v0.20.md
+++ b/docs/changelogs/v0.20.md
@@ -13,6 +13,7 @@
     - [Trace Context support](#trace-context-support)
     - [Removed legacy features](#removed-legacy-features)
   - [`--empty-repo` is now the default](#--empty-repo-is-now-the-default)
+  - [Reminder: `ipfs pubsub` commands and matching HTTP endpoints are deprecated and will be removed](#reminder-ipfs-pubsub-commands-and-matching-http-endpoints-are-deprecated-and-will-be-removed)
 - [📝 Changelog](#-changelog)
 - [👨‍👩‍👧‍👦 Contributors](#-contributors)
 
@@ -109,6 +110,10 @@ When creating a repository with `ipfs init`, `--empty-repo=true` is now the defa
 that your repository will be empty by default instead of containing the introduction files.
 You can read more about the rationale behind this decision on the [tracking issue](https://github.com/ipfs/kubo/issues/9757).
 
+#### Reminder: `ipfs pubsub` commands and matching HTTP endpoints are deprecated and will be removed
+
+`ipfs pubsub` commands and all `/api/v0/pubsub/` RPC endpoints and will be removed in the next release. For more information and rational see [#9717](https://github.com/ipfs/kubo/issues/9717).
+
 ### 📝 Changelog
 
 ### 👨‍👩‍👧‍👦 Contributors

From e4908a01633582e205b26ab36769830fe8490c10 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Tue, 25 Apr 2023 10:47:28 +0200
Subject: [PATCH 10/17] chore: bump to boxo 0.8.1 (#9836)

---
 docs/examples/kubo-as-a-library/go.mod | 2 +-
 docs/examples/kubo-as-a-library/go.sum | 4 ++--
 go.mod                                 | 2 +-
 go.sum                                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/examples/kubo-as-a-library/go.mod b/docs/examples/kubo-as-a-library/go.mod
index e61559247..6eb1bcb5e 100644
--- a/docs/examples/kubo-as-a-library/go.mod
+++ b/docs/examples/kubo-as-a-library/go.mod
@@ -7,7 +7,7 @@ go 1.18
 replace github.com/ipfs/kubo => ./../../..
 
 require (
-	github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e
+	github.com/ipfs/boxo v0.8.1
 	github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
 	github.com/libp2p/go-libp2p v0.27.1
 	github.com/multiformats/go-multiaddr v0.9.0
diff --git a/docs/examples/kubo-as-a-library/go.sum b/docs/examples/kubo-as-a-library/go.sum
index 643c6ace0..2302548a9 100644
--- a/docs/examples/kubo-as-a-library/go.sum
+++ b/docs/examples/kubo-as-a-library/go.sum
@@ -321,8 +321,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
-github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e h1:8wmBhjwJk2drWZjNwoN7uc+IkG+N93laIhjY69rjMqw=
-github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e/go.mod h1:xJ2hVb4La5WyD7GvKYE0lq2g1rmQZoCD2K4WNrV6aZI=
+github.com/ipfs/boxo v0.8.1 h1:3DkKBCK+3rdEB5t77WDShUXXhktYwH99mkAsgajsKrU=
+github.com/ipfs/boxo v0.8.1/go.mod h1:xJ2hVb4La5WyD7GvKYE0lq2g1rmQZoCD2K4WNrV6aZI=
 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
diff --git a/go.mod b/go.mod
index a7737edef..b83143f9b 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e
+	github.com/ipfs/boxo v0.8.1
 	github.com/ipfs/go-block-format v0.1.2
 	github.com/ipfs/go-cid v0.4.1
 	github.com/ipfs/go-cidutil v0.1.0
diff --git a/go.sum b/go.sum
index e060b4e25..b00e5aed6 100644
--- a/go.sum
+++ b/go.sum
@@ -356,8 +356,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
-github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e h1:8wmBhjwJk2drWZjNwoN7uc+IkG+N93laIhjY69rjMqw=
-github.com/ipfs/boxo v0.8.1-0.20230411232920-5d6c73c8e35e/go.mod h1:xJ2hVb4La5WyD7GvKYE0lq2g1rmQZoCD2K4WNrV6aZI=
+github.com/ipfs/boxo v0.8.1 h1:3DkKBCK+3rdEB5t77WDShUXXhktYwH99mkAsgajsKrU=
+github.com/ipfs/boxo v0.8.1/go.mod h1:xJ2hVb4La5WyD7GvKYE0lq2g1rmQZoCD2K4WNrV6aZI=
 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=

From 4ca36c41b63f2ad62ebc0e5d7d207c9ad4816d94 Mon Sep 17 00:00:00 2001
From: Gus Eggert <gus@gus.dev>
Date: Mon, 1 May 2023 15:29:34 -0400
Subject: [PATCH 11/17] fix: use default HTTP routers when FullRT DHT client is
 used (#9841)

---
 cmd/ipfs/daemon.go             | 14 ++-------
 core/node/groups.go            |  2 +-
 core/node/libp2p/routing.go    | 47 ++++++++++++++++++-----------
 core/node/libp2p/routingopt.go | 55 ++++++++++++++++++++--------------
 4 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go
index ffcb30a34..1e03a8264 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 0b1660265..ae8ce8539 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 f96f772e1..2e356e447 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 1d47ae273..b363f25b7 100644
--- a/core/node/libp2p/routingopt.go
+++ b/core/node/libp2p/routingopt.go
@@ -43,8 +43,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) RoutingOption {
+func ConstructDefaultRouting(cfg *config.Config, routingOpt RoutingOption) RoutingOption {
 	return func(args RoutingOptionArgs) (routing.Routing, error) {
 		// Defined routers will be queried in parallel (optimizing for response speed)
 		// Different trade-offs can be made by setting Routing.Type = "custom" with own Routing.Routers
@@ -60,29 +87,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
 	}

From 53821c202f14df2116459ba8729d61248342e15a Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Tue, 2 May 2023 04:16:52 -0700
Subject: [PATCH 12/17] feat: webui@3.0.0 (#9835)

---
 core/corehttp/webui.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/corehttp/webui.go b/core/corehttp/webui.go
index f7b27c939..9b7cf776d 100644
--- a/core/corehttp/webui.go
+++ b/core/corehttp/webui.go
@@ -1,11 +1,12 @@
 package corehttp
 
 // TODO: move to IPNS
-const WebUIPath = "/ipfs/bafybeifeqt7mvxaniphyu2i3qhovjaf3sayooxbh5enfdqtiehxjv2ldte" // v2.22.0
+const WebUIPath = "/ipfs/bafybeic4gops3d3lyrisqku37uio33nvt6fqxvkxihrwlqsuvf76yln4fm" // v3.0.0
 
 // WebUIPaths is a list of all past webUI paths.
 var WebUIPaths = []string{
 	WebUIPath,
+	"/ipfs/bafybeifeqt7mvxaniphyu2i3qhovjaf3sayooxbh5enfdqtiehxjv2ldte",
 	"/ipfs/bafybeiequgo72mrvuml56j4gk7crewig5bavumrrzhkqbim6b3s2yqi7ty",
 	"/ipfs/bafybeibjbq3tmmy7wuihhhwvbladjsd3gx3kfjepxzkq6wylik6wc3whzy",
 	"/ipfs/bafybeiavrvt53fks6u32n5p2morgblcmck4bh4ymf4rrwu7ah5zsykmqqa",

From a6f446a4bab78b3d8b814474f1532f7bebcdc9c1 Mon Sep 17 00:00:00 2001
From: Laurent Senta <laurent@singulargarden.com>
Date: Wed, 3 May 2023 15:01:13 +0200
Subject: [PATCH 13/17] test: deterministic ipns fixtures during sharness
 gateway tests (#9667)

---
 core/commands/routing.go                      |  34 ++++++---
 core/coreapi/routing.go                       |  13 +++-
 core/coreapi/test/api_test.go                 |  22 +++---
 core/coreapi/test/path_test.go                |   2 +-
 docs/examples/kubo-as-a-library/go.mod        |   2 +-
 docs/examples/kubo-as-a-library/go.sum        |   4 +-
 go.mod                                        |   2 +-
 go.sum                                        |   4 +-
 test/sharness/t0114-gateway-subdomains.sh     |  50 +++++---------
 ...XSZpdHs7oHbXub2G5WC8Tx4NQhyd2d.ipns-record | Bin 0 -> 394 bytes
 ...8itnGufN7MEtPRCNHkKpNuA4onsRa3.ipns-record | Bin 0 -> 1082 bytes
 .../t0114-gateway-subdomains/README.md        |  65 ++++++++++++++++--
 test/sharness/t0116-gateway-cache.sh          |  18 ++---
 test/sharness/t0116-gateway-cache/README.md   |  20 ++++--
 ...p32iwm9pdt9nq3y5rpn3ln9j12zfhe.ipns-record | Bin 0 -> 394 bytes
 test/sharness/t0123-gateway-json-cbor.sh      |  22 +++---
 .../t0123-gateway-json-cbor/README.md         |  24 ++++++-
 ...xckoqzwqeqwudfr74kfd11zcyk3b7l.ipns-record | Bin 0 -> 394 bytes
 ...e2z4pwgp15pgv3ho1azvidttzh8yy2.ipns-record | Bin 0 -> 398 bytes
 test/sharness/t0124-gateway-ipns-record.sh    |  16 +++--
 .../t0124-gateway-ipns-record/README.md       |  27 ++++++++
 .../t0124-gateway-ipns-record/fixtures.car    | Bin 0 -> 107 bytes
 ...i88nsady6qgd1dhjcyfsaqmpp143ab.ipns-record | Bin 0 -> 392 bytes
 23 files changed, 224 insertions(+), 101 deletions(-)
 create mode 100644 test/sharness/t0114-gateway-subdomains/12D3KooWLQzUv2FHWGVPXTXSZpdHs7oHbXub2G5WC8Tx4NQhyd2d.ipns-record
 create mode 100644 test/sharness/t0114-gateway-subdomains/QmVujd5Vb7moysJj8itnGufN7MEtPRCNHkKpNuA4onsRa3.ipns-record
 create mode 100644 test/sharness/t0116-gateway-cache/k51qzi5uqu5dlxdsdu5fpuu7h69wu4ohp32iwm9pdt9nq3y5rpn3ln9j12zfhe.ipns-record
 create mode 100644 test/sharness/t0123-gateway-json-cbor/k51qzi5uqu5dghjous0agrwavl8vzl64xckoqzwqeqwudfr74kfd11zcyk3b7l.ipns-record
 create mode 100644 test/sharness/t0123-gateway-json-cbor/k51qzi5uqu5dhjghbwdvbo6mi40htrq6e2z4pwgp15pgv3ho1azvidttzh8yy2.ipns-record
 create mode 100644 test/sharness/t0124-gateway-ipns-record/README.md
 create mode 100644 test/sharness/t0124-gateway-ipns-record/fixtures.car
 create mode 100644 test/sharness/t0124-gateway-ipns-record/k51qzi5uqu5dh71qgwangrt6r0nd4094i88nsady6qgd1dhjcyfsaqmpp143ab.ipns-record

diff --git a/core/commands/routing.go b/core/commands/routing.go
index 2d578fcb6..76672c6f2 100644
--- a/core/commands/routing.go
+++ b/core/commands/routing.go
@@ -10,6 +10,8 @@ import (
 
 	cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
 
+	iface "github.com/ipfs/boxo/coreiface"
+	"github.com/ipfs/boxo/coreiface/options"
 	dag "github.com/ipfs/boxo/ipld/merkledag"
 	path "github.com/ipfs/boxo/path"
 	cid "github.com/ipfs/go-cid"
@@ -19,6 +21,16 @@ import (
 	routing "github.com/libp2p/go-libp2p/core/routing"
 )
 
+var (
+	errAllowOffline = errors.New("can't put while offline: pass `--allow-offline` to override")
+)
+
+const (
+	dhtVerboseOptionName   = "verbose"
+	numProvidersOptionName = "num-providers"
+	allowOfflineOptionName = "allow-offline"
+)
+
 var RoutingCmd = &cmds.Command{
 	Helptext: cmds.HelpText{
 		Tagline:          "Issue routing commands.",
@@ -34,14 +46,6 @@ var RoutingCmd = &cmds.Command{
 	},
 }
 
-const (
-	dhtVerboseOptionName = "verbose"
-)
-
-const (
-	numProvidersOptionName = "num-providers"
-)
-
 var findProvidersRoutingCmd = &cmds.Command{
 	Helptext: cmds.HelpText{
 		Tagline:          "Find peers that can provide a specific value, given a key.",
@@ -420,6 +424,9 @@ identified by QmFoo.
 		cmds.StringArg("key", true, false, "The key to store the value at."),
 		cmds.FileArg("value-file", true, false, "A path to a file containing the value to store.").EnableStdin(),
 	},
+	Options: []cmds.Option{
+		cmds.BoolOption(allowOfflineOptionName, "When offline, save the IPNS record to the the local datastore without broadcasting to the network instead of simply failing."),
+	},
 	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
 		api, err := cmdenv.GetApi(env, req)
 		if err != nil {
@@ -437,13 +444,22 @@ identified by QmFoo.
 			return err
 		}
 
-		err = api.Routing().Put(req.Context, req.Arguments[0], data)
+		allowOffline, _ := req.Options[allowOfflineOptionName].(bool)
+
+		opts := []options.RoutingPutOption{
+			options.Put.AllowOffline(allowOffline),
+		}
+
+		err = api.Routing().Put(req.Context, req.Arguments[0], data, opts...)
 		if err != nil {
 			return err
 		}
 
 		id, err := api.Key().Self(req.Context)
 		if err != nil {
+			if err == iface.ErrOffline {
+				err = errAllowOffline
+			}
 			return err
 		}
 
diff --git a/core/coreapi/routing.go b/core/coreapi/routing.go
index 76d969316..95b50aa63 100644
--- a/core/coreapi/routing.go
+++ b/core/coreapi/routing.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 
 	coreiface "github.com/ipfs/boxo/coreiface"
+	caopts "github.com/ipfs/boxo/coreiface/options"
 	"github.com/ipfs/boxo/path"
 	peer "github.com/libp2p/go-libp2p/core/peer"
 )
@@ -24,9 +25,15 @@ func (r *RoutingAPI) Get(ctx context.Context, key string) ([]byte, error) {
 	return r.routing.GetValue(ctx, dhtKey)
 }
 
-func (r *RoutingAPI) Put(ctx context.Context, key string, value []byte) error {
-	if !r.nd.IsOnline {
-		return coreiface.ErrOffline
+func (r *RoutingAPI) Put(ctx context.Context, key string, value []byte, opts ...caopts.RoutingPutOption) error {
+	options, err := caopts.RoutingPutOptions(opts...)
+	if err != nil {
+		return err
+	}
+
+	err = r.checkOnline(options.AllowOffline)
+	if err != nil {
+		return err
 	}
 
 	dhtKey, err := normalizeKey(key)
diff --git a/core/coreapi/test/api_test.go b/core/coreapi/test/api_test.go
index dafadcc1f..64d873896 100644
--- a/core/coreapi/test/api_test.go
+++ b/core/coreapi/test/api_test.go
@@ -31,7 +31,7 @@ const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe"
 
 type NodeProvider struct{}
 
-func (NodeProvider) MakeAPISwarm(ctx context.Context, fullIdentity bool, n int) ([]coreiface.CoreAPI, error) {
+func (NodeProvider) MakeAPISwarm(ctx context.Context, fullIdentity bool, online bool, n int) ([]coreiface.CoreAPI, error) {
 	mn := mocknet.New()
 
 	nodes := make([]*core.IpfsNode, n)
@@ -82,7 +82,7 @@ func (NodeProvider) MakeAPISwarm(ctx context.Context, fullIdentity bool, n int)
 			Routing: libp2p.DHTServerOption,
 			Repo:    r,
 			Host:    mock.MockHostOption(mn),
-			Online:  fullIdentity,
+			Online:  online,
 			ExtraOpts: map[string]bool{
 				"pubsub": true,
 			},
@@ -102,15 +102,17 @@ func (NodeProvider) MakeAPISwarm(ctx context.Context, fullIdentity bool, n int)
 		return nil, err
 	}
 
-	bsinf := bootstrap.BootstrapConfigWithPeers(
-		[]peer.AddrInfo{
-			nodes[0].Peerstore.PeerInfo(nodes[0].Identity),
-		},
-	)
+	if online {
+		bsinf := bootstrap.BootstrapConfigWithPeers(
+			[]peer.AddrInfo{
+				nodes[0].Peerstore.PeerInfo(nodes[0].Identity),
+			},
+		)
 
-	for _, n := range nodes[1:] {
-		if err := n.Bootstrap(bsinf); err != nil {
-			return nil, err
+		for _, n := range nodes[1:] {
+			if err := n.Bootstrap(bsinf); err != nil {
+				return nil, err
+			}
 		}
 	}
 
diff --git a/core/coreapi/test/path_test.go b/core/coreapi/test/path_test.go
index 9f67f3c71..c89ce48c9 100644
--- a/core/coreapi/test/path_test.go
+++ b/core/coreapi/test/path_test.go
@@ -19,7 +19,7 @@ func TestPathUnixFSHAMTPartial(t *testing.T) {
 	defer cancel()
 
 	// Create a node
-	apis, err := NodeProvider{}.MakeAPISwarm(ctx, true, 1)
+	apis, err := NodeProvider{}.MakeAPISwarm(ctx, true, true, 1)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/docs/examples/kubo-as-a-library/go.mod b/docs/examples/kubo-as-a-library/go.mod
index 6eb1bcb5e..fd3ad8909 100644
--- a/docs/examples/kubo-as-a-library/go.mod
+++ b/docs/examples/kubo-as-a-library/go.mod
@@ -7,7 +7,7 @@ go 1.18
 replace github.com/ipfs/kubo => ./../../..
 
 require (
-	github.com/ipfs/boxo v0.8.1
+	github.com/ipfs/boxo v0.8.2-0.20230503105907-8059f183d866
 	github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
 	github.com/libp2p/go-libp2p v0.27.1
 	github.com/multiformats/go-multiaddr v0.9.0
diff --git a/docs/examples/kubo-as-a-library/go.sum b/docs/examples/kubo-as-a-library/go.sum
index 2302548a9..15bf75e82 100644
--- a/docs/examples/kubo-as-a-library/go.sum
+++ b/docs/examples/kubo-as-a-library/go.sum
@@ -321,8 +321,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
-github.com/ipfs/boxo v0.8.1 h1:3DkKBCK+3rdEB5t77WDShUXXhktYwH99mkAsgajsKrU=
-github.com/ipfs/boxo v0.8.1/go.mod h1:xJ2hVb4La5WyD7GvKYE0lq2g1rmQZoCD2K4WNrV6aZI=
+github.com/ipfs/boxo v0.8.2-0.20230503105907-8059f183d866 h1:ThRTXD/EyoLb/jz+YW+ZlOLbjX9FyaxP0dEpgUp3cCE=
+github.com/ipfs/boxo v0.8.2-0.20230503105907-8059f183d866/go.mod h1:bORAHrH6hUtDZjbzTEaLrSpTdyhHKDIpjDRT+A14B7w=
 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
diff --git a/go.mod b/go.mod
index b83143f9b..159bbd3e4 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/ipfs/boxo v0.8.1
+	github.com/ipfs/boxo v0.8.2-0.20230503105907-8059f183d866
 	github.com/ipfs/go-block-format v0.1.2
 	github.com/ipfs/go-cid v0.4.1
 	github.com/ipfs/go-cidutil v0.1.0
diff --git a/go.sum b/go.sum
index b00e5aed6..16d312ef5 100644
--- a/go.sum
+++ b/go.sum
@@ -356,8 +356,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
-github.com/ipfs/boxo v0.8.1 h1:3DkKBCK+3rdEB5t77WDShUXXhktYwH99mkAsgajsKrU=
-github.com/ipfs/boxo v0.8.1/go.mod h1:xJ2hVb4La5WyD7GvKYE0lq2g1rmQZoCD2K4WNrV6aZI=
+github.com/ipfs/boxo v0.8.2-0.20230503105907-8059f183d866 h1:ThRTXD/EyoLb/jz+YW+ZlOLbjX9FyaxP0dEpgUp3cCE=
+github.com/ipfs/boxo v0.8.2-0.20230503105907-8059f183d866/go.mod h1:bORAHrH6hUtDZjbzTEaLrSpTdyhHKDIpjDRT+A14B7w=
 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
diff --git a/test/sharness/t0114-gateway-subdomains.sh b/test/sharness/t0114-gateway-subdomains.sh
index 04f762ad6..bf5070985 100755
--- a/test/sharness/t0114-gateway-subdomains.sh
+++ b/test/sharness/t0114-gateway-subdomains.sh
@@ -93,40 +93,29 @@ test_launch_ipfs_daemon_without_network
 
 # Import test case
 # See the static fixtures in ./t0114-gateway-subdomains/
-test_expect_success "Add the test fixtures" '
-  ipfs dag import ../t0114-gateway-subdomains/fixtures.car
-'
-CID_VAL="hello"
+CID_VAL=hello
 CIDv1=bafkreicysg23kiwv34eg2d7qweipxwosdo2py4ldv42nbauguluen5v6am
 CIDv0=QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN
-# CIDv0to1 is necessary because raw-leaves are enabled by default during
-# "ipfs add" with CIDv1 and disabled with CIDv0
 CIDv0to1=bafybeiffndsajwhk3lwjewwdxqntmjm4b5wxaaanokonsggenkbw6slwk4
 CIDv1_TOO_LONG=bafkrgqhhyivzstcz3hhswshfjgy6ertgmnqeleynhwt4dlfsthi4hn7zgh4uvlsb5xncykzapi3ocd4lzogukir6ksdy6wzrnz6ohnv4aglcs
-DIR_CID=bafybeiht6dtwk3les7vqm6ibpvz6qpohidvlshsfyr7l5mpysdw2vmbbhe # ./testdirlisting
+DIR_CID=bafybeiht6dtwk3les7vqm6ibpvz6qpohidvlshsfyr7l5mpysdw2vmbbhe
 
-test_expect_success "Publish test text file to IPNS using RSA keys" '
-  RSA_KEY=$(ipfs key gen --ipns-base=b58mh --type=rsa --size=2048 test_key_rsa | head -n1 | tr -d "\n")
-  RSA_IPNS_IDv0=$(echo "$RSA_KEY" | ipfs cid format -v 0)
-  RSA_IPNS_IDv1=$(echo "$RSA_KEY" | ipfs cid format -v 1 --mc libp2p-key -b base36)
-  RSA_IPNS_IDv1_DAGPB=$(echo "$RSA_IPNS_IDv0" | ipfs cid format -v 1 -b base36)
-  test_check_peerid "${RSA_KEY}" &&
-  ipfs name publish --key test_key_rsa --allow-offline -Q "/ipfs/$CIDv1" > name_publish_out &&
-  ipfs name resolve "$RSA_KEY"  > output &&
-  printf "/ipfs/%s\n" "$CIDv1" > expected2 &&
-  test_cmp expected2 output
-'
+RSA_KEY=QmVujd5Vb7moysJj8itnGufN7MEtPRCNHkKpNuA4onsRa3
+RSA_IPNS_IDv0=QmVujd5Vb7moysJj8itnGufN7MEtPRCNHkKpNuA4onsRa3
+RSA_IPNS_IDv1=k2k4r8m7xvggw5pxxk3abrkwyer625hg01hfyggrai7lk1m63fuihi7w
+RSA_IPNS_IDv1_DAGPB=k2jmtxu61bnhrtj301lw7zizknztocdbeqhxgv76l2q9t36fn9jbzipo
 
-test_expect_success "Publish test text file to IPNS using ED25519 keys" '
-  ED25519_KEY=$(ipfs key gen --ipns-base=b58mh --type=ed25519 test_key_ed25519 | head -n1 | tr -d "\n")
-  ED25519_IPNS_IDv0=$ED25519_KEY
-  ED25519_IPNS_IDv1=$(ipfs key list -l --ipns-base=base36 | grep test_key_ed25519 | cut -d " " -f1 | tr -d "\n")
-  ED25519_IPNS_IDv1_DAGPB=$(echo "$ED25519_IPNS_IDv1" | ipfs cid format -v 1 -b base36 --mc dag-pb)
-  test_check_peerid "${ED25519_KEY}" &&
-  ipfs name publish --key test_key_ed25519 --allow-offline -Q "/ipfs/$CIDv1" > name_publish_out &&
-  ipfs name resolve "$ED25519_KEY"  > output &&
-  printf "/ipfs/%s\n" "$CIDv1" > expected2 &&
-  test_cmp expected2 output
+ED25519_KEY=12D3KooWLQzUv2FHWGVPXTXSZpdHs7oHbXub2G5WC8Tx4NQhyd2d
+ED25519_IPNS_IDv0=12D3KooWLQzUv2FHWGVPXTXSZpdHs7oHbXub2G5WC8Tx4NQhyd2d
+ED25519_IPNS_IDv1=k51qzi5uqu5dk3v4rmjber23h16xnr23bsggmqqil9z2gduiis5se8dht36dam
+ED25519_IPNS_IDv1_DAGPB=k50rm9yjlt0jey4fqg6wafvqprktgbkpgkqdg27tpqje6iimzxewnhvtin9hhq
+IPNS_ED25519_B58MH=12D3KooWLQzUv2FHWGVPXTXSZpdHs7oHbXub2G5WC8Tx4NQhyd2d
+IPNS_ED25519_B36CID=k51qzi5uqu5dk3v4rmjber23h16xnr23bsggmqqil9z2gduiis5se8dht36dam
+
+test_expect_success "Add the test fixtures" '
+  ipfs dag import ../t0114-gateway-subdomains/fixtures.car &&
+  ipfs routing put --allow-offline /ipns/${RSA_KEY} ../t0114-gateway-subdomains/${RSA_KEY}.ipns-record &&
+  ipfs routing put --allow-offline /ipns/${ED25519_KEY} ../t0114-gateway-subdomains/${ED25519_KEY}.ipns-record
 '
 
 # ensure we start with empty Gateway.PublicGateways
@@ -588,11 +577,6 @@ test_expect_success \
 ## https://github.com/ipfs/go-ipfs/issues/7318
 ## ============================================================================
 
-# ed25519 fits under 63 char limit when represented in base36
-IPNS_KEY="test_key_ed25519"
-IPNS_ED25519_B58MH=$(ipfs key list -l --ipns-base b58mh | grep $IPNS_KEY | cut -d" " -f1 | tr -d "\n")
-IPNS_ED25519_B36CID=$(ipfs key list -l --ipns-base base36 | grep $IPNS_KEY | cut -d" " -f1 | tr -d "\n")
-
 # local: *.localhost
 test_localhost_gateway_response_should_contain \
   "request for a ED25519 libp2p-key at localhost/ipns/{b58mh} returns Location HTTP header for DNS-safe subdomain redirect in browsers" \
diff --git a/test/sharness/t0114-gateway-subdomains/12D3KooWLQzUv2FHWGVPXTXSZpdHs7oHbXub2G5WC8Tx4NQhyd2d.ipns-record b/test/sharness/t0114-gateway-subdomains/12D3KooWLQzUv2FHWGVPXTXSZpdHs7oHbXub2G5WC8Tx4NQhyd2d.ipns-record
new file mode 100644
index 0000000000000000000000000000000000000000..39b2f41a40866132588557e1be7beb97f50b79d4
GIT binary patch
literal 394
zcmd;b)XywPE7ng+Ov^4x%}lN=PB${n&MYr8Hc3r4N--}iPt7c-D9<lW$u}yfG|5RR
zGcn3bN-Rw;%_&XIGc7Yq%oTFD(IK!Py;|VU84i}^Tce8|uSp-<yZg49UeTJ+)oewJ
zlY+c1Fl0FVZhLxH=(doI><^J}Yul1#e?Les=qsP9*TpHppd@W%Xk@HwV4`bi6k=#>
zWnyAwYN=;oU}$b+5v9Rk(9qDcxZ%Nrr`k>qKjaU!b6-4rYi;`fm-}a{vCo?xRu}4g
z^l|FihwZAz%U!lw{rY|+(EGO7p=OmC>knNP>?`)U^*Whr<MZU^&#hU^UQ-#DCWnOh
zNNb;NW?)HXU`P#11o|a{@_@()PAvomN^&Yg2GGdNl+2RK2z>s^fvF0qEJ$Sl0Mn+K
ATmS$7

literal 0
HcmV?d00001

diff --git a/test/sharness/t0114-gateway-subdomains/QmVujd5Vb7moysJj8itnGufN7MEtPRCNHkKpNuA4onsRa3.ipns-record b/test/sharness/t0114-gateway-subdomains/QmVujd5Vb7moysJj8itnGufN7MEtPRCNHkKpNuA4onsRa3.ipns-record
new file mode 100644
index 0000000000000000000000000000000000000000..b37d9b75b50ce3baa472e0c790c63cc4476c8631
GIT binary patch
literal 1082
zcmd;b)XywPE7ng+Ov^4x%}lN=PB${n&MYr8Hc3r4N--}iPt7c-D9<lW$u}yfG|5RR
zGcn3bN-Rw;%_&XIGc7Yq%oS>2(*IMXR5Go)>GsSynodq(GRGFw`JL;^nAdmmZe7@<
z?;9u0)~oe;B6n8l#B-O4jHLznwHFfawsGeD^WdI5dD6CW_D`?(IR6u4yS}n>0Xs|C
zV|Deu10TJ;+15H9y#1%w)-Pu|{~C5NEh+2ohgE%4GcFi^=!o1|c=mvclzM~Aq?sH1
zV;9|>pJ(C4b;k1K_pY`7N=jcyC2D2fRy9#Bx;b;nX--YmkL>f5|4X=(dm6Aa@2=jn
zPF^r?@jIi2gJJgHoU|F^9$YA16dbkmCI8(bi=coUk?re*CGPIOm;0ZgQ?hD>F0X=C
zL#OarR>@Lloz*!<SnYl1#qHnLak{MKgxuYPEC~iBX(K};V_gFiT|=V~Lt`rwV=Gg0
zJtJca17nLQ4F-dThMvU@4<0<#wpz`^!63AZ$)Jf*$$*!QQ>)FR?K>|cBO@yVa}y&!
z15licsfm%1;pVJGT^wtTb=KA$^<13Nv3!=^X2&xt9)0ASbyDGP?WdlXx7q)`d@Z+h
z!6|`%_KMwXk1o8Mo?{-MVA*x}^cm9=t?8#{Bqsaz<R9CXeMaTIvgUfl=2GWE(|3L|
zSDiVY^XuxetMfUx?^w<jbx!2{i;qG1nu}7k>y{TE_Y}T4V{h&^<LAXHmVflt*@SEh
z<qax}s8X!Fdri}Q_8+f_p;b#ag!B5SCA;orluBKter3}C>m3)r^)bGv-5U2WMvuSX
z7vtk<Ys2ZPPo7&@_p-}<YQMwu>GPzgn;O5JiMe~&<38&ZhUC?flR8gS@+~<#_0!o~
z@AZ8}8?WuOn%~@gs&#79Vv8C3nV1<F7@ZoJs&hVV<c`gfZTo3yEcD0IZNjOXivL~{
zue-jx?_jSzceM-CmyH}X|JM0S>oCd(eK6PTncvj@)S}Wr`}S-X)$F5@;<s0xF4mv6
zzPD$`MaAtZdUgwPc&;%2v)uPsnR9Q0*K~)rrJ<PtJDyvx#m!28G=J@Ewo|gVR)~pI
zB^2s*JPQ@hy!Dw=FVVv0nEcL(d(~RLcr^y!NfNW?n{jXPSA{c^?dMl(n>ne3PMT?z
z=<u^8JHzeTl)dwAiQIYL8uqH>NIb*B<2n+zLRAc6lAY~eeG%iDJwNZB<n4to({JcA
z?|D4)mkj&Hg(kD?D_fp(f1M|EKfbB;liki&;u=%0etN_tVC6NHacOc$h>x`P>1GC&
uWCn)RutZ?qi=aH?W(21e0yA-PDnka)$jp??lFA5t$v6k5Dx|U?l>q?Oq1V#@

literal 0
HcmV?d00001

diff --git a/test/sharness/t0114-gateway-subdomains/README.md b/test/sharness/t0114-gateway-subdomains/README.md
index 611bd0ed5..005a7f0c5 100644
--- a/test/sharness/t0114-gateway-subdomains/README.md
+++ b/test/sharness/t0114-gateway-subdomains/README.md
@@ -3,10 +3,16 @@
 - fixtures.car
   - raw CARv1
 
-generated with:
+- QmUKd....ipns-record
+  - ipns record, encoded with protocol buffer
+
+- 12D3K....ipns-record
+  - ipns record, encoded with protocol buffer
+
+Generated with:
 
 ```sh
-# using ipfs version 0.18.1
+# using ipfs version 0.21.0-dev (03a98280e3e642774776cd3d0435ab53e5dfa867)
 
 # CIDv0to1 is necessary because raw-leaves are enabled by default during
 # "ipfs add" with CIDv1 and disabled with CIDv0
@@ -17,6 +23,7 @@ CIDv0to1=$(echo "$CIDv0" | ipfs cid base32)
 # sha512 will be over 63char limit, even when represented in Base36
 CIDv1_TOO_LONG=$(echo $CID_VAL | ipfs add --cid-version 1 --hash sha2-512 -Q)
 
+echo CID_VAL=${CID_VAL}
 echo CIDv1=${CIDv1}
 echo CIDv0=${CIDv0}
 echo CIDv0to1=${CIDv0to1}
@@ -32,7 +39,7 @@ echo "I am a txt file" > testdirlisting/api/file.txt &&
 echo "I am a txt file" > testdirlisting/ipfs/file.txt &&
 DIR_CID=$(ipfs add -Qr --cid-version 1 testdirlisting)
 
-echo DIR_CID=${DIR_CID}
+echo DIR_CID=${DIR_CID} # ./testdirlisting
 
 ipfs files mkdir /t0114/
 ipfs files cp /ipfs/${CIDv1} /t0114/
@@ -45,10 +52,60 @@ ROOT=`ipfs files stat /t0114/ --hash`
 
 ipfs dag export ${ROOT} > ./fixtures.car
 
-# CID_VAL="hello"
+# Then the keys
+
+KEY_NAME=test_key_rsa_$RANDOM
+RSA_KEY=$(ipfs key gen --ipns-base=b58mh --type=rsa --size=2048 ${KEY_NAME} | head -n1 | tr -d "\n")
+RSA_IPNS_IDv0=$(echo "$RSA_KEY" | ipfs cid format -v 0)
+RSA_IPNS_IDv1=$(echo "$RSA_KEY" | ipfs cid format -v 1 --mc libp2p-key -b base36)
+RSA_IPNS_IDv1_DAGPB=$(echo "$RSA_IPNS_IDv0" | ipfs cid format -v 1 -b base36)
+
+# publish a record valid for a 100 years
+ipfs name publish --key ${KEY_NAME} --allow-offline -Q --ttl=876600h --lifetime=876600h "/ipfs/$CIDv1"
+ipfs routing get /ipns/${RSA_KEY} > ${RSA_KEY}.ipns-record
+
+echo RSA_KEY=${RSA_KEY}
+echo RSA_IPNS_IDv0=${RSA_IPNS_IDv0}
+echo RSA_IPNS_IDv1=${RSA_IPNS_IDv1}
+echo RSA_IPNS_IDv1_DAGPB=${RSA_IPNS_IDv1_DAGPB}
+
+KEY_NAME=test_key_ed25519_$RANDOM
+ED25519_KEY=$(ipfs key gen --ipns-base=b58mh --type=ed25519 ${KEY_NAME} | head -n1 | tr -d "\n")
+ED25519_IPNS_IDv0=$ED25519_KEY
+ED25519_IPNS_IDv1=$(ipfs key list -l --ipns-base=base36 | grep ${KEY_NAME} | cut -d " " -f1 | tr -d "\n")
+ED25519_IPNS_IDv1_DAGPB=$(echo "$ED25519_IPNS_IDv1" | ipfs cid format -v 1 -b base36 --mc dag-pb)
+
+# ed25519 fits under 63 char limit when represented in base36
+IPNS_ED25519_B58MH=$(ipfs key list -l --ipns-base b58mh | grep $KEY_NAME | cut -d" " -f1 | tr -d "\n")
+IPNS_ED25519_B36CID=$(ipfs key list -l --ipns-base base36 | grep $KEY_NAME | cut -d" " -f1 | tr -d "\n")
+
+# publish a record valid for a 100 years
+ipfs name publish --key ${KEY_NAME} --allow-offline -Q --ttl=876600h --lifetime=876600h "/ipfs/$CIDv1"
+ipfs routing get /ipns/${ED25519_KEY} > ${ED25519_KEY}.ipns-record
+
+echo ED25519_KEY=${ED25519_KEY}
+echo ED25519_IPNS_IDv0=${ED25519_IPNS_IDv0}
+echo ED25519_IPNS_IDv1=${ED25519_IPNS_IDv1}
+echo ED25519_IPNS_IDv1_DAGPB=${ED25519_IPNS_IDv1_DAGPB}
+echo IPNS_ED25519_B58MH=${IPNS_ED25519_B58MH}
+echo IPNS_ED25519_B36CID=${IPNS_ED25519_B36CID}
+
+# CID_VAL=hello
 # CIDv1=bafkreicysg23kiwv34eg2d7qweipxwosdo2py4ldv42nbauguluen5v6am
 # CIDv0=QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN
 # CIDv0to1=bafybeiffndsajwhk3lwjewwdxqntmjm4b5wxaaanokonsggenkbw6slwk4
 # CIDv1_TOO_LONG=bafkrgqhhyivzstcz3hhswshfjgy6ertgmnqeleynhwt4dlfsthi4hn7zgh4uvlsb5xncykzapi3ocd4lzogukir6ksdy6wzrnz6ohnv4aglcs
 # DIR_CID=bafybeiht6dtwk3les7vqm6ibpvz6qpohidvlshsfyr7l5mpysdw2vmbbhe # ./testdirlisting
+
+# RSA_KEY=QmVujd5Vb7moysJj8itnGufN7MEtPRCNHkKpNuA4onsRa3
+# RSA_IPNS_IDv0=QmVujd5Vb7moysJj8itnGufN7MEtPRCNHkKpNuA4onsRa3
+# RSA_IPNS_IDv1=k2k4r8m7xvggw5pxxk3abrkwyer625hg01hfyggrai7lk1m63fuihi7w
+# RSA_IPNS_IDv1_DAGPB=k2jmtxu61bnhrtj301lw7zizknztocdbeqhxgv76l2q9t36fn9jbzipo
+
+# ED25519_KEY=12D3KooWLQzUv2FHWGVPXTXSZpdHs7oHbXub2G5WC8Tx4NQhyd2d
+# ED25519_IPNS_IDv0=12D3KooWLQzUv2FHWGVPXTXSZpdHs7oHbXub2G5WC8Tx4NQhyd2d
+# ED25519_IPNS_IDv1=k51qzi5uqu5dk3v4rmjber23h16xnr23bsggmqqil9z2gduiis5se8dht36dam
+# ED25519_IPNS_IDv1_DAGPB=k50rm9yjlt0jey4fqg6wafvqprktgbkpgkqdg27tpqje6iimzxewnhvtin9hhq
+# IPNS_ED25519_B58MH=12D3KooWLQzUv2FHWGVPXTXSZpdHs7oHbXub2G5WC8Tx4NQhyd2d
+# IPNS_ED25519_B36CID=k51qzi5uqu5dk3v4rmjber23h16xnr23bsggmqqil9z2gduiis5se8dht36dam
 ```
diff --git a/test/sharness/t0116-gateway-cache.sh b/test/sharness/t0116-gateway-cache.sh
index 0cb1a94eb..b2e6b3af3 100755
--- a/test/sharness/t0116-gateway-cache.sh
+++ b/test/sharness/t0116-gateway-cache.sh
@@ -25,24 +25,18 @@ test_launch_ipfs_daemon_without_network
 # Caching of things like raw blocks, CARs, dag-json and dag-cbor
 # is tested in their respective suites.
 
-# Import test case
-# See the static fixtures in ./t0116-gateway-cache/
-test_expect_success "Add the test directory" '
-  ipfs dag import ../t0116-gateway-cache/fixtures.car
-'
 ROOT1_CID=bafybeib3ffl2teiqdncv3mkz4r23b5ctrwkzrrhctdbne6iboayxuxk5ui # ./
 ROOT2_CID=bafybeih2w7hjocxjg6g2ku25hvmd53zj7og4txpby3vsusfefw5rrg5sii # ./root2
 ROOT3_CID=bafybeiawdvhmjcz65x5egzx4iukxc72hg4woks6v6fvgyupiyt3oczk5ja # ./root2/root3
 ROOT4_CID=bafybeifq2rzpqnqrsdupncmkmhs3ckxxjhuvdcbvydkgvch3ms24k5lo7q # ./root2/root3/root4
 FILE_CID=bafkreicysg23kiwv34eg2d7qweipxwosdo2py4ldv42nbauguluen5v6am # ./root2/root3/root4/index.html
+TEST_IPNS_ID=k51qzi5uqu5dlxdsdu5fpuu7h69wu4ohp32iwm9pdt9nq3y5rpn3ln9j12zfhe
 
-test_expect_success "Prepare IPNS unixfs content path for testing" '
-  TEST_IPNS_ID=$(ipfs key gen --ipns-base=base36 --type=ed25519 cache_test_key | head -n1 | tr -d "\n")
-  ipfs name publish --key cache_test_key --allow-offline -Q "/ipfs/$ROOT1_CID" > name_publish_out &&
-  test_check_peerid "${TEST_IPNS_ID}" &&
-  ipfs name resolve "${TEST_IPNS_ID}" > output &&
-  printf "/ipfs/%s\n" "$ROOT1_CID" > expected &&
-  test_cmp expected output
+# Import test case
+# See the static fixtures in ./t0116-gateway-cache/
+test_expect_success "Add the test directory" '
+  ipfs dag import ../t0116-gateway-cache/fixtures.car
+  ipfs routing put --allow-offline /ipns/${TEST_IPNS_ID} ../t0116-gateway-cache/${TEST_IPNS_ID}.ipns-record
 '
 
 # GET /ipfs/
diff --git a/test/sharness/t0116-gateway-cache/README.md b/test/sharness/t0116-gateway-cache/README.md
index 8b44fe640..1be92f454 100644
--- a/test/sharness/t0116-gateway-cache/README.md
+++ b/test/sharness/t0116-gateway-cache/README.md
@@ -6,7 +6,8 @@
 generated with:
 
 ```sh
-# using ipfs version 0.18.1
+# using ipfs version 0.21.0-dev (03a98280e3e642774776cd3d0435ab53e5dfa867)
+
 mkdir -p root2/root3/root4 &&
 echo "hello" > root2/root3/root4/index.html &&
 ROOT1_CID=$(ipfs add -Qrw --cid-version 1 root2)
@@ -15,11 +16,17 @@ ROOT3_CID=$(ipfs resolve -r /ipfs/$ROOT1_CID/root2/root3 | cut -d "/" -f3)
 ROOT4_CID=$(ipfs resolve -r /ipfs/$ROOT1_CID/root2/root3/root4 | cut -d "/" -f3)
 FILE_CID=$(ipfs resolve -r /ipfs/$ROOT1_CID/root2/root3/root4/index.html | cut -d "/" -f3)
 
-echo ROOT1_CID=${ROOT1_CID}
-echo ROOT2_CID=${ROOT2_CID}
-echo ROOT3_CID=${ROOT3_CID}
-echo ROOT4_CID=${ROOT4_CID}
-echo FILE_CID=${FILE_CID}
+TEST_IPNS_ID=$(ipfs key gen --ipns-base=base36 --type=ed25519 cache_test_key | head -n1 | tr -d "\n")
+# publish a record valid for a 100 years
+ipfs name publish --key cache_test_key --allow-offline -Q --ttl=876600h --lifetime=876600h "/ipfs/$ROOT1_CID"
+ipfs routing get /ipns/${TEST_IPNS_ID} > ${TEST_IPNS_ID}.ipns-record
+
+echo ROOT1_CID=${ROOT1_CID} # ./
+echo ROOT2_CID=${ROOT2_CID} # ./root2
+echo ROOT3_CID=${ROOT3_CID} # ./root2/root3
+echo ROOT4_CID=${ROOT4_CID} # ./root2/root3/root4
+echo FILE_CID=${FILE_CID} # ./root2/root3/root4/index.html
+echo TEST_IPNS_ID=${TEST_IPNS_ID}
 
 ipfs dag export ${ROOT1_CID} > ./fixtures.car
 
@@ -28,4 +35,5 @@ ipfs dag export ${ROOT1_CID} > ./fixtures.car
 # ROOT3_CID=bafybeiawdvhmjcz65x5egzx4iukxc72hg4woks6v6fvgyupiyt3oczk5ja # ./root2/root3
 # ROOT4_CID=bafybeifq2rzpqnqrsdupncmkmhs3ckxxjhuvdcbvydkgvch3ms24k5lo7q # ./root2/root3/root4
 # FILE_CID=bafkreicysg23kiwv34eg2d7qweipxwosdo2py4ldv42nbauguluen5v6am # ./root2/root3/root4/index.html
+# TEST_IPNS_ID=k51qzi5uqu5dlxdsdu5fpuu7h69wu4ohp32iwm9pdt9nq3y5rpn3ln9j12zfhe
 ```
diff --git a/test/sharness/t0116-gateway-cache/k51qzi5uqu5dlxdsdu5fpuu7h69wu4ohp32iwm9pdt9nq3y5rpn3ln9j12zfhe.ipns-record b/test/sharness/t0116-gateway-cache/k51qzi5uqu5dlxdsdu5fpuu7h69wu4ohp32iwm9pdt9nq3y5rpn3ln9j12zfhe.ipns-record
new file mode 100644
index 0000000000000000000000000000000000000000..9cd7491bf7e71ec8f11e908b51aa908702a4a353
GIT binary patch
literal 394
zcmd;b)XywPE7ng+Osh;v%}g>*OUp4TNzE)w$xALX&dsheDKaunGEFWiD$lMeD#}PM
zNlD5}HOoxOPpqsct;jYl%@lIj#Aa`PX!4XzpKmQY)6e$9U7<`kzNU$F%{D)#mwVMZ
z{GZ-h%zgj3z3+a9thHt*l@~txHDQw3!_thyQ+_E$H*2s<FephI85$Yu8kp!B8ig2|
zS{WNz85!xBnV1=xm_%tX7&J8WEN*!4;HkEgLzK&w?Mu36P5I&_{X0|7@POG}hJxJ*
z8H*05$sPFQpm<T@OU-gAuCD6d!wV9Q<b2nC{<G#|{X)ihwst$U{f@VDdQD|qnj8}1
zBdvY9nSmvlfgv?4F{d;&g7SdK2u>|5P0dSAWyk;;nVFJVQW=5IUpX*UA(aKG3;+eR
BnWX>#

literal 0
HcmV?d00001

diff --git a/test/sharness/t0123-gateway-json-cbor.sh b/test/sharness/t0123-gateway-json-cbor.sh
index b22c056de..745e984db 100755
--- a/test/sharness/t0123-gateway-json-cbor.sh
+++ b/test/sharness/t0123-gateway-json-cbor.sh
@@ -163,6 +163,14 @@ test_expect_success "Add CARs for path traversal and DAG-PB representation tests
   test_should_contain $DAG_PB_CID import_output
 '
 
+IPNS_ID_DAG_JSON=k51qzi5uqu5dhjghbwdvbo6mi40htrq6e2z4pwgp15pgv3ho1azvidttzh8yy2
+IPNS_ID_DAG_CBOR=k51qzi5uqu5dghjous0agrwavl8vzl64xckoqzwqeqwudfr74kfd11zcyk3b7l
+
+test_expect_success "Add ipns records for path traversal and DAG-PB representation tests" '
+  ipfs routing put --allow-offline /ipns/${IPNS_ID_DAG_JSON} ../t0123-gateway-json-cbor/${IPNS_ID_DAG_JSON}.ipns-record &&
+  ipfs routing put --allow-offline /ipns/${IPNS_ID_DAG_CBOR} ../t0123-gateway-json-cbor/${IPNS_ID_DAG_CBOR}.ipns-record
+'
+
 test_expect_success "GET DAG-JSON traversal returns 501 if there is path remainder" '
   curl -sD - "http://127.0.0.1:$GWAY_PORT/ipfs/$DAG_JSON_TRAVERSAL_CID/foo?format=dag-json" > curl_output 2>&1 &&
   test_should_contain "501 Not Implemented" curl_output &&
@@ -197,6 +205,7 @@ test_native_dag () {
   format=$2
   disposition=$3
   CID=$4
+  IPNS_ID=$5
 
   # GET without explicit format and Accept: text/html returns raw block
 
@@ -313,15 +322,6 @@ test_native_dag () {
   # IPNS behavior (should be same as immutable /ipfs, but with different caching headers)
   # To keep tests small we only confirm payload is the same, and then only test delta around caching headers.
 
-  test_expect_success "Prepare IPNS with dag-$format" '
-    IPNS_ID=$(ipfs key gen --ipns-base=base36 --type=ed25519 ${format}_test_key | head -n1 | tr -d "\n") &&
-    ipfs name publish --key ${format}_test_key --allow-offline -Q "/ipfs/$CID" > name_publish_out &&
-    test_check_peerid "${IPNS_ID}" &&
-    ipfs name resolve "${IPNS_ID}" > output &&
-    printf "/ipfs/%s\n" "$CID" > expected &&
-    test_cmp expected output
-  '
-
   test_expect_success "GET $name from /ipns without explicit format returns the same payload as /ipfs" '
     curl -sX GET "http://127.0.0.1:$GWAY_PORT/ipfs/$CID" -o ipfs_output &&
     curl -sX GET "http://127.0.0.1:$GWAY_PORT/ipns/$IPNS_ID" -o ipns_output &&
@@ -369,8 +369,8 @@ test_native_dag () {
 
 }
 
-test_native_dag "DAG-JSON" "json" "inline" "$DAG_JSON_TRAVERSAL_CID"
-test_native_dag "DAG-CBOR" "cbor" "attachment" "$DAG_CBOR_TRAVERSAL_CID"
+test_native_dag "DAG-JSON" "json" "inline" "$DAG_JSON_TRAVERSAL_CID" ${IPNS_ID_DAG_JSON}
+test_native_dag "DAG-CBOR" "cbor" "attachment" "$DAG_CBOR_TRAVERSAL_CID" ${IPNS_ID_DAG_CBOR}
 
 test_kill_ipfs_daemon
 
diff --git a/test/sharness/t0123-gateway-json-cbor/README.md b/test/sharness/t0123-gateway-json-cbor/README.md
index 4e83f42a1..5a63b192a 100644
--- a/test/sharness/t0123-gateway-json-cbor/README.md
+++ b/test/sharness/t0123-gateway-json-cbor/README.md
@@ -14,7 +14,8 @@
 generated with:
 
 ```sh
-# using ipfs version 0.18.1
+# using ipfs version 0.21.0-dev (03a98280e3e642774776cd3d0435ab53e5dfa867)
+
 mkdir -p rootDir/ipfs &&
 mkdir -p rootDir/ipns &&
 mkdir -p rootDir/api &&
@@ -37,8 +38,29 @@ echo FILE_SIZE=${FILE_SIZE}
 
 ipfs dag export ${DIR_CID} > fixtures.car
 
+DAG_CBOR_TRAVERSAL_CID="bafyreibs4utpgbn7uqegmd2goqz4bkyflre2ek2iwv743fhvylwi4zeeim"
+DAG_JSON_TRAVERSAL_CID="baguqeeram5ujjqrwheyaty3w5gdsmoz6vittchvhk723jjqxk7hakxkd47xq"
+DAG_PB_CID="bafybeiegxwlgmoh2cny7qlolykdf7aq7g6dlommarldrbm7c4hbckhfcke"
+
+test_native_dag() {
+  NAME=$1
+  CID=$2
+
+  IPNS_ID=$(ipfs key gen --ipns-base=base36 --type=ed25519 ${NAME}_test_key | head -n1 | tr -d "\n")
+  ipfs name publish --key ${NAME}_test_key --allow-offline --ttl=876600h --lifetime=876600h -Q "/ipfs/${CID}" > name_publish_out
+
+  ipfs routing get /ipns/${IPNS_ID} > ${IPNS_ID}.ipns-record
+
+  echo "IPNS_ID_${NAME}=${IPNS_ID}"
+}
+
+test_native_dag "DAG_JSON" "$DAG_JSON_TRAVERSAL_CID"
+test_native_dag "DAG_CBOR" "$DAG_CBOR_TRAVERSAL_CID"
+
 # DIR_CID=bafybeiafyvqlazbbbtjnn6how5d6h6l6rxbqc4qgpbmteaiskjrffmyy4a # ./rootDir
 # FILE_JSON_CID=bafkreibrppizs3g7axs2jdlnjua6vgpmltv7k72l7v7sa6mmht6mne3qqe # ./rootDir/ą/ę/t.json
 # FILE_CID=bafkreialihlqnf5uwo4byh4n3cmwlntwqzxxs2fg5vanqdi3d7tb2l5xkm # ./rootDir/ą/ę/file-źł.txt
 # FILE_SIZE=34
+# IPNS_ID_DAG_JSON=k51qzi5uqu5dhjghbwdvbo6mi40htrq6e2z4pwgp15pgv3ho1azvidttzh8yy2
+# IPNS_ID_DAG_CBOR=k51qzi5uqu5dghjous0agrwavl8vzl64xckoqzwqeqwudfr74kfd11zcyk3b7l
 ```
diff --git a/test/sharness/t0123-gateway-json-cbor/k51qzi5uqu5dghjous0agrwavl8vzl64xckoqzwqeqwudfr74kfd11zcyk3b7l.ipns-record b/test/sharness/t0123-gateway-json-cbor/k51qzi5uqu5dghjous0agrwavl8vzl64xckoqzwqeqwudfr74kfd11zcyk3b7l.ipns-record
new file mode 100644
index 0000000000000000000000000000000000000000..7186c709e3ceb29fbfda0fd38b4e43109f26ce55
GIT binary patch
literal 394
zcmd;b)XywPE7ng+OsgzP%}gpbDJ>~TPs%edElf?%O)*N(FRU_2%C1byDM~d;%{Iy`
zFEckWPRl5(%qh<_sY*@F%oTE|Wo^}bx%d5*Sx4q7wQu^*{jh&wK$gukjlQ6!w<^zC
z3zgkZ3FJ7HbjEJnE2pg~YAb1T`}pU#Pwl?`TRqWK?I))MgOaq7p^>q!fr+l6afpG1
zm4T&|siB^QrJ=E<S(FBYK|@2&;)Vwgo@zTe>@n<!o|gYaBJJ~|IW03En%lno_{lPF
zQk|ZR{(_5rEpB|m#$P+yPV^r%e!;cD{!3W?HG_H0iq2jq{@eET9I|5Yn##B|IV8kK
zTKjY}14}XkLuy!JPHAcc<pGfqoLX3#nwOl)kO4F@GbOX6G6J8!a$u@LDhpB>00{M&
AZ2$lO

literal 0
HcmV?d00001

diff --git a/test/sharness/t0123-gateway-json-cbor/k51qzi5uqu5dhjghbwdvbo6mi40htrq6e2z4pwgp15pgv3ho1azvidttzh8yy2.ipns-record b/test/sharness/t0123-gateway-json-cbor/k51qzi5uqu5dhjghbwdvbo6mi40htrq6e2z4pwgp15pgv3ho1azvidttzh8yy2.ipns-record
new file mode 100644
index 0000000000000000000000000000000000000000..28676f4d9a8824989d039a03376aeea9ae63d0d3
GIT binary patch
literal 398
zcmd;b*3T?RE7ng+OfM}=O)W~yH7(7`Dl96`NUcmPsWdJ(O;0J#&95>m%Pc8L&M3>s
zHa9W`DyYad&q&O!$WAdauP799P;T3(=A&^x$Y#D|lG@q>LT5|;wEh}r>YUo65W?xX
z)~)KP*_E#3s?1Ys{Wt72pZosTYWup`{b6o#URK<3lJD3g7?h-q42_I+4NP<mjYAA9
ztPCuzj12V*O)bq$OrkUx3>q4G7B@V2@KoE$;q~X{`u_XeTsd(Ml(;WP%n0C_P+X~(
z`|*~;{f_SyrzS~i|89=(;gu+H(2(HipQ0Kl{`~X07?TnkT`#}eZV&jprZX;04hiv*
z);`_Lz>>_skQ$blQ<@q<jiAT~PAx1=%}Y*Y$N(CenUYyj8G+AdIWScrl?AB`08}fK
AYXATM

literal 0
HcmV?d00001

diff --git a/test/sharness/t0124-gateway-ipns-record.sh b/test/sharness/t0124-gateway-ipns-record.sh
index cff00aa84..1d05b5698 100755
--- a/test/sharness/t0124-gateway-ipns-record.sh
+++ b/test/sharness/t0124-gateway-ipns-record.sh
@@ -7,10 +7,16 @@ test_description="Test HTTP Gateway IPNS Record (application/vnd.ipfs.ipns-recor
 test_init_ipfs
 test_launch_ipfs_daemon
 
+# Import test case
+# See the static fixtures in ./t0124-gateway-ipns-record/
+IPNS_KEY=k51qzi5uqu5dh71qgwangrt6r0nd4094i88nsady6qgd1dhjcyfsaqmpp143ab
+FILE_CID=bafkreidfdrlkeq4m4xnxuyx6iae76fdm4wgl5d4xzsb77ixhyqwumhz244 # A file containing Hello IPFS
+test_expect_success "Add the test directory & IPNS records" '
+  ipfs dag import ../t0124-gateway-ipns-record/fixtures.car &&
+  ipfs routing put /ipns/${IPNS_KEY} ../t0124-gateway-ipns-record/${IPNS_KEY}.ipns-record
+'
+
 test_expect_success "Create and Publish IPNS Key" '
-  FILE_CID=$(echo "Hello IPFS" | ipfs add --cid-version 1 -q) &&
-  IPNS_KEY=$(ipfs key gen ipns-record) &&
-  ipfs name publish /ipfs/$FILE_CID --key=ipns-record --ttl=30m &&
   curl "http://127.0.0.1:$GWAY_PORT/ipns/$IPNS_KEY" > curl_output_filename &&
   test_should_contain "Hello IPFS" curl_output_filename
 '
@@ -31,14 +37,14 @@ test_expect_success "GET KEY with format=ipns-record has expected HTTP headers"
   curl -sD - "http://127.0.0.1:$GWAY_PORT/ipns/$IPNS_KEY?format=ipns-record" > curl_output_filename 2>&1 &&
   test_should_contain "Content-Disposition: attachment;" curl_output_filename &&
   test_should_contain "Content-Type: application/vnd.ipfs.ipns-record" curl_output_filename &&
-  test_should_contain "Cache-Control: public, max-age=1800" curl_output_filename
+  test_should_contain "Cache-Control: public, max-age=3155760000" curl_output_filename
 '
 
 test_expect_success "GET KEY with 'Accept: application/vnd.ipfs.ipns-record' has expected HTTP headers" '
   curl -H "Accept: application/vnd.ipfs.ipns-record" -sD - "http://127.0.0.1:$GWAY_PORT/ipns/$IPNS_KEY" > curl_output_filename 2>&1 &&
   test_should_contain "Content-Disposition: attachment;" curl_output_filename &&
   test_should_contain "Content-Type: application/vnd.ipfs.ipns-record" curl_output_filename &&
-  test_should_contain "Cache-Control: public, max-age=1800" curl_output_filename
+  test_should_contain "Cache-Control: public, max-age=3155760000" curl_output_filename
 '
 
 test_expect_success "GET KEY with expliciy ?filename= succeeds with modified Content-Disposition header" '
diff --git a/test/sharness/t0124-gateway-ipns-record/README.md b/test/sharness/t0124-gateway-ipns-record/README.md
new file mode 100644
index 000000000..8ada577d4
--- /dev/null
+++ b/test/sharness/t0124-gateway-ipns-record/README.md
@@ -0,0 +1,27 @@
+# Dataset description/sources
+
+- fixtures.car
+  - raw CARv1
+
+- k51....ipns-record
+  - ipns record, encoded with protocol buffer
+
+generated with:
+
+```sh
+# using ipfs version 0.21.0-dev (03a98280e3e642774776cd3d0435ab53e5dfa867)
+FILE_CID=$(echo "Hello IPFS" | ipfs add --cid-version 1 -q)
+IPNS_KEY=$(ipfs key gen ipns-record)
+
+ipfs dag export ${FILE_CID} > fixtures.car
+
+# publish a record valid for a 100 years
+ipfs name publish --key=ipns-record --quieter --ttl=876600h --lifetime=876600h /ipfs/${FILE_CID}
+ipfs routing get /ipns/${IPNS_KEY} > ${IPNS_KEY}.ipns-record
+
+echo IPNS_KEY=${IPNS_KEY}
+echo FILE_CID=${FILE_CID} # A file containing "Hello IPFS"
+
+# IPNS_KEY=k51qzi5uqu5dh71qgwangrt6r0nd4094i88nsady6qgd1dhjcyfsaqmpp143ab
+# FILE_CID=bafkreidfdrlkeq4m4xnxuyx6iae76fdm4wgl5d4xzsb77ixhyqwumhz244 # A file containing Hello IPFS
+```
diff --git a/test/sharness/t0124-gateway-ipns-record/fixtures.car b/test/sharness/t0124-gateway-ipns-record/fixtures.car
new file mode 100644
index 0000000000000000000000000000000000000000..5c541e430ea6d1aed7c20545c40c9a56994ac546
GIT binary patch
literal 107
zcmcColv<RZUsBw7Ln}g+fiYA_Ayp=9k#o<}+f_;b960}r<UH-!*FXJC^Z!N9kLbF|
eTRl%NOD!tS%+F)gCq}hLYEDkRf@gqRFc$y|Rxl6%

literal 0
HcmV?d00001

diff --git a/test/sharness/t0124-gateway-ipns-record/k51qzi5uqu5dh71qgwangrt6r0nd4094i88nsady6qgd1dhjcyfsaqmpp143ab.ipns-record b/test/sharness/t0124-gateway-ipns-record/k51qzi5uqu5dh71qgwangrt6r0nd4094i88nsady6qgd1dhjcyfsaqmpp143ab.ipns-record
new file mode 100644
index 0000000000000000000000000000000000000000..ec13ec550162b81f44b35a6ab54b4dd9cdd11707
GIT binary patch
literal 392
zcmd;b)XywPE7ng+Ov^4x%}hy4Day%CEi}nBsmQA+t*kK1OiVR5OH0W$DNoNaO);sc
zDo!#t&#cI(EG#e0&8RXmF%fe3WvzU>SFJ04j^dIZkA-4vOEfq6H0ie39ZWWO|7T-n
zhTD&u+CmfaOSEsE-5&R2o=I`u(JdVUdxTlHr4_DQ%+Dynpd@8vXk@HwV4`bi6k=#>
zWo%|;YN2OjY;I&8rNLm((9pBE;lYEa+D;DZwog8P;JtWuR2%!>xl6YFEuU6)>E){C
z#}a3ym{+MAwLQ!K{b1W$zOv&|S}J#Rzj~K(y{i5eAFDB8+QsA7xBcYvn!>m=IV8kK
zTKjY}14}XkLuy!JPHAcc<>8PKoLX3#nwOl)kO4F@GbOX6G6Ijca$t%=DhpB>023mb
A4*&oF

literal 0
HcmV?d00001


From 196b5c16c00faac96438368f0a0d9f9ef0d7169f Mon Sep 17 00:00:00 2001
From: Marcin Rataj <lidel@lidel.org>
Date: Mon, 8 May 2023 14:20:51 +0200
Subject: [PATCH 14/17] docs(config): remove mentions of relay v1 (#9860)

Context: https://github.com/ipfs/interop/pull/592
---
 docs/config.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/config.md b/docs/config.md
index bb2d8b702..91866a423 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -1622,8 +1622,8 @@ Type: `flag`
 
 #### `Swarm.RelayClient.StaticRelays`
 
-Your node will use these statically configured relay servers (V1 or V2)
-instead of discovering public relays V2 from the network.
+Your node will use these statically configured relay servers
+instead of discovering public relays ([Circuit Relay v2](https://github.com/libp2p/specs/blob/master/relay/circuit-v2.md)) from the network.
 
 Default: `[]`
 

From c178c51835f89f7b8d9e46962fe5e5d3dd3b2a69 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Mon, 8 May 2023 16:11:03 +0200
Subject: [PATCH 15/17] fix: deadlock on retrieving WebTransport addresses
 (#9857)

Co-authored-by: Marco Polo <git@marcopolo.io>
---
 core/mock/mock.go                      | 11 +++++++-
 core/node/groups.go                    |  2 +-
 core/node/libp2p/addrs.go              | 38 ++++----------------------
 docs/examples/kubo-as-a-library/go.mod |  2 +-
 docs/examples/kubo-as-a-library/go.sum |  4 +--
 go.mod                                 |  2 +-
 go.sum                                 |  4 +--
 test/cli/harness/peering.go            |  4 +--
 test/cli/transports_test.go            | 23 ++++++++++++++++
 9 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/core/mock/mock.go b/core/mock/mock.go
index 7b718c43e..f9e0876f8 100644
--- a/core/mock/mock.go
+++ b/core/mock/mock.go
@@ -34,7 +34,16 @@ func NewMockNode() (*core.IpfsNode, error) {
 }
 
 func MockHostOption(mn mocknet.Mocknet) libp2p2.HostOption {
-	return func(id peer.ID, ps pstore.Peerstore, _ ...libp2p.Option) (host.Host, error) {
+	return func(id peer.ID, ps pstore.Peerstore, opts ...libp2p.Option) (host.Host, error) {
+		var cfg libp2p.Config
+		if err := cfg.Apply(opts...); err != nil {
+			return nil, err
+		}
+
+		// The mocknet does not use the provided libp2p.Option. This options include
+		// the listening addresses we want our peer listening on. Therefore, we have
+		// to manually parse the configuration and add them here.
+		ps.AddAddrs(id, cfg.ListenAddrs, pstore.PermanentAddrTTL)
 		return mn.AddPeerWithPeerstore(id, ps)
 	}
 }
diff --git a/core/node/groups.go b/core/node/groups.go
index ae8ce8539..548678835 100644
--- a/core/node/groups.go
+++ b/core/node/groups.go
@@ -155,7 +155,7 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config, userResourceOverrides rcmgr.Part
 		fx.Provide(libp2p.RelayTransport(enableRelayTransport)),
 		fx.Provide(libp2p.RelayService(enableRelayService, cfg.Swarm.RelayService)),
 		fx.Provide(libp2p.Transports(cfg.Swarm.Transports)),
-		fx.Invoke(libp2p.StartListening(cfg.Addresses.Swarm)),
+		fx.Provide(libp2p.ListenOn(cfg.Addresses.Swarm)),
 		fx.Invoke(libp2p.SetupDiscovery(cfg.Discovery.MDNS.Enabled)),
 		fx.Provide(libp2p.ForceReachability(cfg.Internal.Libp2pForceReachability)),
 		fx.Provide(libp2p.HolePunching(cfg.Swarm.EnableHolePunching, enableRelayClient)),
diff --git a/core/node/libp2p/addrs.go b/core/node/libp2p/addrs.go
index 480b045f8..b287c20ff 100644
--- a/core/node/libp2p/addrs.go
+++ b/core/node/libp2p/addrs.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/libp2p/go-libp2p"
-	"github.com/libp2p/go-libp2p/core/host"
 	p2pbhost "github.com/libp2p/go-libp2p/p2p/host/basic"
 	ma "github.com/multiformats/go-multiaddr"
 	mamask "github.com/whyrusleeping/multiaddr-filter"
@@ -99,37 +98,12 @@ func AddrsFactory(announce []string, appendAnnouce []string, noAnnounce []string
 	}
 }
 
-func listenAddresses(addresses []string) ([]ma.Multiaddr, error) {
-	listen := make([]ma.Multiaddr, len(addresses))
-	for i, addr := range addresses {
-		maddr, err := ma.NewMultiaddr(addr)
-		if err != nil {
-			return nil, fmt.Errorf("failure to parse config.Addresses.Swarm: %s", addresses)
+func ListenOn(addresses []string) interface{} {
+	return func() (opts Libp2pOpts) {
+		return Libp2pOpts{
+			Opts: []libp2p.Option{
+				libp2p.ListenAddrStrings(addresses...),
+			},
 		}
-		listen[i] = maddr
-	}
-
-	return listen, nil
-}
-
-func StartListening(addresses []string) func(host host.Host) error {
-	return func(host host.Host) error {
-		listenAddrs, err := listenAddresses(addresses)
-		if err != nil {
-			return err
-		}
-
-		// Actually start listening:
-		if err := host.Network().Listen(listenAddrs...); err != nil {
-			return err
-		}
-
-		// list out our addresses
-		addrs, err := host.Network().InterfaceListenAddresses()
-		if err != nil {
-			return err
-		}
-		log.Infof("Swarm listening at: %s", addrs)
-		return nil
 	}
 }
diff --git a/docs/examples/kubo-as-a-library/go.mod b/docs/examples/kubo-as-a-library/go.mod
index fd3ad8909..3c35f0e84 100644
--- a/docs/examples/kubo-as-a-library/go.mod
+++ b/docs/examples/kubo-as-a-library/go.mod
@@ -9,7 +9,7 @@ replace github.com/ipfs/kubo => ./../../..
 require (
 	github.com/ipfs/boxo v0.8.2-0.20230503105907-8059f183d866
 	github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
-	github.com/libp2p/go-libp2p v0.27.1
+	github.com/libp2p/go-libp2p v0.27.2
 	github.com/multiformats/go-multiaddr v0.9.0
 )
 
diff --git a/docs/examples/kubo-as-a-library/go.sum b/docs/examples/kubo-as-a-library/go.sum
index 15bf75e82..c3ccc9ae3 100644
--- a/docs/examples/kubo-as-a-library/go.sum
+++ b/docs/examples/kubo-as-a-library/go.sum
@@ -489,8 +489,8 @@ github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZ
 github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
 github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=
 github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro=
-github.com/libp2p/go-libp2p v0.27.1 h1:k1u6RHsX3hqKnslDjsSgLNURxJ3O1atIZCY4gpMbbus=
-github.com/libp2p/go-libp2p v0.27.1/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
+github.com/libp2p/go-libp2p v0.27.2 h1:I1fxqxdm/O0TFoAZKje8wSMu9tfLlLdzTQvgT3HA6v0=
+github.com/libp2p/go-libp2p v0.27.2/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
 github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s=
 github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
 github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=
diff --git a/go.mod b/go.mod
index 159bbd3e4..6cb0108d8 100644
--- a/go.mod
+++ b/go.mod
@@ -45,7 +45,7 @@ require (
 	github.com/jbenet/goprocess v0.1.4
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/libp2p/go-doh-resolver v0.4.0
-	github.com/libp2p/go-libp2p v0.27.1
+	github.com/libp2p/go-libp2p v0.27.2
 	github.com/libp2p/go-libp2p-http v0.5.0
 	github.com/libp2p/go-libp2p-kad-dht v0.23.0
 	github.com/libp2p/go-libp2p-kbucket v0.5.0
diff --git a/go.sum b/go.sum
index 16d312ef5..e136c5c00 100644
--- a/go.sum
+++ b/go.sum
@@ -540,8 +540,8 @@ github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZ
 github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
 github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=
 github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro=
-github.com/libp2p/go-libp2p v0.27.1 h1:k1u6RHsX3hqKnslDjsSgLNURxJ3O1atIZCY4gpMbbus=
-github.com/libp2p/go-libp2p v0.27.1/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
+github.com/libp2p/go-libp2p v0.27.2 h1:I1fxqxdm/O0TFoAZKje8wSMu9tfLlLdzTQvgT3HA6v0=
+github.com/libp2p/go-libp2p v0.27.2/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
 github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s=
 github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
 github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=
diff --git a/test/cli/harness/peering.go b/test/cli/harness/peering.go
index 3fcd8bb6b..13c3430f0 100644
--- a/test/cli/harness/peering.go
+++ b/test/cli/harness/peering.go
@@ -13,7 +13,7 @@ type Peering struct {
 	To   int
 }
 
-func newRandPort() int {
+func NewRandPort() int {
 	n := rand.Int()
 	return 3000 + (n % 1000)
 }
@@ -24,7 +24,7 @@ func CreatePeerNodes(t *testing.T, n int, peerings []Peering) (*Harness, Nodes)
 	nodes.ForEachPar(func(node *Node) {
 		node.UpdateConfig(func(cfg *config.Config) {
 			cfg.Routing.Type = config.NewOptionalString("none")
-			cfg.Addresses.Swarm = []string{fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", newRandPort())}
+			cfg.Addresses.Swarm = []string{fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", NewRandPort())}
 		})
 
 	})
diff --git a/test/cli/transports_test.go b/test/cli/transports_test.go
index 78f21fd05..3a7b5ed93 100644
--- a/test/cli/transports_test.go
+++ b/test/cli/transports_test.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
@@ -124,4 +125,26 @@ func TestTransports(t *testing.T) {
 		runTests(nodes)
 	})
 
+	t.Run("QUIC connects with non-dialable transports", func(t *testing.T) {
+		// This test targets specific Kubo internals which may change later. This checks
+		// if we can announce an address we do not listen on, and then are able to connect
+		// via a different address that is available.
+		t.Parallel()
+		nodes := harness.NewT(t).NewNodes(5).Init()
+		nodes.ForEachPar(func(n *harness.Node) {
+			n.UpdateConfig(func(cfg *config.Config) {
+				// We need a specific port to announce so we first generate a random port.
+				// We can't use 0 here to automatically assign an available port because
+				// that would only work with Swarm, but not for the announcing.
+				port := harness.NewRandPort()
+				quicAddr := fmt.Sprintf("/ip4/127.0.0.1/udp/%d/quic-v1", port)
+				cfg.Addresses.Swarm = []string{quicAddr}
+				cfg.Addresses.Announce = []string{quicAddr, quicAddr + "/webtransport"}
+			})
+		})
+		disableRouting(nodes)
+		nodes.StartDaemons().Connect()
+		runTests(nodes)
+	})
+
 }

From c39b8052ea39132b230cbffe0b0942956a605b4d Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Tue, 9 May 2023 10:59:05 +0200
Subject: [PATCH 16/17] chore: update go-libp2p to v0.27.3 (#9862)

---
 docs/examples/kubo-as-a-library/go.mod | 2 +-
 docs/examples/kubo-as-a-library/go.sum | 4 ++--
 go.mod                                 | 2 +-
 go.sum                                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/examples/kubo-as-a-library/go.mod b/docs/examples/kubo-as-a-library/go.mod
index 3c35f0e84..6a54fcad3 100644
--- a/docs/examples/kubo-as-a-library/go.mod
+++ b/docs/examples/kubo-as-a-library/go.mod
@@ -9,7 +9,7 @@ replace github.com/ipfs/kubo => ./../../..
 require (
 	github.com/ipfs/boxo v0.8.2-0.20230503105907-8059f183d866
 	github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
-	github.com/libp2p/go-libp2p v0.27.2
+	github.com/libp2p/go-libp2p v0.27.3
 	github.com/multiformats/go-multiaddr v0.9.0
 )
 
diff --git a/docs/examples/kubo-as-a-library/go.sum b/docs/examples/kubo-as-a-library/go.sum
index c3ccc9ae3..1ac6f8afd 100644
--- a/docs/examples/kubo-as-a-library/go.sum
+++ b/docs/examples/kubo-as-a-library/go.sum
@@ -489,8 +489,8 @@ github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZ
 github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
 github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=
 github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro=
-github.com/libp2p/go-libp2p v0.27.2 h1:I1fxqxdm/O0TFoAZKje8wSMu9tfLlLdzTQvgT3HA6v0=
-github.com/libp2p/go-libp2p v0.27.2/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
+github.com/libp2p/go-libp2p v0.27.3 h1:tkV/zm3KCZ4R5er9Xcs2pt0YNB4JH0iBfGAtHJdLHRs=
+github.com/libp2p/go-libp2p v0.27.3/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
 github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s=
 github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
 github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=
diff --git a/go.mod b/go.mod
index 6cb0108d8..95f326b14 100644
--- a/go.mod
+++ b/go.mod
@@ -45,7 +45,7 @@ require (
 	github.com/jbenet/goprocess v0.1.4
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/libp2p/go-doh-resolver v0.4.0
-	github.com/libp2p/go-libp2p v0.27.2
+	github.com/libp2p/go-libp2p v0.27.3
 	github.com/libp2p/go-libp2p-http v0.5.0
 	github.com/libp2p/go-libp2p-kad-dht v0.23.0
 	github.com/libp2p/go-libp2p-kbucket v0.5.0
diff --git a/go.sum b/go.sum
index e136c5c00..6eaf0919e 100644
--- a/go.sum
+++ b/go.sum
@@ -540,8 +540,8 @@ github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZ
 github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
 github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=
 github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro=
-github.com/libp2p/go-libp2p v0.27.2 h1:I1fxqxdm/O0TFoAZKje8wSMu9tfLlLdzTQvgT3HA6v0=
-github.com/libp2p/go-libp2p v0.27.2/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
+github.com/libp2p/go-libp2p v0.27.3 h1:tkV/zm3KCZ4R5er9Xcs2pt0YNB4JH0iBfGAtHJdLHRs=
+github.com/libp2p/go-libp2p v0.27.3/go.mod h1:FAvvfQa/YOShUYdiSS03IR9OXzkcJXwcNA2FUCh9ImE=
 github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s=
 github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
 github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=

From c9a8d9ff92c7a578209167e38c898fc1e849de67 Mon Sep 17 00:00:00 2001
From: Piotr Galar <piotr.galar@gmail.com>
Date: Tue, 9 May 2023 12:53:56 +0200
Subject: [PATCH 17/17] ci: simplify self-hosted runner selection (#9813)

* ci: simplify self-hosted runner selection

* ci: put interop jobs on self-hosted runners
---
 .github/workflows/build.yml    | 34 +++++++++++++++++++++++++---------
 .github/workflows/gobuild.yml  |  7 ++-----
 .github/workflows/gotest.yml   | 12 ++++++------
 .github/workflows/runner.yml   | 34 ----------------------------------
 .github/workflows/sharness.yml | 20 +++++++++-----------
 5 files changed, 42 insertions(+), 65 deletions(-)
 delete mode 100644 .github/workflows/runner.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1f16d9bf3..e59532597 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,6 +14,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event_name == 'push' && github.sha || github.ref }}
   cancel-in-progress: true
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   interop-prep:
     if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
@@ -44,7 +48,7 @@ jobs:
           path: cmd/ipfs/ipfs
   interop:
     needs: [interop-prep]
-    runs-on: ubuntu-latest
+    runs-on: ${{ fromJSON(github.repository == 'ipfs/kubo' && '["self-hosted", "linux", "x64", "2xlarge"]' || '"ubuntu-latest"') }}
     timeout-minutes: 20
     defaults:
       run:
@@ -75,7 +79,7 @@ jobs:
           npm install ipfs-interop@^10.0.1
         working-directory: interop
       # Run the interop tests while ignoring the js-js interop test cases
-      - run: npx ipfs-interop -- -t node --grep '^(?!.*(js\d? -> js\d?|js-js-js))'
+      - run: npx ipfs-interop -- -t node --grep '^(?!.*(js\d? -> js\d?|js-js-js))' --parallel
         env:
           LIBP2P_TCP_REUSEPORT: false
           LIBP2P_ALLOW_WEAK_RSA_KEYS: 1
@@ -156,7 +160,7 @@ jobs:
         working-directory: go-ipfs-http-client
   ipfs-webui:
     needs: [interop-prep]
-    runs-on: ubuntu-latest
+    runs-on: ${{ fromJSON(github.repository == 'ipfs/kubo' && '["self-hosted", "linux", "x64", "2xlarge"]' || '"ubuntu-latest"') }}
     timeout-minutes: 20
     env:
       NO_SANDBOX: true
@@ -191,14 +195,26 @@ jobs:
           key: ${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-${{ github.job }}-
-      - run: |
-          npm ci --prefer-offline --no-audit --progress=false
-          npx playwright install
+      - env:
+          NPM_CACHE_DIR: ${{ steps.npm-cache-dir.outputs.dir }}
+        run: |
+          npm ci --prefer-offline --no-audit --progress=false --cache "$NPM_CACHE_DIR"
+          npx playwright install --with-deps
         working-directory: ipfs-webui
-      - name: Run ipfs-webui@main build and smoke-test to confirm the upstream repo is not broken
-        run: npm test
+      - id: ref
+        run: echo "ref=$(git rev-parse --short HEAD)" | tee -a $GITHUB_OUTPUT
         working-directory: ipfs-webui
-      - name: Test ipfs-webui@main E2E against the locally built Kubo binary
+      - id: state
+        env:
+          GITHUB_REPOSITORY: ipfs/ipfs-webui
+          GITHUB_REF: ${{ steps.ref.outputs.ref }}
+          GITHUB_TOKEN: ${{ github.token }}
+        run: |
+          echo "state=$(curl -L -H "Authorization: Bearer $GITHUB_TOKEN" "https://api.github.com/repos/$GITHUB_REPOSITORY/commits/$GITHUB_REF/status" --jq '.state')" | tee -a $GITHUB_OUTPUT
+      - name: Build ipfs-webui@main (state=${{ steps.state.outputs.state }})
+        run: npm run test:build
+        working-directory: ipfs-webui
+      - name: Test ipfs-webui@main (state=${{ steps.state.outputs.state }}) E2E against the locally built Kubo binary
         run: npm run test:e2e
         env:
           IPFS_GO_EXEC: ${{ github.workspace }}/cmd/ipfs/ipfs
diff --git a/.github/workflows/gobuild.yml b/.github/workflows/gobuild.yml
index f1e3a60b7..8591213c4 100644
--- a/.github/workflows/gobuild.yml
+++ b/.github/workflows/gobuild.yml
@@ -12,12 +12,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  go-build-runner:
-    if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
-    uses: ipfs/kubo/.github/workflows/runner.yml@master
   go-build:
-    needs: [go-build-runner]
-    runs-on: ${{ fromJSON(needs.go-build-runner.outputs.config).labels }}
+    if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
+    runs-on: ${{ fromJSON(github.repository == 'ipfs/kubo' && '["self-hosted", "linux", "x64", "4xlarge"]' || '"ubuntu-latest"') }}
     timeout-minutes: 20
     env:
       TEST_DOCKER: 0
diff --git a/.github/workflows/gotest.yml b/.github/workflows/gotest.yml
index 81c39fd5e..b20dca2a3 100644
--- a/.github/workflows/gotest.yml
+++ b/.github/workflows/gotest.yml
@@ -12,12 +12,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  go-test-runner:
-    if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
-    uses: ipfs/kubo/.github/workflows/runner.yml@master
   go-test:
-    needs: [go-test-runner]
-    runs-on: ${{ fromJSON(needs.go-test-runner.outputs.config).labels }}
+    if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
+    runs-on: ${{ fromJSON(github.repository == 'ipfs/kubo' && '["self-hosted", "linux", "x64", "2xlarge"]' || '"ubuntu-latest"') }}
     timeout-minutes: 20
     env:
       TEST_DOCKER: 0
@@ -41,8 +38,11 @@ jobs:
         with:
           name: ${{ github.job }}
       - name: 👉️ If this step failed, go to «Summary» (top left) → inspect the «Failures/Errors» table
+        env:
+          # increasing parallelism beyond 2 doesn't speed up the tests much
+          PARALLEL: 2
         run: |
-          make -j 2 test/unit/gotest.junit.xml &&
+          make -j "$PARALLEL" test/unit/gotest.junit.xml &&
             [[ ! $(jq -s -c 'map(select(.Action == "fail")) | .[]' test/unit/gotest.json) ]]
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
diff --git a/.github/workflows/runner.yml b/.github/workflows/runner.yml
deleted file mode 100644
index 74a8b41d7..000000000
--- a/.github/workflows/runner.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Runner
-
-on:
-  workflow_call:
-    outputs:
-      config:
-        description: "The runner's configuration"
-        value: ${{ jobs.choose.outputs.config }}
-
-jobs:
-  choose:
-    runs-on: ubuntu-latest
-    timeout-minutes: 1
-    outputs:
-      config: ${{ steps.config.outputs.result }}
-    steps:
-      - uses: actions/github-script@v6
-        id: config
-        with:
-          script: |
-            if (`${context.repo.owner}/${context.repo.repo}` === 'ipfs/kubo') {
-              return {
-                labels: ['self-hosted', 'linux', 'x64', 'kubo'],
-                parallel: 10,
-                aws: true
-              }
-            } else {
-              return {
-                labels: ['ubuntu-latest'],
-                parallel: 3,
-                aws: false
-              }
-            }
-      - run: echo ${{ steps.config.outputs.result }}
diff --git a/.github/workflows/sharness.yml b/.github/workflows/sharness.yml
index 2d9dfb41d..a4c2241be 100644
--- a/.github/workflows/sharness.yml
+++ b/.github/workflows/sharness.yml
@@ -12,12 +12,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  sharness-runner:
-    if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
-    uses: ipfs/kubo/.github/workflows/runner.yml@master
   sharness-test:
-    needs: [sharness-runner]
-    runs-on: ${{ fromJSON(needs.sharness-runner.outputs.config).labels }}
+    if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
+    runs-on: ${{ fromJSON(github.repository == 'ipfs/kubo' && '["self-hosted", "linux", "x64", "4xlarge"]' || '"ubuntu-latest"') }}
     timeout-minutes: 20
     defaults:
       run:
@@ -57,7 +54,8 @@ jobs:
           TEST_EXPENSIVE: 1
           IPFS_CHECK_RCMGR_DEFAULTS: 1
           CONTINUE_ON_S_FAILURE: 1
-          PARALLEL: ${{ fromJSON(needs.sharness-runner.outputs.config).parallel }}
+          # increasing parallelism beyond 10 doesn't speed up the tests much
+          PARALLEL: ${{ github.repository == 'ipfs/kubo' && 10 || 3 }}
       - name: Upload coverage report
         uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
         if: failure() || success()
@@ -86,12 +84,12 @@ jobs:
       - name: Upload one-page HTML report to S3
         id: one-page
         uses: pl-strflt/tf-aws-gh-runner/.github/actions/upload-artifact@main
-        if: fromJSON(needs.sharness-runner.outputs.config).aws && (failure() || success())
+        if: github.repository == 'ipfs/kubo' && (failure() || success())
         with:
           source: kubo/test/sharness/test-results/sharness.html
           destination: sharness.html
       - name: Upload one-page HTML report
-        if: (! fromJSON(needs.sharness-runner.outputs.config).aws) && (failure() || success())
+        if: github.repository != 'ipfs/kubo' && (failure() || success())
         uses: actions/upload-artifact@v3
         with:
           name: sharness.html
@@ -106,18 +104,18 @@ jobs:
       - name: Upload full HTML report to S3
         id: full
         uses: pl-strflt/tf-aws-gh-runner/.github/actions/upload-artifact@main
-        if: fromJSON(needs.sharness-runner.outputs.config).aws && (failure() || success())
+        if: github.repository == 'ipfs/kubo' && (failure() || success())
         with:
           source: kubo/test/sharness/test-results/sharness-html
           destination: sharness-html/
       - name: Upload full HTML report
-        if: (! fromJSON(needs.sharness-runner.outputs.config).aws) && (failure() || success())
+        if: github.repository != 'ipfs/kubo' && (failure() || success())
         uses: actions/upload-artifact@v3
         with:
           name: sharness-html
           path: kubo/test/sharness/test-results/sharness-html
       - name: Add S3 links to the summary
-        if: fromJSON(needs.sharness-runner.outputs.config).aws && (failure() || success())
+        if: github.repository == 'ipfs/kubo' && (failure() || success())
         run: echo "$MD" >> $GITHUB_STEP_SUMMARY
         env:
           MD: |