Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

deps!: update to libp2p@0.38.x #4151

Merged
merged 32 commits into from
Aug 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2c6cad6
feat: update to libp2p@0.38.x
achingbrain Jun 29, 2022
cb468e4
chore: fix node types
achingbrain Jun 29, 2022
7cce5b4
chore: update metrics endpoint
achingbrain Jul 5, 2022
877b40b
chore: fix unit tests
achingbrain Aug 14, 2022
e08d037
chore: ignre interfaces dep
achingbrain Aug 15, 2022
f7d2c3d
chore: formatting
achingbrain Aug 15, 2022
478c939
chore: remove redunant code
achingbrain Aug 15, 2022
eec9cdf
chore: fix libp2p version
achingbrain Aug 15, 2022
5dc35c2
chore: deps
achingbrain Aug 15, 2022
18c8e05
chore: deps
achingbrain Aug 15, 2022
574e10a
chore: deps
achingbrain Aug 15, 2022
cbba70c
chore: deps
achingbrain Aug 15, 2022
5dd3858
chore: browsers are slow
achingbrain Aug 15, 2022
4c96843
chore: increase streams
achingbrain Aug 15, 2022
55d6864
chore: update bitswap
achingbrain Aug 15, 2022
6cf3bc5
chore: update deps
achingbrain Aug 17, 2022
ed9a571
chore: small change
achingbrain Aug 17, 2022
ac6a6d3
chore: small change
achingbrain Aug 17, 2022
c83f82f
chore: small change
achingbrain Aug 17, 2022
95d28b0
chore: small change
achingbrain Aug 17, 2022
477341d
chore: small change
achingbrain Aug 17, 2022
2213af8
chore: small change
achingbrain Aug 17, 2022
e2630ad
chore: small change
achingbrain Aug 17, 2022
c9cf8b8
chore: small change
achingbrain Aug 17, 2022
0997538
chore: deps
achingbrain Aug 17, 2022
82bb800
chore: deps again
achingbrain Aug 17, 2022
8268746
chore: deps
achingbrain Aug 17, 2022
fe498ea
chore: update project config
achingbrain Aug 17, 2022
7239eb0
chore: update config
achingbrain Aug 17, 2022
191a594
Merge remote-tracking branch 'origin/master' into feat/update-libp2p-…
achingbrain Aug 17, 2022
fe98678
chore: fix config
achingbrain Aug 17, 2022
75dd0e2
chore: update libp2p version
achingbrain Aug 17, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@ updates:
directory: "/"
schedule:
interval: daily
time: "11:00"
time: "10:00"
open-pull-requests-limit: 10
commit-message:
prefix: "deps"
prefix-development: "deps(dev)"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ tsconfig-types.aegir.json

# Coverage directory used by tools like istanbul
coverage
.coverage
.nyc_output
tests_output
cache
Expand Down
4 changes: 4 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This project is dual licensed under MIT and Apache-2.0.

MIT: https://www.opensource.org/licenses/mit
Apache-2.0: https://www.apache.org/licenses/license-2.0
2 changes: 1 addition & 1 deletion LICENSE-MIT
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
4 changes: 2 additions & 2 deletions docs/MIGRATION-TO-ASYNC-AWAIT.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const peerId = PeerId.createFromB58String(peerIdStr)
You can get hold of the `PeerId` class using npm or in a script tag:

```js
import { PeerId } from '@libp2p/interfaces/peer-id'
import { PeerId } from '@libp2p/interface-peer-id'
const peerId = PeerId.createFromB58String(peerIdStr)
```

Expand Down Expand Up @@ -128,7 +128,7 @@ You can get hold of the `PeerInfo` class using npm or in a script tag:

```js
const PeerInfo = require('peer-info')
import { PeerId } from '@libp2p/interfaces/peer-id'
import { PeerId } from '@libp2p/interface-peer-id'
const peerInfo = new PeerInfo(PeerId.createFromB58String(info.id))
info.addrs.forEach(addr => peerInfo.multiaddrs.add(addr))
```
Expand Down
2 changes: 1 addition & 1 deletion docs/MODULE.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Instead of a boolean, you may provide an object with custom initialization optio
- `privateKey` (string/PeerId) A pre-generated private key to use. Can be either a base64 string or a [PeerId](https://github.com/libp2p/js-peer-id) instance. **NOTE: This overrides `bits`.**
```js
// Generating a Peer ID:
import { PeerId } from '@libp2p/interfaces/peer-id'
import { PeerId } from '@libp2p/interface-peer-id'
// Generates a new Peer ID, complete with public/private keypair
// See https://github.com/libp2p/js-peer-id
const peerId = await PeerId.create({ bits: 2048 })
Expand Down
4 changes: 1 addition & 3 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"version": "independent",
"packages": [
"packages/*"
],
"useWorkspaces": true,
"command": {
"bootstrap": {
"hoist": true
Expand Down
275 changes: 20 additions & 255 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@
"name": "js-ipfs",
"version": "1.0.0",
"description": "JavaScript implementation of the IPFS specification",
"license": "Apache-2.0 OR MIT",
"homepage": "https://github.com/ipfs/js-ipfs#readme",
"repository": {
"type": "git",
"url": "git+https://github.com/ipfs/js-ipfs.git"
},
"bugs": {
"url": "https://github.com/ipfs/js-ipfs/issues"
},
"engines": {
"node": ">=16.0.0",
"npm": ">=7.0.0"
},
"private": true,
"scripts": {
"link": "lerna link",
"reset": "lerna run clean && rimraf packages/*/node_modules node_modules package-lock.json packages/*/package-lock.json",
Expand Down Expand Up @@ -44,268 +58,19 @@
"docker:rc:push-next": "docker push ipfs/js-ipfs:next",
"docker:rc:push-rc": "docker push ipfs/js-ipfs:v`npm show ipfs@next version -q`"
},
"eslintConfig": {
"extends": "ipfs",
"ignorePatterns": [
"!.aegir.js"
]
},
"devDependencies": {
"lerna": "^4.0.0",
"lerna": "^5.0.0",
"node-fetch": "npm:@achingbrain/node-fetch@^2.6.4",
"npm-run-all": "^4.1.5",
"rimraf": "^3.0.2"
},
"repository": {
"type": "git",
"url": "git+https://github.com/ipfs/js-ipfs.git"
"eslintConfig": {
"extends": "ipfs",
"ignorePatterns": [
"!.aegir.js"
]
},
"private": true,
"workspaces": [
"packages/*"
],
"engines": {
"npm": ">=7.0.0"
},
"contributors": [
"David Dias <daviddias.p@gmail.com>",
"achingbrain <alex@achingbrain.net>",
"Alan Shaw <alan.shaw@protocol.ai>",
"Friedel Ziegelmayer <dignifiedquire@gmail.com>",
"Juan Batiz-Benet <juan@benet.ai>",
"Vasco Santos <vasco.santos@moxy.studio>",
"Hugo Dias <hugomrdias@gmail.com>",
"Henrique Dias <hacdias@gmail.com>",
"Volker Mische <volker.mische@gmail.com>",
"ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>",
"Marcin Rataj <lidel@lidel.org>",
"Stephen Whitmore <stephen.whitmore@gmail.com>",
"Jacob Heun <jacobheun@gmail.com>",
"Francisco Baio Dias <xicombd@gmail.com>",
"Matt Bell <mappum@gmail.com>",
"Richard Schneider <makaretu@gmail.com>",
"Pedro Teixeira <i@pgte.me>",
"Travis Person <travis.person@gmail.com>",
"Kristoffer Ström <kristoffer@rymdkoloni.se>",
"Dmitriy Ryajov <dryajov@gmail.com>",
"Irakli Gozalishvili <contact@gozala.io>",
"Oli Evans <oli@tableflip.io>",
"nginnever <ginneversource@gmail.com>",
"Richard Littauer <richard.littauer@gmail.com>",
"dirkmc <dirkmdev@gmail.com>",
"Diogo Silva <fsdiogo@gmail.com>",
"Pedro Santos <pedro.santos@moxy.studio>",
"Connor Keenan <ckeenan89@gmail.com>",
"kumavis <kumavis@users.noreply.github.com>",
"Harlan T Wood <code@harlantwood.net>",
"Nitin Patel <31539366+niinpatel@users.noreply.github.com>",
"Pascal Precht <pascal.precht@googlemail.com>",
"Andrew Nesbitt <andrewnez@gmail.com>",
"Hector Sanjuan <code@hector.link>",
"Maciej Krüger <mkg20001@gmail.com>",
"Michael Garvin <gar+gh@danger.computer>",
"Steven Allen <steven@stebalien.com>",
"Michael Muré <batolettre@gmail.com>",
"Łukasz Magiera <magik6k@users.noreply.github.com>",
"João Antunes <j.goncalo.antunes@gmail.com>",
"Enrico Marino <enrico.marino@email.com>",
"Teri Chadbourne <terichadbourne@users.noreply.github.com>",
"Christian Couder <chriscool@tuxfamily.org>",
"Rob Brackett <rob@robbrackett.com>",
"Prabhakar Poudel <yuvrajzohan@gmail.com>",
"Mithgol <getgit@mithgol.ru>",
"Haad <haadcode@users.noreply.github.com>",
"Jonathan <jkrone@vt.edu>",
"Xmader <xmader@outlook.com>",
"Sangwon Hong <qpakzk@gmail.com>",
"Joonas Koivunen <joonas.koivunen@gmail.com>",
"Gavin McDermott <gavinmcdermott@gmail.com>",
"Mikeal Rogers <mikeal.rogers@gmail.com>",
"Dzmitry Das <dbachko@gmail.com>",
"Rod Vagg <rod@vagg.org>",
"Andrew de Andrade <andrew@deandrade.com.br>",
"Matt Ober <matt.ober3@gmail.com>",
"Максим Ильин <negamaxi@gmail.com>",
"Ryan Bell <ryan@piing.net>",
"Alex Mingoia <talk@alexmingoia.com>",
"RasmusErik Voel Jensen <github@solsort.com>",
"Marius Darila <marius.darila@gmail.com>",
"Yahya <ya7yaz@gmail.com>",
"anders <andersb@tuta.io>",
"bluelovers <codelovers@users.sourceforge.net>",
"Paulo Rodrigues <me@paulogr.com>",
"haad <haad@headbanggames.com>",
"Jeromy <jeromyj@gmail.com>",
"0xflotus <0xflotus@gmail.com>",
"Andrey <muzzzy@gmail.com>",
"André Cruz <andremiguelcruz@msn.com>",
"Antonio Tenorio-Fornés <antoniotenorio@ucm.es>",
"Dan Ordille <dordille@gmail.com>",
"Dan Shields <35669742+NukeManDan@users.noreply.github.com>",
"David Gilbertson <gilbertson.david@gmail.com>",
"Doug A <douganderson444@gmail.com>",
"Georgios Rassias <georassias@gmail.com>",
"Gorka Ludlow <gorka@aquigorka.com>",
"Jeff Downie <JeffDownie@users.noreply.github.com>",
"Jim Pick <jim@protocol.ai>",
"Jonybang <Jonybange@gmail.com>",
"Kevin Simper <kevin.simper@gmail.com>",
"Kevin Wang <kevin@fossa.io>",
"Ludwig <35169452+ludwigschubi@users.noreply.github.com>",
"Mark Robert Henderson <henderson.mark@gmail.com>",
"Maxime Lathuilière <k@maxlath.eu>",
"Molly <momack2@users.noreply.github.com>",
"Nuno Nogueira <nunofmn@gmail.com>",
"Portia Burton <plburton@gmail.com>",
"Raoul Millais <raoul@raoulmillais.com>",
"Sid Harder <sideharder@gmail.com>",
"Vu Tien Khang <kvutien.yes@gmail.com>",
"reasv <7143787+reasv@users.noreply.github.com>",
"samuli <samuli@nugg.ad>",
"shunkin <hiyoko.san.ipod@gmail.com>",
"tcme <hi@this-connect.me>",
"seungwon-kang <ksw3894@gmail.com>",
"Arpit Agarwal <atvanguard@users.noreply.github.com>",
"Jason Papakostas <vith@users.noreply.github.com>",
"Ilya Kreymer <ikreymer@users.noreply.github.com>",
"Julien Malard <julien.malard@mail.mcgill.ca>",
"phillmac <phillmac@users.noreply.github.com>",
"Holodisc <holodiscent@gmail.com>",
"Lars Gierth <larsg@systemli.org>",
"priecint <tp-dev@seznam.cz>",
"Lukas Drgon <lukas.drgon@gmail.com>",
"Heo Sangmin <heo@mapiacompany.com>",
"Manuel Spagnolo <shikaan@users.noreply.github.com>",
"Henry Rodrick <moshisushi@gmail.com>",
"Marcus Bernales <mboperator@gmail.com>",
"Harsh Vakharia <harshjv@users.noreply.github.com>",
"Alen Siljak <MisterY@users.noreply.github.com>",
"Mat Kelly <machawk1@gmail.com>",
"Haoliang Yu <haoliangyu@users.noreply.github.com>",
"Hannah Howard <hannah@hannahhoward.net>",
"Matt Zumwalt <matt@databindery.com>",
"robbsolter <35879806+robbsolter@users.noreply.github.com>",
"Michael Bradley <michaelsbradleyjr@gmail.com>",
"Guilherme Pacheco <guilherme.f.pacheco@hotmail.com>",
"Gregory Oakes <gregcoakes@gmail.com>",
"Michelle Lee <michelle@protocol.ai>",
"Grant Herman <grantlouisherman041@gmail.com>",
"Mitar <mitar.git@tnode.com>",
"Gopalakrishna Palem <KrishnaPG@users.noreply.github.com>",
"Mohamed Abdulaziz <mohamed@mohamedabdulaziz.com>",
"ron litzenberger <ron.litzenberger@gmail.com>",
"Mounish Sai <pvsmounish@gmail.com>",
"My9Bot <34904312+My9Bot@users.noreply.github.com>",
"Nate Foss <npfoss@gmail.com>",
"Adin Schmahmann <adin.schmahmann@gmail.com>",
"Nick Poulden <nick@poulden.com>",
"Nicolás Santángelo <santangelonicolas@gmail.com>",
"Giuseppe Bertone <bertone.giuseppe@gmail.com>",
"sarthak khandelwal <sarthak0906@gmail.com>",
"Níckolas Goline <nickolas.goline@gmail.com>",
"Giles <giles.bradshaw@sigyl.com>",
"Olivério Sousa <47525443+oliveriosousa@users.noreply.github.com>",
"Orie Steele <orie@ohs.io>",
"Oskar Nyberg <oskar@oskarnyberg.com>",
"Padmashree Jha <codewithpom@gmail.com>",
"George Shammas <georgyo@gmail.com>",
"Pau Ramon Revilla <masylum@gmail.com>",
"Paul Cowgill <pauldavidcowgill@gmail.com>",
"Gabriel Garrido Calvo <gabriel.garrido.work@gmail.com>",
"Filip Š <filip.stamcar@hotmail.com>",
"Fil <fil@rezo.net>",
"Pete Thomas <pete@xminusone.net>",
"Philipp Krüger <philipp.krueger1@gmail.com>",
"Felix Yan <felixonmars@archlinux.org>",
"Qmstream <51881352+Qmstream@users.noreply.github.com>",
"Adam Uhlíř <adam@uhlir.dev>",
"Faheel Ahmad <faheel@live.in>",
"Revat Arora <70435319+CypherX7@users.noreply.github.com>",
"Donatas Stundys <donatas.stundys@necolt.com>",
"Dominic Della Valle <ddvpublic@Gmail.com>",
"Rod Keys <rod@zokos.com>",
"Dmitry Nikulin <dmitr-nikulin@mail.ru>",
"Roman Khafizianov <requilence@gmail.com>",
"Dietrich Ayala <autonome@gmail.com>",
"Davide Icardi <davide.icardi@gmail.com>",
"Sergey Ukustov <sergey@ukstv.me>",
"swedneck <40505480+swedneck@users.noreply.github.com>",
"SidHarder <softwarenavigator@gmail.com>",
"A_A <21040751+Otto-AA@users.noreply.github.com>",
"David da Silva <dasilvacontin@gmail.com>",
"Steven Vandevelde <icid.asset@gmail.com>",
"Subin Siby <subins2000@gmail.com>",
"TJKoury <TJKoury@gmail.com>",
"Tapasweni Pathak <tapaswenipathak@gmail.com>",
"Tara Vancil <tbvanc@gmail.com>",
"Tejas Kumthekar <6154318+tk26@users.noreply.github.com>",
"Terence Pae <terencepae@gmail.com>",
"David Braun <David.Braun@Toptal.com>",
"Thiago Delgado <thiagodelgado111@gmail.com>",
"Thorsten Zoerner <me@thorsten-zoerner.com>",
"Timothé <noki.dev@gmail.com>",
"David <github@kattfest.se>",
"Danny <dannyid@protonmail.com>",
"thattommyhall <thattommyhall@gmail.com>",
"Uroš Jurglič <jurglic@gmail.com>",
"Daniela Borges Matos de Carvalho <alunassertiva@gmail.com>",
"Daniel J. O'Quinn <danieljoquinn@gmail.com>",
"Victor Bjelkholm <victor@typeform.com>",
"Daniel Constantin <hello@danielconstantin.net>",
"Vincent Martin <vince@finalatomicbuster.net>",
"Daniel Buchner <danieljb2@gmail.com>",
"Alex North <alex@alexnorth.me>",
"Vutsal Singhal <vutsalsinghal@gmail.com>",
"Xiao Liang <yxliang01@users.noreply.github.com>",
"Dafeng <dfguo.joe@gmail.com>",
"Connor White <connor.bcw@gmail.com>",
"Yole <yole@ultiledger.io>",
"Yusef Napora <yusef@napora.org>",
"Zhiyuan Lin <edsgerlin@gmail.com>",
"Clemo <flipflopsimsommer@users.noreply.github.com>",
"Christian Paul <info@jaller.de>",
"arjunraghurama <arjunr0019@gmail.com>",
"bitspill <bitspill+github@bitspill.net>",
"Chirag Shinde <chirag-shinde@users.noreply.github.com>",
"datafatmunger <jbg@peerparty.org>",
"Chance Hudson <jchancehud@gmail.com>",
"Caio Gondim <me@caiogondim.com>",
"CSDUMMI <31551856+CSDUMMI@users.noreply.github.com>",
"CHEVALAY JOSSELIN <josselin54.chevalay@gmail.com>",
"Bruno Zell <bruno.zzell@gmail.com>",
"dmitriy ryajov <dryajov@dmitriys-MacBook-Pro.local>",
"elsehow <yes@cosmopol.is>",
"ethers <ethereum@outlook.com>",
"Bruno Barbieri <bbarbieri@delivery.com>",
"Brian Vander Schaaf <bvs330@gmail.com>",
"Brandon <fcbrandon@outlook.com>",
"Bernard Mordan <bernard@tableflip.io>",
"hapsody <hapsody@gmail.com>",
"imestin <34135450+imestin@users.noreply.github.com>",
"isan_rivkin <isanrivkin@gmail.com>",
"javaskript <14116782+javaskript@users.noreply.github.com>",
"Ayush Mahajan <mahajan.ayush2306@gmail.com>",
"jonahweissman <19804455+jonahweissman@users.noreply.github.com>",
"kevingzhang <kevin.zhang.canada@gmail.com>",
"klueq <43359723+klueq@users.noreply.github.com>",
"James Halliday <substack@gmail.com>",
"Jason Carver <jacarver@linkedin.com>",
"Jeeyong Um <conr2d@gmail.com>",
"leekt216 <leekt216@gmail.com>",
"nature hacker <30657227+z89@users.noreply.github.com>",
"Jessica Schilling <jessica@protocol.ai>",
"Arkadiy Kukarkin <parkan@users.noreply.github.com>",
"Joe Turgeon <arithmetric@gmail.com>",
"Joel Gustafson <joelg@mit.edu>",
"Johannes Wikner <johannes.wikner@gmail.com>",
"John Kane <john@kanej.me>",
"Johnny <9611008+johnnymatthews@users.noreply.github.com>",
"Jon Schlinkert <dev@sellside.com>",
"Jade Meskill <jade.meskill@gmail.com>",
"Jonathan Commins <joncom@gmail.com>",
"noah the goodra <peterpan0413@live.com>",
"Jacob Karlsson <jacob.karlsson95@gmail.com>",
"Jorropo <jorropo.pgm@gmail.com>",
"João Santos <joaosantos15@users.noreply.github.com>"
]
}
23 changes: 3 additions & 20 deletions packages/interface-ipfs-core/LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
The MIT License (MIT)
This project is dual licensed under MIT and Apache-2.0.

Copyright (c) 2018 Protocol Labs, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
MIT: https://www.opensource.org/licenses/mit
Apache-2.0: https://www.apache.org/licenses/license-2.0
5 changes: 5 additions & 0 deletions packages/interface-ipfs-core/LICENSE-APACHE
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
Loading