Merge branch 'master' into chore/update-patch-release-template-0.13.1

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -22,7 +22,7 @@ body:
           required: true
         - label: I have searched on the [issue tracker](https://github.com/ipfs/kubo/issues?q=is%3Aissue) for my bug.
           required: true
-        - label: I am running the latest [kubo version](https://dist.ipfs.io/#kubo) or have an issue updating.
+        - label: I am running the latest [kubo version](https://dist.ipfs.tech/#kubo) or have an issue updating.
           required: true
   - type: dropdown
     id: install
@@ -33,7 +33,7 @@ body:
       description: Please select your installation method
       options:
         - ipfs-desktop
-        - ipfs-update or dist.ipfs.io
+        - ipfs-update or dist.ipfs.tech
         - third-party binary
         - built from source
   - type: textarea

.github/ISSUE_TEMPLATE/config.yml

@@ -10,7 +10,7 @@ contact_links:
    url: https://github.com/ipfs/kubo/blob/master/docs/experimental-features.md#readme
    about: Documentation on Private Networks, Filestore and other experimental features.
  - name: RPC API Reference
-   url: https://docs.ipfs.io/reference/http/api/
+   url: https://docs.ipfs.tech/reference/kubo/rpc/
    about: Documentation of all Kubo RPC API endpoints.
  - name: IPFS Official Forum
    url: https://discuss.ipfs.io

.github/ISSUE_TEMPLATE/doc.yml

@@ -7,13 +7,13 @@ body:
   - type: markdown
     attributes:
       value: |
-        Problems with documentation on https://docs.ipfs.io should be reported to https://github.com/ipfs/ipfs-docs
+        Problems with documentation on https://docs.ipfs.tech should be reported to https://github.com/ipfs/ipfs-docs
   - type: checkboxes
     attributes:
       label: Checklist
       description: Please verify the following.
       options:
-        - label: I am reporting a documentation issue in this repo, not https://docs.ipfs.io.
+        - label: I am reporting a documentation issue in this repo, not https://docs.ipfs.tech.
           required: true
         - label: I have searched on the [issue tracker](https://github.com/ipfs/kubo/issues?q=is%3Aissue) for my issue.
           required: true

.github/workflows/sync-release-assets.yml

@@ -1,4 +1,4 @@
-name: Sync github release assets with dist.ipfs.io
+name: Sync github release assets with dist.ipfs.tech
 
 on:
   workflow_dispatch:
@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  sync-github-and-dist-ipfs-io:
+  sync-github-and-dist.ipfs.tech:
     if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
     runs-on: "ubuntu-latest"
     steps:
@@ -50,8 +50,8 @@ jobs:
                 github_assets.add(asset.name)
               }
 
-              // fetch asset info from dist.ipfs.io
-              p = '/ipns/dist.ipfs.io/kubo/' + release.tag_name
+              // fetch asset info from dist.ipfs.tech
+              p = '/ipns/dist.ipfs.tech/kubo/' + release.tag_name
               let stdout = ''
               const options = {}
               options.listeners = {
@@ -74,20 +74,20 @@ jobs:
                 }
               }
 
-              // if dist.ipfs.io has files not found in github, copy them over
+              // if dist.ipfs.tech has files not found in github, copy them over
               for (const file of missing_files) {
                 file_sha = file + ".sha512"
                 file_cid = file + ".cid"
 
                 // skip files that don't have .cid and .sha512 checksum files
                 if (!dist_assets.has(file_sha) || !dist_assets.has(file_cid)) {
                   if (!file.endsWith('.cid') && !file.endsWith('.sha512')) { // silent skip of .sha512.sha512 :)
-                    console.log(`skipping "${file}" as dist.ipfs.io does not provide .cid and .sha512 checksum files for it`)
+                    console.log(`skipping "${file}" as dist.ipfs.tech does not provide .cid and .sha512 checksum files for it`)
                   }
                   continue
                 }
 
-                console.log("fetching", file, "from dist.ipfs.io")
+                console.log("fetching", file, "from dist.ipfs.tech")
                 await exec.exec('ipfs', ['get', p + '/' + file])
                 await exec.exec('ipfs', ['get', p + '/' + file_sha])
                 await exec.exec('ipfs', ['get', p + '/' + file_cid])

README.md

@@ -14,25 +14,25 @@ Kubo (go-ipfs) the earliest and most widely used implementation of IPFS.
 
 It includes:
 - an IPFS daemon server
-- extensive [command line tooling](https://docs.ipfs.io/reference/cli/)
+- extensive [command line tooling](https://docs.ipfs.tech/reference/kubo/cli/)
 - an [HTTP Gateway](https://github.com/ipfs/specs/tree/main/http-gateways#readme) (`/ipfs/`, `/ipns/`) for serving content to HTTP browsers
 - an HTTP RPC API (`/api/v0`) for controlling the daemon node
 
-Note: [other implementations exist](https://docs.ipfs.io/basics/ipfs-implementations/).
+Note: [other implementations exist](https://docs.ipfs.tech/basics/ipfs-implementations/).
 
 ## What is IPFS?
 
 IPFS is a global, versioned, peer-to-peer filesystem. It combines good ideas from previous systems such as Git, BitTorrent, Kademlia, SFS, and the Web. It is like a single BitTorrent swarm, exchanging git objects. IPFS provides an interface as simple as the HTTP web, but with permanence built-in. You can also mount the world at /ipfs.
 
-For more info see: https://docs.ipfs.io/introduction/overview/
+For more info see: https://docs.ipfs.tech/concepts/what-is-ipfs/
 
 Before opening an issue, consider using one of the following locations to ensure you are opening your thread in the right place:
   - kubo (previously named go-ipfs) _implementation_ bugs in [this repo](https://github.com/ipfs/kubo/issues).
   - Documentation issues in [ipfs/docs issues](https://github.com/ipfs/ipfs-docs/issues).
   - IPFS _design_ in [ipfs/specs issues](https://github.com/ipfs/specs/issues).
   - Exploration of new ideas in [ipfs/notes issues](https://github.com/ipfs/notes/issues).
-  - Ask questions and meet the rest of the community at the [IPFS Forum](https://discuss.ipfs.io).
-  - Or [chat with us](https://docs.ipfs.io/community/chat/).
+  - Ask questions and meet the rest of the community at the [IPFS Forum](https://discuss.ipfs.tech).
+  - Or [chat with us](https://docs.ipfs.tech/community/chat/).
 
 [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCdjsUXJ3QawK4O5L1kqqsew?label=Subscribe%20IPFS&style=social&cacheSeconds=3600)](https://www.youtube.com/channel/UCdjsUXJ3QawK4O5L1kqqsew) [![Follow @IPFS on Twitter](https://img.shields.io/twitter/follow/IPFS?style=social&cacheSeconds=3600)](https://twitter.com/IPFS)
 
@@ -97,7 +97,7 @@ Please follow [`SECURITY.md`](SECURITY.md).
 
 ## Install
 
-The canonical download instructions for IPFS are over at: https://docs.ipfs.io/guides/guides/install/. It is **highly recommended** you follow those instructions if you are not interested in working on IPFS development.
+The canonical download instructions for IPFS are over at: https://docs.ipfs.tech/install/. It is **highly recommended** you follow those instructions if you are not interested in working on IPFS development.
 
 ### System Requirements
 
@@ -115,7 +115,7 @@ If your system is resource-constrained, we recommend:
 [![Docker Image Version (latest semver)](https://img.shields.io/docker/v/ipfs/kubo?color=blue&label=kubo%20docker%20image&logo=docker&sort=semver&style=flat-square&cacheSeconds=3600)](https://hub.docker.com/r/ipfs/kubo/)
 -->
 
-More info on how to run kubo (go-ipfs) inside Docker can be found [here](https://docs.ipfs.io/how-to/run-ipfs-inside-docker/).
+More info on how to run kubo (go-ipfs) inside Docker can be found [here](https://docs.ipfs.tech/how-to/run-ipfs-inside-docker/).
 
 ### Native Linux package managers
 
@@ -244,16 +244,16 @@ PS> scoop install go-ipfs
 
 ### Install prebuilt binaries
 
-[![dist.ipfs.io Downloads](https://img.shields.io/github/v/release/ipfs/kubo?label=dist.ipfs.io&logo=ipfs&style=flat-square&cacheSeconds=3600)](https://dweb.link/ipns/dist.ipfs.io#kubo)
+[![dist.ipfs.tech Downloads](https://img.shields.io/github/v/release/ipfs/kubo?label=dist.ipfs.tech&logo=ipfs&style=flat-square&cacheSeconds=3600)](https://dweb.link/ipns/dist.ipfs.tech#kubo)
 
 From there:
 - Click the blue "Download kubo" on the right side of the page.
 - Open/extract the archive.
 - Move kubo (`ipfs`) to your path (`install.sh` can do it for you).
 
-If you are unable to access [dist.ipfs.io](https://dist.ipfs.io#kubo), you can also download kubo (go-ipfs) from:
+If you are unable to access [dist.ipfs.tech](https://dist.ipfs.tech#kubo), you can also download kubo (go-ipfs) from:
 - this project's GitHub [releases](https://github.com/ipfs/kubo/releases/latest) page
-- `/ipns/dist.ipfs.io` at [dweb.link](https://dweb.link/ipns/dist.ipfs.io#kubo) gateway
+- `/ipns/dist.ipfs.tech` at [dweb.link](https://dweb.link/ipns/dist.ipfs.tech#kubo) gateway
 
 ### Build from Source
 
@@ -329,42 +329,42 @@ dependencies as well.
 
 IPFS has an updating tool that can be accessed through `ipfs update`. The tool is
 not installed alongside IPFS in order to keep that logic independent of the main
-codebase. To install `ipfs update`, [download it here](https://ipfs.io/ipns/dist.ipfs.io/#ipfs-update).
+codebase. To install `ipfs update`, [download it here](https://dist.ipfs.tech/#ipfs-update).
 
 #### Downloading builds using IPFS
 
-<!-- TODO: rename this section after we figure out if dist.ipfs.io sgould produce both /go-ipfs/ and /kubo/ -->
+<!-- TODO: rename this section after we figure out if dist.ipfs.tech sgould produce both /go-ipfs/ and /kubo/ -->
 
 List the available versions of kubo (go-ipfs) implementation:
 
 ```
-$ ipfs cat /ipns/dist.ipfs.io/go-ipfs/versions
+$ ipfs cat /ipns/dist.ipfs.tech/go-ipfs/versions
 ```
 
 Then, to view available builds for a version from the previous command ($VERSION):
 
 ```
-$ ipfs ls /ipns/dist.ipfs.io/go-ipfs/$VERSION
+$ ipfs ls /ipns/dist.ipfs.tech/go-ipfs/$VERSION
 ```
 
 To download a given build of a version:
 
 ```
-$ ipfs get /ipns/dist.ipfs.io/go-ipfs/$VERSION/go-ipfs_$VERSION_darwin-386.tar.gz # darwin 32-bit build
-$ ipfs get /ipns/dist.ipfs.io/go-ipfs/$VERSION/go-ipfs_$VERSION_darwin-amd64.tar.gz # darwin 64-bit build
-$ ipfs get /ipns/dist.ipfs.io/go-ipfs/$VERSION/go-ipfs_$VERSION_freebsd-amd64.tar.gz # freebsd 64-bit build
-$ ipfs get /ipns/dist.ipfs.io/go-ipfs/$VERSION/go-ipfs_$VERSION_linux-386.tar.gz # linux 32-bit build
-$ ipfs get /ipns/dist.ipfs.io/go-ipfs/$VERSION/go-ipfs_$VERSION_linux-amd64.tar.gz # linux 64-bit build
-$ ipfs get /ipns/dist.ipfs.io/go-ipfs/$VERSION/go-ipfs_$VERSION_linux-arm.tar.gz # linux arm build
-$ ipfs get /ipns/dist.ipfs.io/go-ipfs/$VERSION/go-ipfs_$VERSION_windows-amd64.zip # windows 64-bit build
+$ ipfs get /ipns/dist.ipfs.tech/go-ipfs/$VERSION/go-ipfs_$VERSION_darwin-386.tar.gz # darwin 32-bit build
+$ ipfs get /ipns/dist.ipfs.tech/go-ipfs/$VERSION/go-ipfs_$VERSION_darwin-amd64.tar.gz # darwin 64-bit build
+$ ipfs get /ipns/dist.ipfs.tech/go-ipfs/$VERSION/go-ipfs_$VERSION_freebsd-amd64.tar.gz # freebsd 64-bit build
+$ ipfs get /ipns/dist.ipfs.tech/go-ipfs/$VERSION/go-ipfs_$VERSION_linux-386.tar.gz # linux 32-bit build
+$ ipfs get /ipns/dist.ipfs.tech/go-ipfs/$VERSION/go-ipfs_$VERSION_linux-amd64.tar.gz # linux 64-bit build
+$ ipfs get /ipns/dist.ipfs.tech/go-ipfs/$VERSION/go-ipfs_$VERSION_linux-arm.tar.gz # linux arm build
+$ ipfs get /ipns/dist.ipfs.tech/go-ipfs/$VERSION/go-ipfs_$VERSION_windows-amd64.zip # windows 64-bit build
 ```
 
 ## Getting Started
 
 ### Usage
 
-[![docs: Command-line quick start](https://img.shields.io/static/v1?label=docs&message=Command-line%20quick%20start&color=blue&style=flat-square&cacheSeconds=3600)](https://docs.ipfs.io/how-to/command-line-quick-start/)
-[![docs: Command-line reference](https://img.shields.io/static/v1?label=docs&message=Command-line%20reference&color=blue&style=flat-square&cacheSeconds=3600)](https://docs.ipfs.io/reference/cli/)
+[![docs: Command-line quick start](https://img.shields.io/static/v1?label=docs&message=Command-line%20quick%20start&color=blue&style=flat-square&cacheSeconds=3600)](https://docs.ipfs.tech/how-to/command-line-quick-start/)
+[![docs: Command-line reference](https://img.shields.io/static/v1?label=docs&message=Command-line%20reference&color=blue&style=flat-square&cacheSeconds=3600)](https://docs.ipfs.tech/reference/kubo/cli/)
 
 To start using IPFS, you must first initialize IPFS's config files on your
 system, this is done with `ipfs init`. See `ipfs init --help` for information on
@@ -385,13 +385,13 @@ Basic proof of 'ipfs working' locally:
 
 If you have previously installed IPFS before and you are running into problems getting a newer version to work, try deleting (or backing up somewhere else) your IPFS config directory (~/.ipfs by default) and rerunning `ipfs init`. This will reinitialize the config file to its defaults and clear out the local datastore of any bad entries.
 
-Please direct general questions and help requests to our [forum](https://discuss.ipfs.io) or our IRC channel (freenode #ipfs).
+Please direct general questions and help requests to our [forums](https://discuss.ipfs.tech).
 
-If you believe you've found a bug, check the [issues list](https://github.com/ipfs/kubo/issues) and, if you don't see your problem there, either come talk to us on [Matrix chat](https://docs.ipfs.io/community/chat/), or file an issue of your own!
+If you believe you've found a bug, check the [issues list](https://github.com/ipfs/kubo/issues) and, if you don't see your problem there, either come talk to us on [Matrix chat](https://docs.ipfs.tech/community/chat/), or file an issue of your own!
 
 ## Packages
 
-See [IPFS in GO](https://docs.ipfs.io/reference/go/api/) documentation.
+See [IPFS in GO](https://docs.ipfs.tech/reference/go/api/) documentation.
 
 ## Development
 
@@ -446,7 +446,7 @@ We ❤️ all [our contributors](docs/AUTHORS); this project wouldn’t be what
 
 This repository falls under the IPFS [Code of Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 
-Please reach out to us in one [chat](https://docs.ipfs.io/community/chat/) rooms.
+Please reach out to us in one [chat](https://docs.ipfs.tech/community/chat/) rooms.
 
 ## License
 

cmd/ipfs/daemon.go

@@ -292,7 +292,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
 
 		if !domigrate {
 			fmt.Println("Not running migrations of fs-repo now.")
-			fmt.Println("Please get fs-repo-migrations from https://dist.ipfs.io")
+			fmt.Println("Please get fs-repo-migrations from https://dist.ipfs.tech")
 			return fmt.Errorf("fs-repo requires migration")
 		}
 
@@ -806,6 +806,12 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (<-chan error, e
 		return nil, fmt.Errorf("serveHTTPGateway: ConstructNode() failed: %s", err)
 	}
 
+	if len(listeners) > 0 {
+		if err := node.Repo.SetGatewayAddr(listeners[0].Addr()); err != nil {
+			return nil, fmt.Errorf("serveHTTPGateway: SetGatewayAddr() failed: %w", err)
+		}
+	}
+
 	errc := make(chan error)
 	var wg sync.WaitGroup
 	for _, lis := range listeners {

core/builder.go

@@ -15,6 +15,37 @@ import (
 	"go.uber.org/fx"
 )
 
+// FXNodeInfo contains information useful for adding fx options.
+// This is the extension point for providing more info/context to fx plugins
+// to make decisions about what options to include.
+type FXNodeInfo struct {
+	FXOptions []fx.Option
+}
+
+// fxOptFunc takes in some info about the IPFS node and returns the full set of fx opts to use.
+type fxOptFunc func(FXNodeInfo) ([]fx.Option, error)
+
+var fxOptionFuncs []fxOptFunc
+
+// RegisterFXOptionFunc registers a function that is run before the fx app is initialized.
+// Functions are invoked in the order they are registered,
+// and the resulting options are passed into the next function's FXNodeInfo.
+//
+// Note that these are applied globally, by all invocations of NewNode.
+// There are multiple places in Kubo that construct nodes, such as:
+//   - Repo initialization
+//   - Daemon initialization
+//   - When running migrations
+//   - etc.
+//
+// If your fx options are doing anything sophisticated, you should keep this in mind.
+//
+// For example, if you plug in a blockservice that disallows non-allowlisted CIDs,
+// this may break migrations that fetch migration code over IPFS.
+func RegisterFXOptionFunc(optFunc fxOptFunc) {
+	fxOptionFuncs = append(fxOptionFuncs, optFunc)
+}
+
 // from https://stackoverflow.com/a/59348871
 type valueContext struct {
 	context.Context
@@ -41,12 +72,21 @@ func NewNode(ctx context.Context, cfg *BuildCfg) (*IpfsNode, error) {
 		ctx: ctx,
 	}
 
-	app := fx.New(
+	opts := []fx.Option{
 		node.IPFS(ctx, cfg),
-
 		fx.NopLogger,
-		fx.Extract(n),
-	)
+	}
+	for _, optFunc := range fxOptionFuncs {
+		var err error
+		opts, err = optFunc(FXNodeInfo{FXOptions: opts})
+		if err != nil {
+			cancel()
+			return nil, fmt.Errorf("building fx opts: %w", err)
+		}
+	}
+	opts = append(opts, fx.Extract(n))
+
+	app := fx.New(opts...)
 
 	var once sync.Once
 	var stopErr error

core/corehttp/hostname.go

@@ -324,7 +324,7 @@ func isKnownHostname(hostname string, knownGateways gatewayHosts) (gw *config.Ga
 func knownSubdomainDetails(hostname string, knownGateways gatewayHosts) (gw *config.GatewaySpec, gwHostname, ns, rootID string, ok bool) {
 	labels := strings.Split(hostname, ".")
 	// Look for FQDN of a known gateway hostname.
-	// Example: given "dist.ipfs.io.ipns.dweb.link":
+	// Example: given "dist.ipfs.tech.ipns.dweb.link":
 	// 1. Lookup "link" TLD in knownGateways: negative
 	// 2. Lookup "dweb.link" in knownGateways: positive
 	//

core/corehttp/hostname_test.go

@@ -91,7 +91,7 @@ func TestToDNSLinkFQDN(t *testing.T) {
 		out string
 	}{
 		{"singlelabel", "singlelabel"},
-		{"docs-ipfs-io", "docs.ipfs.io"},
+		{"docs-ipfs-tech", "docs.ipfs.tech"},
 		{"dnslink-long--name-example-com", "dnslink.long-name.example.com"},
 	} {
 		out := toDNSLinkFQDN(test.in)
@@ -261,7 +261,7 @@ func TestKnownSubdomainDetails(t *testing.T) {
 		// dnslink in subdomain
 		{"en.wikipedia-on-ipfs.org.ipns.localhost:8080", gwLocalhost, "localhost:8080", "ipns", "en.wikipedia-on-ipfs.org", true},
 		{"en.wikipedia-on-ipfs.org.ipns.localhost", gwLocalhost, "localhost", "ipns", "en.wikipedia-on-ipfs.org", true},
-		{"dist.ipfs.io.ipns.localhost:8080", gwLocalhost, "localhost:8080", "ipns", "dist.ipfs.io", true},
+		{"dist.ipfs.tech.ipns.localhost:8080", gwLocalhost, "localhost:8080", "ipns", "dist.ipfs.tech", true},
 		{"en.wikipedia-on-ipfs.org.ipns.dweb.link", gwDweb, "dweb.link", "ipns", "en.wikipedia-on-ipfs.org", true},
 		// edge case check: public gateway under long TLD (see: https://publicsuffix.org)
 		{"foo.dweb.ipfs.pvt.k12.ma.us", nil, "", "", "", false},

core/node/groups.go

@@ -139,7 +139,7 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config) fx.Option {
 	if cfg.Swarm.EnableRelayHop {
 		logger.Fatal("The `Swarm.EnableRelayHop` config field was removed.\n" +
 			"Use `Swarm.RelayService` to configure the circuit v2 relay.\n" +
-			"If you want to continue running a circuit v1 relay, please use the standalone relay daemon: https://dist.ipfs.io/#libp2p-relay-daemon (with RelayV1.Enabled: true)")
+			"If you want to continue running a circuit v1 relay, please use the standalone relay daemon: https://dist.ipfs.tech/#libp2p-relay-daemon (with RelayV1.Enabled: true)")
 	}
 
 	peerChan := make(libp2p.AddrInfoChan)