Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ipfs/interop
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4ebecb743231daf3f2ab5d7a6cb3fa5108f2f050
Choose a base ref
...
head repository: ipfs/interop
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 81e4063d95e9b5e88376ffe4fd78bbd2b0dda377
Choose a head ref

Commits on Jul 19, 2021

  1. chore: update to new multiformats (#334)

    BREAKING CHANGE: uses the new CID class from multiformats and supporting modules
    achingbrain authored Jul 19, 2021
    Copy the full SHA
    baf06be View commit details
  2. 6.0.0

    achingbrain committed Jul 19, 2021
    Copy the full SHA
    98ec924 View commit details
  3. chore: update lock file

    achingbrain committed Jul 19, 2021
    Copy the full SHA
    7457aef View commit details

Commits on Aug 5, 2021

  1. fix: use recursive ls instead of get to count files (#353)

    `ipfs.get` is supposed to return tarballs, so use `ipfs.ls` to count files instead as that's what it's there for.
    achingbrain authored Aug 5, 2021
    Copy the full SHA
    0bfdf65 View commit details
  2. 6.0.1

    achingbrain committed Aug 5, 2021
    Copy the full SHA
    fab39cb View commit details

Commits on Aug 23, 2021

  1. Copy the full SHA
    87f8a06 View commit details
  2. chore: update lockfile

    achingbrain committed Aug 23, 2021
    Copy the full SHA
    3326802 View commit details
  3. 6.0.2

    achingbrain committed Aug 23, 2021
    Copy the full SHA
    6a1ea78 View commit details

Commits on Sep 13, 2021

  1. Copy the full SHA
    60ab496 View commit details
  2. 6.0.3

    achingbrain committed Sep 13, 2021
    Copy the full SHA
    aedcf0d View commit details

Commits on Sep 14, 2021

  1. chore: upgrade to GitHub-native Dependabot (#283)

    Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
    Co-authored-by: achingbrain <alex@achingbrain.net>
    dependabot-preview[bot] and achingbrain authored Sep 14, 2021
    Copy the full SHA
    de0b96b View commit details

Commits on Sep 24, 2021

  1. chore: update to new globsource api (#367)

    Updates code as sig has changed.
    
    - removes redundant tests
    - switches to esm
    - updates deps
    - swaps travis for gh actions
    
    BREAKING CHANGE: requires the latest js-ipfs release
    achingbrain authored Sep 24, 2021
    Copy the full SHA
    0e41e90 View commit details
  2. 7.0.0

    achingbrain committed Sep 24, 2021
    Copy the full SHA
    e99eafe View commit details

Commits on Sep 28, 2021

  1. chore: switch to signalling server module (#371)

    The webrtc signalling server has been split out of the transport
    module into it's own package so use that.
    achingbrain authored Sep 28, 2021
    Copy the full SHA
    a036783 View commit details
  2. 7.0.1

    achingbrain committed Sep 28, 2021
    Copy the full SHA
    d50c3c6 View commit details
  3. chore: run test on pr

    achingbrain committed Sep 28, 2021
    Copy the full SHA
    77894f2 View commit details
  4. fix: use ipfs.addAll for directories (#373)

    We need to use ipfs.add for single bits of content and ipfs.addAll
    for multiple bits of content.
    achingbrain authored Sep 28, 2021
    Copy the full SHA
    92c0f98 View commit details
  5. 7.0.2

    achingbrain committed Sep 28, 2021
    Copy the full SHA
    751d360 View commit details

Commits on Oct 14, 2021

  1. fix: resolve bin using env var, then fall back to module (#383)

    We were importing `'go-ipfs'` if `IPFS_GO_IPFS_MODULE` wasn't set in the env, but we only need `'go-ipfs'` to get the bin path, which should be settable using the `IPFS_GO_EXEC` env var, so if we have that, don't try to load `'go-ipfs'`.
    achingbrain authored Oct 14, 2021
    Copy the full SHA
    d6674b8 View commit details
  2. chore: update lockfile

    achingbrain committed Oct 14, 2021
    Copy the full SHA
    048db38 View commit details
  3. 7.0.3

    achingbrain committed Oct 14, 2021
    Copy the full SHA
    99502a7 View commit details

Commits on Oct 25, 2021

  1. fix: disable pubsub due to wire format changes (#388)

    This temporarily disables pubsub tests as we are unable to test interop
    until both JS and GO changes land:
    - ipfs/kubo#8183
    - ipfs/js-ipfs#3922
    
    When we have that, we will re-enable skipped tests
    in #387
    lidel authored Oct 25, 2021
    Copy the full SHA
    344f692 View commit details
  2. chore: update contributors

    lidel committed Oct 25, 2021
    Copy the full SHA
    ee74b56 View commit details
  3. chore: release version v7.0.4

    lidel committed Oct 25, 2021
    Copy the full SHA
    b336024 View commit details
  4. 7.0.5

    lidel committed Oct 25, 2021
    Copy the full SHA
    1390c70 View commit details
  5. docs: releasing steps

    clarify that we dont use aegir and publish entire root, not just
    `./dist` to save time the next person :^)
    lidel committed Oct 25, 2021
    Copy the full SHA
    1d52b9e View commit details

Commits on Nov 16, 2021

  1. docs: update readme

    Add a description for how to run a particular test locally
    aschmahmann committed Nov 16, 2021
    Copy the full SHA
    b361f74 View commit details

Commits on Nov 17, 2021

  1. feat: scripts/custom-runtime.sh

    This extracts glue code that simplifies running interop against
    unreleased code of go-ipfs and js-ipfs packages from lerna monorepo.
    
    Makes it easier to demonstrate green CI and/or test end-to-end locally
    before submitting a PR.
    lidel committed Nov 17, 2021
    Copy the full SHA
    f62da35 View commit details
  2. Copy the full SHA
    69ded0b View commit details
  3. Merge pull request #397 from ipfs/feat/custom-runtime-script

    feat: scripts/custom-runtime.sh
    lidel authored Nov 17, 2021
    Copy the full SHA
    9d36595 View commit details

Commits on Nov 29, 2021

  1. feat: circuit relay v2

    Needed for:
    ipfs/kubo#8522
    lidel committed Nov 29, 2021
    Copy the full SHA
    278e2a0 View commit details
  2. fix: use new go-ipfs sharding option to lower the threshold to the mi…

    …nimum for compatibility with existing tests
    aschmahmann authored and lidel committed Nov 29, 2021
    Copy the full SHA
    360deb9 View commit details
  3. chore: switch CI to go-ipfs/pull/8563

    aschmahmann authored and lidel committed Nov 29, 2021
    Copy the full SHA
    e1f111a View commit details
  4. Copy the full SHA
    3004b52 View commit details
  5. Merge pull request #400 from ipfs/feat/go-libp2p-0.16-and-sharding-co…

    …nfig-option
    
    feat: go-libp2p 0.16 and autosharding
    lidel authored Nov 29, 2021
    Copy the full SHA
    9562422 View commit details
  6. Copy the full SHA
    dc7ce04 View commit details
  7. chore: use go-ipfs master

    lidel authored and aschmahmann committed Nov 29, 2021
    Copy the full SHA
    1ffe4d0 View commit details

Commits on Dec 16, 2021

  1. feat: pubsub multibase and expanded dht (#410)

    Updates `pubsub`  interop tests with  HTTP RPC wire format changes introduced in ipfs/js-ipfs#3922 and   ipfs/kubo#8183 and runs against the code from mentioned PRs (js-ipfs from ipfs/js-ipfs#3922 + go-ipfs 0.11.0-rc1) to ensure things work end-to-end.
    
    Expands DHT tests.
    
    Co-authored-by: achingbrain <alex@achingbrain.net>
    lidel and achingbrain authored Dec 16, 2021
    Copy the full SHA
    7063e6f View commit details
  2. chore: update lockfile

    achingbrain committed Dec 16, 2021
    Copy the full SHA
    68c2a50 View commit details
  3. 8.0.0

    achingbrain committed Dec 16, 2021
    Copy the full SHA
    dd43a59 View commit details

Commits on Jan 26, 2022

  1. fix: disable js dht during circuit tests (#430)

    There aren't enough peers to use the DHT during circuit tests, so disable it for JS the same way it's disabled for Go.
    achingbrain authored Jan 26, 2022
    Copy the full SHA
    8a1bbd5 View commit details
  2. chore: update lockfile

    achingbrain committed Jan 26, 2022
    Copy the full SHA
    0b6289a View commit details
  3. chore: add auto-release

    achingbrain committed Jan 26, 2022
    Copy the full SHA
    b7fff84 View commit details
  4. chore: restore ci tests on default branch (#424)

    Rationale: 
    
    - we finished landing and releasing all the breaking changes around go-ipfs 0.10 and 0.11, and switched to stable release versions of js-ipfs and go-ipfs 
    - running on master  here will make it easy for us to determine if interop failures in js-ipfs/go-ipfs CI is upstream issue, or local.
    
    Closes #409
    lidel authored Jan 26, 2022
    Copy the full SHA
    037f902 View commit details
  5. Copy the full SHA
    bd8767c View commit details
  6. chore(release): 8.0.1 [skip ci]

    ### [8.0.1](v8.0.0...v8.0.1) (2022-01-26)
    
    ### Bug Fixes
    
    * disable js dht during circuit tests ([#430](#430)) ([8a1bbd5](8a1bbd5))
    
    ### Trivial Changes
    
    * add auto-release ([b7fff84](b7fff84))
    * restore ci tests on default branch ([#424](#424)) ([037f902](037f902)), closes [#409](#409)
    * update build config ([bd8767c](bd8767c))
    * update lockfile ([0b6289a](0b6289a))
    semantic-release-bot committed Jan 26, 2022
    Copy the full SHA
    14e8262 View commit details
  7. Copy the full SHA
    b2e7630 View commit details
  8. Copy the full SHA
    fcc706e View commit details
  9. chore: update build

    semantic-release-bot authored and achingbrain committed Jan 26, 2022
    Copy the full SHA
    f4c783a View commit details
  10. chore(release): 8.0.2 [skip ci]

    ### [8.0.2](v8.0.1...v8.0.2) (2022-01-26)
    
    ### Bug Fixes
    
    * include scripts in dist ([fcc706e](fcc706e))
    
    ### Trivial Changes
    
    * run release after build ([b2e7630](b2e7630))
    * update build ([f4c783a](f4c783a))
    semantic-release-bot committed Jan 26, 2022
    Copy the full SHA
    9f19a45 View commit details
Showing with 46,542 additions and 14,342 deletions.
  1. +33 −18 .aegir.js
  2. +11 −0 .github/dependabot.yml
  3. +8 −0 .github/workflows/automerge.yml
  4. +145 −0 .github/workflows/js-test-and-release.yml
  5. +26 −0 .github/workflows/stale.yml
  6. +5 −0 .gitignore
  7. +0 −44 .travis.yml
  8. +144 −3 CHANGELOG.md
  9. +3 −20 LICENSE
  10. +5 −0 LICENSE-APACHE
  11. +19 −0 LICENSE-MIT
  12. +83 −13 README.md
  13. +4 −2 bin/ipfs-interop.js
  14. +43,440 −13,235 package-lock.json
  15. +192 −68 package.json
  16. +50 −0 scripts/custom-runtime.sh
  17. +150 −0 scripts/download-relay-daemon.js
  18. +15 −0 scripts/relayd_v1.config.json
  19. +15 −0 scripts/relayd_v2.config.json
  20. +22 −0 scripts/setup-libp2p-relay-daemon.js
  21. 0 src/index.js
  22. +5 −7 test/browser.js
  23. +29 −18 test/cid-version-agnostic.js
  24. +91 −24 test/circuit.js
  25. +0 −66 test/circuit/all.js
  26. +0 −150 test/circuit/browser.js
  27. +121 −0 test/circuit/v1/all.js
  28. +224 −0 test/circuit/v1/browser.js
  29. +82 −0 test/circuit/v2/all.js
  30. +42 −0 test/circuit/v2/browser.js
  31. +93 −90 test/exchange-files.js
  32. +160 −32 test/files.js
  33. +120 −101 test/ipns-pubsub.js
  34. +37 −19 test/ipns.js
  35. +413 −44 test/kad-dht.js
  36. +9 −11 test/node.js
  37. +87 −68 test/pin.js
  38. +171 −52 test/pubsub.js
  39. +0 −100 test/repo.js
  40. +0 −9 test/utils/chai.js
  41. +274 −104 test/utils/circuit.js
  42. +51 −28 test/utils/daemon-factory.js
  43. +1 −0 test/utils/is-windows.browser.js
  44. +3 −0 test/utils/is-windows.js
  45. +11 −10 test/utils/pin-utils.js
  46. +128 −0 test/utils/relayd.js
  47. +8 −6 test/utils/wait-for.js
  48. +12 −0 tsconfig.json
51 changes: 33 additions & 18 deletions .aegir.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
'use strict'
import path from 'path'
import { createServer } from 'ipfsd-ctl'
import { sigServer } from '@libp2p/webrtc-star-signalling-server'
import { fileURLToPath } from 'url'
import { resolve } from 'import-meta-resolve'

const path = require('path')
const createServer = require('ipfsd-ctl').createServer
const signaler = require('libp2p-webrtc-star/src/sig-server')
const __dirname = path.dirname(fileURLToPath(import.meta.url))
const ipfsModule = await resolve(process.env.IPFS_JS_HTTP_MODULE || 'ipfs', import.meta.url)
const ipfsHttpModule = await resolve(process.env.IPFS_JS_HTTP_MODULE || 'ipfs-http-client', import.meta.url)

async function findGoIpfsBin () {
if (process.env.IPFS_GO_EXEC != null) {
return process.env.IPFS_GO_EXEC
}

const modulePath = await resolve(process.env.IPFS_GO_IPFS_MODULE || 'go-ipfs', import.meta.url)
const module = await import(modulePath.replace('file://', ''))

return module.path()
}

/** @type {import('aegir').Options["build"]["config"]} */
const esbuild = {
@@ -11,41 +26,40 @@ const esbuild = {
{
name: 'node built ins',
setup (build) {
build.onResolve({ filter: /^stream$/ }, () => {
return { path: require.resolve('readable-stream') }
})

build.onResolve({ filter: /^ipfs$/ }, () => {
return { path: require.resolve(process.env.IPFS_JS_MODULE || 'ipfs') }
return { path: ipfsModule.replace('file://', '') }
})
build.onResolve({ filter: /^ipfs-http-client$/ }, () => {
return { path: require.resolve(process.env.IPFS_JS_HTTP_MODULE || 'ipfs-http-client') }
return { path: ipfsHttpModule.replace('file://', '') }
})
}
}
]
}

/** @type {import('aegir').PartialOptions} */
module.exports = {
export default {
test: {
browser: {
config: {
buildConfig: esbuild
}
},
async before (options) {
const ipfsHttpModule = await import(process.env.IPFS_JS_HTTP_MODULE || 'ipfs-http-client')
const ipfsModule = await import(process.env.IPFS_JS_MODULE || 'ipfs')

if (options.runner !== 'node') {
const ipfsdServer = await createServer({
host: '127.0.0.1',
port: 43134
}, {
type: 'go',
test: true,
ipfsHttpModule: require(process.env.IPFS_JS_HTTP_MODULE || 'ipfs-http-client')
ipfsHttpModule
}, {
go: {
ipfsBin: process.env.IPFS_GO_EXEC || require('go-ipfs').path()
ipfsBin: await findGoIpfsBin()
},
js: {
ipfsOptions: {
@@ -57,26 +71,27 @@ module.exports = {
}
}
},
ipfsModule: require(process.env.IPFS_JS_MODULE || 'ipfs'),
ipfsBin: process.env.IPFS_JS_EXEC || require.resolve(`${process.env.IPFS_JS_MODULE || 'ipfs'}/src/cli.js`)
ipfsModule,
ipfsBin: process.env.IPFS_JS_EXEC || ipfsModule.path()
}
}).start()

const signalingServer = await signaler.start({
const signallingServer = await sigServer({
port: 24642,
host: '0.0.0.0',
metrics: false
})

return {
ipfsdServer,
signalingServer
signallingServer
}
}
},
async after (options, before) {
if (options.runner !== 'node') {
await before.ipfsdServer.stop()
await before.signalingServer.stop()
await before.signallingServer.stop()
}
}
}
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "10:00"
open-pull-requests-limit: 10
commit-message:
prefix: "deps"
prefix-development: "deps(dev)"
8 changes: 8 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: Automerge
on: [ pull_request ]

jobs:
automerge:
uses: protocol/.github/.github/workflows/automerge.yml@master
with:
job: 'automerge'
145 changes: 145 additions & 0 deletions .github/workflows/js-test-and-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
name: test & maybe release
on:
push:
branches:
- master # with #262 - ${{{ github.default_branch }}}
pull_request:
branches:
- master # with #262 - ${{{ github.default_branch }}}

jobs:

check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present lint
- run: npm run --if-present dep-check

test-node:
needs: check
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
node: [16]
fail-fast: true
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:node
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: node

test-chrome:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:chrome
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: chrome

test-chrome-webworker:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:chrome-webworker
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: chrome-webworker

test-firefox:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:firefox
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: firefox

test-firefox-webworker:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:firefox-webworker
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: firefox-webworker

test-electron-main:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npx xvfb-maybe npm run --if-present test:electron-main
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: electron-main

test-electron-renderer:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npx xvfb-maybe npm run --if-present test:electron-renderer
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: electron-renderer

release:
needs: [test-node, test-chrome, test-chrome-webworker, test-firefox, test-firefox-webworker, test-electron-main, test-electron-renderer]
runs-on: ubuntu-latest
if: github.event_name == 'push' && github.ref == 'refs/heads/master' # with #262 - 'refs/heads/${{{ github.default_branch }}}'
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- uses: ipfs/aegir/actions/docker-login@master
with:
docker-token: ${{ secrets.DOCKER_TOKEN }}
docker-username: ${{ secrets.DOCKER_USERNAME }}
- run: npm run --if-present release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
26 changes: 26 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Close and mark stale issue

on:
schedule:
- cron: '0 0 * * *'

jobs:
stale:

runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write

steps:
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'Oops, seems like we needed more information for this issue, please comment with more details or this issue will be closed in 7 days.'
close-issue-message: 'This issue was closed because it is missing author input.'
stale-issue-label: 'kind/stale'
any-of-labels: 'need/author-input'
exempt-issue-labels: 'need/triage,need/community-input,need/maintainer-input,need/maintainers-input,need/analysis,status/blocked,status/in-progress,status/ready,status/deferred,status/inactive'
days-before-issue-stale: 6
days-before-issue-close: 7
enable-statistics: true
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ logs
*.log

coverage
.coverage

# Runtime data
pids
@@ -37,3 +38,7 @@ dist
test/test-data/go-ipfs-repo/LOCK
test/test-data/go-ipfs-repo/LOG
test/test-data/go-ipfs-repo/LOG.old
types
go-libp2p-relay-daemon
scripts/libp2p-relay-daemon
*.identity
44 changes: 0 additions & 44 deletions .travis.yml

This file was deleted.

Loading