Merge branch 'master' into uds-client

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -18,7 +18,7 @@ body:
       label: Checklist
       description: Please verify that you've followed these steps
       options:
-        - label: This is a bug report, not a question. Ask questions on [discuss.ipfs.io](https://discuss.ipfs.io).
+        - label: This is a bug report, not a question. Ask questions on [discuss.ipfs.tech](https://discuss.ipfs.tech/c/help/13).
           required: true
         - label: I have searched on the [issue tracker](https://github.com/ipfs/kubo/issues?q=is%3Aissue) for my bug.
           required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,17 +1,17 @@
 blank_issues_enabled: false
 contact_links:
  - name: Getting Help on IPFS
-   url: https://ipfs.io/help
+   url: https://ipfs.tech/help
    about: All information about how and where to get help on IPFS.
  - name: Kubo configuration reference
    url: https://github.com/ipfs/kubo/blob/master/docs/config.md#readme
    about: Documentation on the different configuration settings
  - name: Kubo experimental features docs
    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
+ - name: Kubo RPC API Reference
    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
+ - name: IPFS Official Discussion Forum
+   url: https://discuss.ipfs.tech
    about: Please post general questions, support requests, and discussions here.

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -6,11 +6,11 @@ body:
   - type: markdown
     attributes:
       value: |
-        Suggest an enhancement to Kubo (the program). If you'd like to suggest an improvement to the IPFS protocol, please discuss it on [the forum](https://discuss.ipfs.io).
+        Suggest an enhancement to Kubo (the program). If you'd like to suggest an improvement to the IPFS protocol, please discuss it on [the forum](https://discuss.ipfs.tech).
 
         Issues in this repo must be specific, actionable, and well motivated. They should be starting points for _building_ new features, not brainstorming ideas.
 
-        If you have an idea you'd like to discuss, please open a new thread on [the forum](https://discuss.ipfs.io).
+        If you have an idea you'd like to discuss, please open a new thread on [the forum](https://discuss.ipfs.tech).
 
         **Example:**
 

.github/ISSUE_TEMPLATE/feature.yml

@@ -6,11 +6,11 @@ body:
   - type: markdown
     attributes:
       value: |
-        Suggest a new feature in Kubo (the program). If you'd like to suggest an improvement to the IPFS protocol, please discuss it on [the forum](https://discuss.ipfs.io).
+        Suggest a new feature in Kubo (the program). If you'd like to suggest an improvement to the IPFS protocol, please discuss it on [the forum](https://discuss.ipfs.tech).
 
         Issues in this repo must be specific, actionable, and well motivated. They should be starting points for _building_ new features, not brainstorming ideas.
 
-        If you have an idea you'd like to discuss, please open a new thread on [the forum](https://discuss.ipfs.io).
+        If you have an idea you'd like to discuss, please open a new thread on [the forum](https://discuss.ipfs.tech).
 
         **Example:**
 

.github/workflows/docker-image.yml

@@ -63,7 +63,7 @@ jobs:
         shell: bash
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20
         with:
           username: ${{ vars.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/gateway-conformance.yml

@@ -41,7 +41,7 @@ jobs:
     steps:
       # 1. Download the gateway-conformance fixtures
       - name: Download gateway-conformance fixtures
-        uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.5
+        uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.6
         with:
           output: fixtures
 
@@ -84,9 +84,7 @@ jobs:
 
           # Import dnslink records
           # the IPFS_NS_MAP env will be used by the daemon
-          export IPFS_NS_MAP=$(cat "./fixtures/dnslinks.json" | jq -r '.subdomains | to_entries | map("\(.key).example.com:\(.value)") | join(",")')
-          export IPFS_NS_MAP="$(cat "./fixtures/dnslinks.json" | jq -r '.domains | to_entries | map("\(.key):\(.value)") | join(",")'),${IPFS_NS_MAP}"
-          echo "IPFS_NS_MAP=${IPFS_NS_MAP}" >> $GITHUB_ENV
+          echo "IPFS_NS_MAP=$(cat ./fixtures/dnslinks.IPFS_NS_MAP)" >> $GITHUB_ENV
 
       # 5. Start the kubo-gateway
       - name: Start kubo-gateway
@@ -96,14 +94,15 @@ jobs:
 
       # 6. Run the gateway-conformance tests
       - name: Run gateway-conformance tests
-        uses: ipfs/gateway-conformance/.github/actions/test@v0.5
+        uses: ipfs/gateway-conformance/.github/actions/test@v0.6
         with:
           gateway-url: http://127.0.0.1:8080
+          subdomain-url: http://localhost:8080
+          args: -skip 'TestGatewayCar/GET_response_for_application/vnd.ipld.car/Header_Content-Length'
           json: output.json
           xml: output.xml
           html: output.html
           markdown: output.md
-          args: -skip 'TestGatewayCar/GET_response_for_application/vnd.ipld.car/Header_Content-Length'
 
       # 7. Upload the results
       - name: Upload MD summary
@@ -129,7 +128,7 @@ jobs:
     steps:
       # 1. Download the gateway-conformance fixtures
       - name: Download gateway-conformance fixtures
-        uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.5
+        uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.6
         with:
           output: fixtures
 
@@ -202,14 +201,14 @@ jobs:
 
       # 9. Run the gateway-conformance tests over libp2p
       - name: Run gateway-conformance tests over libp2p
-        uses: ipfs/gateway-conformance/.github/actions/test@v0.5
+        uses: ipfs/gateway-conformance/.github/actions/test@v0.6
         with:
           gateway-url: http://127.0.0.1:8092
+          args: --specs "trustless-gateway,-trustless-ipns-gateway" -skip 'TestGatewayCar/GET_response_for_application/vnd.ipld.car/Header_Content-Length'
           json: output.json
           xml: output.xml
           html: output.html
           markdown: output.md
-          args: --specs "trustless-gateway,-trustless-ipns-gateway" -skip 'TestGatewayCar/GET_response_for_application/vnd.ipld.car/Header_Content-Length'
 
       # 10. Upload the results
       - name: Upload MD summary

.github/workflows/gotest.yml

@@ -45,7 +45,7 @@ jobs:
           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@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
+        uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0
         if: failure() || success()
         with:
           name: unittests

.github/workflows/sharness.yml

@@ -55,7 +55,7 @@ jobs:
           # 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@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
+        uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0
         if: failure() || success()
         with:
           name: sharness

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Kubo Changelogs
 
+- [v0.30](docs/changelogs/v0.30.md)
+- [v0.29](docs/changelogs/v0.29.md)
 - [v0.28](docs/changelogs/v0.28.md)
 - [v0.27](docs/changelogs/v0.27.md)
 - [v0.26](docs/changelogs/v0.26.md)

README.md

@@ -73,11 +73,13 @@ Before opening an issue, consider using one of the following locations to ensure
       - [Downloading builds using IPFS](#downloading-builds-using-ipfs)
   - [Unofficial Linux packages](#unofficial-linux-packages)
     - [ArchLinux](#arch-linux)
+    - [Gentoo Linux](#gentoo-linux)
     - [Nix](#nix)
     - [Solus](#solus)
     - [openSUSE](#opensuse)
     - [Guix](#guix)
     - [Snap](#snap)
+    - [Ubuntu PPA](#ubuntu-ppa)
   - [Unofficial Windows packages](#unofficial-windows-packages)
     - [Chocolatey](#chocolatey)
     - [Scoop](#scoop)
@@ -123,7 +125,24 @@ Official images are published at https://hub.docker.com/r/ipfs/kubo/:
 
 [![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.tech/how-to/run-ipfs-inside-docker/).
+- 🟢 Releases
+  - `latest` and `release` tags always point at [the latest stable release](https://github.com/ipfs/kubo/releases/latest)
+  - `vN.N.N` points at a specific [release tag](https://github.com/ipfs/kubo/releases)
+  - These are production grade images.
+- 🟠 We also provide experimental developer builds
+  - `master-latest` always points at the `HEAD` of the `master` branch
+  - `master-YYYY-DD-MM-GITSHA` points at a specific commit from the `master` branch
+  - These tags are used by developers for internal testing, not intended for end users or production use.
+
+```console
+$ docker pull ipfs/kubo:latest
+$ docker run --rm -it --net=host ipfs/kubo:latest
+```
+
+To [customize your node](https://docs.ipfs.tech/install/run-ipfs-inside-docker/#customizing-your-node),
+pass necessary config via `-e` or by mounting scripts in the `/container-init.d`.
+
+Learn more at https://docs.ipfs.tech/install/run-ipfs-inside-docker/
 
 ### Official prebuilt binaries
 
@@ -181,11 +200,13 @@ $ ipfs get /ipns/dist.ipfs.tech/kubo/$VERSION/kubo_$VERSION_windows-amd64.zip
 </a>
 
 - [ArchLinux](#arch-linux)
+- [Gentoo Linux](#gentoo-linux)
 - [Nix](#nix-linux)
 - [Solus](#solus)
 - [openSUSE](#opensuse)
 - [Guix](#guix)
 - [Snap](#snap)
+- [Ubuntu PPA](#ubuntu-ppa)
 
 #### Arch Linux
 
@@ -197,6 +218,16 @@ $ ipfs get /ipns/dist.ipfs.tech/kubo/$VERSION/kubo_$VERSION_windows-amd64.zip
 
 [![kubo-git via AUR](https://img.shields.io/static/v1?label=kubo-git&message=latest%40master&color=1793d1&logo=arch-linux&style=flat-square&cacheSeconds=3600)](https://aur.archlinux.org/packages/kubo/)
 
+#### <a name="gentoo-linux">Gentoo Linux</a>
+
+https://wiki.gentoo.org/wiki/Kubo
+
+```bash
+# emerge -a net-p2p/kubo
+```
+
+https://packages.gentoo.org/packages/net-p2p/kubo
+
 #### <a name="nix-linux">Nix</a>
 
 With the purely functional package manager [Nix](https://nixos.org/nix/) you can install kubo (go-ipfs) like this:
@@ -229,6 +260,31 @@ You can also install it through the Solus software center.
 
 No longer supported, see rationale in [kubo#8688](https://github.com/ipfs/kubo/issues/8688).
 
+#### Ubuntu PPA
+
+[PPA homepage](https://launchpad.net/~twdragon/+archive/ubuntu/ipfs) on Launchpad.
+
+##### Latest Ubuntu (>= 20.04 LTS)
+```sh
+sudo add-apt-repository ppa:twdragon/ipfs
+sudo apt update
+sudo apt install ipfs-kubo
+```
+
+##### Any Ubuntu version
+
+```sh
+sudo su
+echo 'deb https://ppa.launchpadcontent.net/twdragon/ipfs/ubuntu <<DISTRO>> main' >> /etc/apt/sources.list.d/ipfs
+echo 'deb-src https://ppa.launchpadcontent.net/twdragon/ipfs/ubuntu <<DISTRO>> main' >> /etc/apt/sources.list.d/ipfs
+exit
+sudo apt update
+sudo apt install ipfs-kubo
+```
+where `<<DISTRO>>` is the codename of your Ubuntu distribution (for example, `jammy` for 22.04 LTS). During the first installation the package maintenance script may automatically ask you about which networking profile, CPU accounting model, and/or existing node configuration file you want to use.
+
+**NOTE**: this method also may work with any compatible Debian-based distro which has `libc6` inside, and APT as a package manager.
+
 ### Unofficial Windows packages
 
 - [Chocolatey](#chocolatey)
@@ -428,7 +484,9 @@ 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.tech/community/chat/) rooms.
+Members of IPFS community provide Kubo support on [discussion forum category here](https://discuss.ipfs.tech/c/help/help-kubo/23).
+
+Need help with IPFS itself? Learn where to get help and support at https://ipfs.tech/help.
 
 ## License
 

Rules.mk

@@ -123,7 +123,7 @@ help:
 	@echo '  build        - Build binary at ./cmd/ipfs/ipfs'
 	@echo '  nofuse       - Build binary with no fuse support'
 	@echo '  install      - Build binary and install into $$GOBIN'
-	@echo '  mod_tidy     - Remove unused dependencis from go.mod files'
+	@echo '  mod_tidy     - Remove unused dependencies from go.mod files'
 #	@echo '  dist_install - TODO: c.f. ./cmd/ipfs/dist/README.md'
 	@echo ''
 	@echo 'CLEANING TARGETS:'

assets/assets.go

@@ -9,9 +9,7 @@ import (
 	"github.com/ipfs/kubo/core/coreapi"
 
 	"github.com/ipfs/boxo/files"
-	"github.com/ipfs/boxo/path"
 	cid "github.com/ipfs/go-cid"
-	options "github.com/ipfs/kubo/core/coreiface/options"
 )
 
 //go:embed init-doc
@@ -39,30 +37,20 @@ func addAssetList(nd *core.IpfsNode, l []string) (cid.Cid, error) {
 		return cid.Cid{}, err
 	}
 
-	dirb, err := api.Object().New(nd.Context(), options.Object.Type("unixfs-dir"))
-	if err != nil {
-		return cid.Cid{}, err
-	}
-
-	basePath := path.FromCid(dirb.Cid())
+	dirMap := map[string]files.Node{}
 
 	for _, p := range l {
 		d, err := Asset.ReadFile(p)
 		if err != nil {
 			return cid.Cid{}, fmt.Errorf("assets: could load Asset '%s': %s", p, err)
 		}
 
-		fp, err := api.Unixfs().Add(nd.Context(), files.NewBytesFile(d))
-		if err != nil {
-			return cid.Cid{}, err
-		}
-
-		fname := gopath.Base(p)
+		dirMap[gopath.Base(p)] = files.NewBytesFile(d)
+	}
 
-		basePath, err = api.Object().AddLink(nd.Context(), basePath, fname, fp)
-		if err != nil {
-			return cid.Cid{}, err
-		}
+	basePath, err := api.Unixfs().Add(nd.Context(), files.NewMapDirectory(dirMap))
+	if err != nil {
+		return cid.Cid{}, err
 	}
 
 	if err := api.Pin().Add(nd.Context(), basePath); err != nil {

bin/ipns-republish

@@ -19,7 +19,7 @@ if [ $? -ne 0 ]; then
 fi
 
 # check the object is there
-ipfs object stat "$1" >/dev/null
+ipfs dag stat "$1" >/dev/null
 if [ $? -ne 0 ]; then
   echo "error: ipfs cannot find $1"
   exit 1

client/rpc/api_test.go

@@ -46,7 +46,6 @@ func (np NodeProvider) MakeAPISwarm(t *testing.T, ctx context.Context, fullIdent
 				c := n.ReadConfig()
 				c.Experimental.FilestoreEnabled = true
 				n.WriteConfig(c)
-
 				n.StartDaemon("--enable-pubsub-experiment", "--offline="+strconv.FormatBool(!online))
 
 				if online {

client/rpc/errors.go

@@ -68,11 +68,11 @@ func parseErrNotFound(msg string) (error, bool) {
 // Assume CIDs break on:
 // - Whitespaces: " \t\n\r\v\f"
 // - Semicolon: ";" this is to parse ipld.ErrNotFound wrapped in multierr
-// - Double Quotes: "\"" this is for parsing %q and %#v formating.
+// - Double Quotes: "\"" this is for parsing %q and %#v formatting.
 const cidBreakSet = " \t\n\r\v\f;\""
 
 func parseIPLDErrNotFound(msg string) (error, bool) {
-	// The patern we search for is:
+	// The pattern we search for is:
 	const ipldErrNotFoundKey = "ipld: could not find " /*CID*/
 	// We try to parse the CID, if it's invalid we give up and return a simple text error.
 	// We also accept "node" in place of the CID because that means it's an Undefined CID.
@@ -138,7 +138,7 @@ func parseIPLDErrNotFound(msg string) (error, bool) {
 
 // This is a simple error type that just return msg as Error().
 // But that also match ipld.ErrNotFound when called with Is(err).
-// That is needed to keep compatiblity with code that use string.Contains(err.Error(), "blockstore: block not found")
+// That is needed to keep compatibility with code that use string.Contains(err.Error(), "blockstore: block not found")
 // and code using ipld.ErrNotFound.
 type blockstoreNotFoundMatchingIPLDErrNotFound struct {
 	msg string