chore: merge new changes from upstream master [skip changelog]

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: [ipshipyard.gitwallet.co]

.github/workflows/build.yml

@@ -10,7 +10,7 @@ on:
       - 'master'
 
 env:
-  GO_VERSION: 1.21.x
+  GO_VERSION: 1.22.x
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event_name == 'push' && github.sha || github.ref }}

.github/workflows/codeql-analysis.yml

@@ -31,14 +31,19 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - name: Setup Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: 1.22.x
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: go
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/docker-build.yml

@@ -28,7 +28,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
       - uses: actions/checkout@v4
       - run: docker build -t $IMAGE_NAME:$WIP_IMAGE_TAG .
       - run: docker run --rm $IMAGE_NAME:$WIP_IMAGE_TAG --version

.github/workflows/gateway-conformance.yml

@@ -49,7 +49,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
       - uses: protocol/cache-go-action@v1
         with:
           name: ${{ github.job }}
@@ -137,7 +137,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
       - uses: protocol/cache-go-action@v1
         with:
           name: ${{ github.job }}

.github/workflows/gobuild.yml

@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
       - uses: actions/checkout@v4
       - run: make cmd/ipfs-try-build
         env:

.github/workflows/golang-analysis.yml

@@ -27,7 +27,7 @@ jobs:
           submodules: recursive
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.x"
+          go-version: "1.22.x"
       - name: Check that go.mod is tidy
         uses: protocol/[email protected]
         with:

.github/workflows/golint.yml

@@ -31,6 +31,6 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
       - uses: actions/checkout@v4
       - run: make -O test_go_lint

.github/workflows/gotest.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
       - name: Check out Kubo
         uses: actions/checkout@v4
       - name: Install missing tools
@@ -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@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
+        uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
         if: failure() || success()
         with:
           name: unittests
@@ -73,7 +73,7 @@ jobs:
           mv go.sum.bak go.sum
         working-directory: docs/examples/kubo-as-a-library
       - name: Create a proper JUnit XML report
-        uses: pl-strflt/gotest-json-to-junit-xml@v1
+        uses: ipdxco/gotest-json-to-junit-xml@v1
         with:
           input: test/unit/gotest.json
           output: test/unit/gotest.junit.xml
@@ -85,7 +85,7 @@ jobs:
           path: test/unit/gotest.junit.xml
         if: failure() || success()
       - name: Create a HTML report
-        uses: pl-strflt/junit-xml-to-html@v1
+        uses: ipdxco/junit-xml-to-html@v1
         with:
           mode: no-frames
           input: test/unit/gotest.junit.xml
@@ -98,7 +98,7 @@ jobs:
           path: test/unit/gotest.html
         if: failure() || success()
       - name: Create a Markdown report
-        uses: pl-strflt/junit-xml-to-html@v1
+        uses: ipdxco/junit-xml-to-html@v1
         with:
           mode: summary
           input: test/unit/gotest.junit.xml

.github/workflows/sharness.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
       - name: Checkout Kubo
         uses: actions/checkout@v4
         with:
@@ -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@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
+        uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
         if: failure() || success()
         with:
           name: sharness
@@ -73,15 +73,15 @@ jobs:
           echo >> $GITHUB_STEP_SUMMARY
           cat kubo/test/sharness/test-results/summary.txt >> $GITHUB_STEP_SUMMARY
       - name: Generate one-page HTML report
-        uses: pl-strflt/junit-xml-to-html@v1
+        uses: ipdxco/junit-xml-to-html@v1
         if: failure() || success()
         with:
           mode: no-frames
           input: kubo/test/sharness/test-results/sharness.xml
           output: kubo/test/sharness/test-results/sharness.html
       - name: Upload one-page HTML report to S3
         id: one-page
-        uses: pl-strflt/tf-aws-gh-runner/.github/actions/upload-artifact@main
+        uses: ipdxco/custom-github-runners/.github/actions/upload-artifact@main
         if: github.repository == 'ipfs/kubo' && (failure() || success())
         with:
           source: kubo/test/sharness/test-results/sharness.html
@@ -93,15 +93,15 @@ jobs:
           name: sharness.html
           path: kubo/test/sharness/test-results/sharness.html
       - name: Generate full HTML report
-        uses: pl-strflt/junit-xml-to-html@v1
+        uses: ipdxco/junit-xml-to-html@v1
         if: failure() || success()
         with:
           mode: frames
           input: kubo/test/sharness/test-results/sharness.xml
           output: kubo/test/sharness/test-results/sharness-html
       - name: Upload full HTML report to S3
         id: full
-        uses: pl-strflt/tf-aws-gh-runner/.github/actions/upload-artifact@main
+        uses: ipdxco/custom-github-runners/.github/actions/upload-artifact@main
         if: github.repository == 'ipfs/kubo' && (failure() || success())
         with:
           source: kubo/test/sharness/test-results/sharness-html

CHANGELOG.md

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.21 AS builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22 AS builder
 
 ARG TARGETOS TARGETARCH
 

client/rpc/api.go

@@ -227,10 +227,6 @@ func (api *HttpApi) Object() iface.ObjectAPI {
 	return (*ObjectAPI)(api)
 }
 
-func (api *HttpApi) Dht() iface.DhtAPI {
-	return (*DhtAPI)(api)
-}
-
 func (api *HttpApi) Swarm() iface.SwarmAPI {
 	return (*SwarmAPI)(api)
 }