diff --git a/add-on/src/lib/ipfs-client/embedded.js b/add-on/src/lib/ipfs-client/embedded.js index e02a975fd..933d36478 100644 --- a/add-on/src/lib/ipfs-client/embedded.js +++ b/add-on/src/lib/ipfs-client/embedded.js @@ -5,21 +5,24 @@ process.hrtime = require('browser-process-hrtime') const Ipfs = require('ipfs') const { optionDefaults } = require('../options') const http = require('http') // courtesy of chrome-net - -const Hapi = require('hapi') +const Hapi = require('hapi') // courtesy of js-ipfs let node = null let httpServer = null let hapiServer = null exports.init = function init (opts) { - console.log('[ipfs-companion] Embedded ipfs init') - - node = new Ipfs( - JSON.parse(opts.ipfsNodeConfig || optionDefaults.ipfsNodeConfig) - ) - - // find first free port and start http server + // BRAVE TESTS FIRST + // TODO: remove after experiments are done + // ======================================= + // [x] start raw http server (http.createServer) + // [x] start raw Hapi server (Hapi.Server) + // [x] return response + // [ ] start js-ipfs with Gateway exposed by embedded Hapi server + // - right now fails due to `TypeError: this._dht.on is not a function`, + // but we are on the right track + // ======================================= + // TEST RAW require('http') SERVER if (!httpServer) { let port = 9091 httpServer = http.createServer(function (req, res) { @@ -27,38 +30,45 @@ exports.init = function init (opts) { res.end('Hello from ipfs-companion exposing HTTP via chrome.sockets in Brave :-)\n') }) httpServer.listen(port, '127.0.0.1') - console.log(`[ipfs-companion] started demo HTTP server on http://127.0.0.1:${port}`) + console.log(`[ipfs-companion] require('http') HTTP server on http://127.0.0.1:${port}`) } - - // find first free port and start http server + // ======================================= + // TEST require('hapi') HTTP SERVER (same as in js-ipfs) if (!hapiServer) { let port = 9092 let options = { + host: '127.0.0.1', + port, debug: { log: ['*'], request: ['*'] } } - hapiServer = new Hapi.Server(options) - hapiServer.connection({ - host: '127.0.0.1', - port - }) - - hapiServer.route({ - method: 'GET', - path: '/', - handler: function (request, reply) { - console.log('[ipfs-companion] hapiServer processing request', request) - return reply('Hello') - } - }) - - hapiServer.start((err) => { - if (err) console.error(`[ipfs-companion] Failed to start Hapi`, err) - console.log(`[ipfs-companion] started demo Hapi server on http://127.0.0.1:${port}`) - }) + const initHapi = async () => { + // hapi v18 (js-ipfs >=v0.35.0-pre.0) + hapiServer = new Hapi.Server(options) + await hapiServer.route({ + method: 'GET', + path: '/', + handler: (request, h) => { + console.log('[ipfs-companion] hapiServer processing request', request) + return 'Hello from ipfs-companion+Hapi.js exposing HTTP via chrome.sockets in Brave :-)' + } + }) + // await hapiServer.register({ + // }) + await hapiServer.start() + console.log(`[ipfs-companion] require('hapi') HTTP server running at: ${hapiServer.info.uri}`) + } + initHapi() } + // ======================================= + // Resume regular startup + console.log('[ipfs-companion] Embedded ipfs init') + + node = new Ipfs( + JSON.parse(opts.ipfsNodeConfig || optionDefaults.ipfsNodeConfig) + ) if (node.isOnline()) { return Promise.resolve(node) @@ -80,14 +90,16 @@ exports.destroy = async function () { httpServer = null } if (hapiServer) { - hapiServer.stop({ timeout: 1000 }).then(function (err) { + try { + await hapiServer.stop({ timeout: 1000 }) + } catch (err) { if (err) { console.error(`[ipfs-companion] failed to stop hapi`, err) } else { console.log('[ipfs-companion] hapi server stopped') } - }) - httpServer = null + } + hapiServer = null } await node.stop() diff --git a/add-on/src/lib/options.js b/add-on/src/lib/options.js index 574cdb09f..895672515 100644 --- a/add-on/src/lib/options.js +++ b/add-on/src/lib/options.js @@ -2,13 +2,11 @@ exports.optionDefaults = Object.freeze({ active: true, // global ON/OFF switch, overrides everything else - ipfsNodeType: 'external', // or 'embedded' + ipfsNodeType: 'embedded', // Brave should default to js-ipfs: https://github.com/ipfs-shipyard/ipfs-companion/issues/664 ipfsNodeConfig: JSON.stringify({ config: { Addresses: { - // Swarm: [], - Swarm: [ - ], + Swarm: [], // API: '/ip4/127.0.0.1/tcp/5002', Gateway: '/ip4/127.0.0.1/tcp/9090' } diff --git a/package.json b/package.json index 6ee72714a..57ea6aa6d 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "filesize": "3.6.1", "http-dns": "3.0.1", "http-node": "1.2.0", - "ipfs": "0.34.0", + "ipfs": "0.35.0-pre.0", "ipfs-css": "0.12.0", "ipfs-http-client": "28.1.1", "ipfs-http-response": "0.2.1", diff --git a/webpack.config.js b/webpack.config.js index c6f119205..bf8e2fa40 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -51,6 +51,7 @@ const commonConfig = { resolve: { extensions: ['.js', '.json'], alias: { + 'url': 'iso-url', 'http': 'http-node', 'dns': 'http-dns', 'dgram': 'chrome-dgram', diff --git a/yarn.lock b/yarn.lock index 5d4355837..304c246b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -691,7 +691,7 @@ "@webassemblyjs/ast@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace" + resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace" integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA== dependencies: "@webassemblyjs/helper-module-context" "1.7.11" @@ -700,44 +700,44 @@ "@webassemblyjs/floating-point-hex-parser@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313" + resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313" integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg== "@webassemblyjs/helper-api-error@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a" integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg== "@webassemblyjs/helper-buffer@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b" integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w== "@webassemblyjs/helper-code-frame@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b" integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw== dependencies: "@webassemblyjs/wast-printer" "1.7.11" "@webassemblyjs/helper-fsm@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181" integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A== "@webassemblyjs/helper-module-context@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209" integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg== "@webassemblyjs/helper-wasm-bytecode@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06" integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ== "@webassemblyjs/helper-wasm-section@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a" + resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a" integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q== dependencies: "@webassemblyjs/ast" "1.7.11" @@ -747,26 +747,26 @@ "@webassemblyjs/ieee754@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b" + resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b" integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ== dependencies: "@xtuc/ieee754" "^1.2.0" "@webassemblyjs/leb128@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63" + resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63" integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw== dependencies: "@xtuc/long" "4.2.1" "@webassemblyjs/utf8@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82" + resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82" integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA== "@webassemblyjs/wasm-edit@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005" + resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005" integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg== dependencies: "@webassemblyjs/ast" "1.7.11" @@ -780,7 +780,7 @@ "@webassemblyjs/wasm-gen@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8" + resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8" integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA== dependencies: "@webassemblyjs/ast" "1.7.11" @@ -791,7 +791,7 @@ "@webassemblyjs/wasm-opt@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7" + resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7" integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg== dependencies: "@webassemblyjs/ast" "1.7.11" @@ -801,7 +801,7 @@ "@webassemblyjs/wasm-parser@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a" + resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a" integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg== dependencies: "@webassemblyjs/ast" "1.7.11" @@ -813,7 +813,7 @@ "@webassemblyjs/wast-parser@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c" + resolved "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c" integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ== dependencies: "@webassemblyjs/ast" "1.7.11" @@ -825,7 +825,7 @@ "@webassemblyjs/wast-printer@1.7.11": version "1.7.11" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813" + resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813" integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg== dependencies: "@webassemblyjs/ast" "1.7.11" @@ -839,7 +839,7 @@ "@xtuc/long@4.2.1": version "4.2.1" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8" + resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8" integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g== "@yarnpkg/lockfile@^1.0.2": @@ -899,6 +899,11 @@ abstract-leveldown@~4.0.0: dependencies: xtend "~4.0.0" +abstract-logging@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/abstract-logging/-/abstract-logging-1.0.0.tgz#8b7deafd310559bc28f77724dd1bb30177278c1b" + integrity sha1-i33q/TEFWbwo93ck3RuzAXcnjBs= + accept@2.x.x: version "2.1.4" resolved "https://registry.yarnpkg.com/accept/-/accept-2.1.4.tgz#887af54ceee5c7f4430461971ec400c61d09acbb" @@ -907,6 +912,14 @@ accept@2.x.x: boom "5.x.x" hoek "4.x.x" +accept@3.x.x: + version "3.1.3" + resolved "https://registry.npmjs.org/accept/-/accept-3.1.3.tgz#29c3e2b3a8f4eedbc2b690e472b9ebbdc7385e87" + integrity sha512-OgOEAidVEOKPup+Gv2+2wdH2AgVKI9LxsJ4hicdJ6cY0faUuZdZoi56kkXWlHp9qicN1nWQLmW5ZRGk+SBS5xg== + dependencies: + boom "7.x.x" + hoek "6.x.x" + accepts@~1.3.4, accepts@~1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" @@ -917,7 +930,7 @@ accepts@~1.3.4, accepts@~1.3.5: acorn-dynamic-import@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278" + resolved "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278" integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg== dependencies: acorn "^5.0.0" @@ -1127,6 +1140,13 @@ ammo@2.x.x: boom "5.x.x" hoek "4.x.x" +ammo@3.x.x: + version "3.0.3" + resolved "https://registry.npmjs.org/ammo/-/ammo-3.0.3.tgz#502aafa9d8bfca264143e226e5f322716e746b0c" + integrity sha512-vo76VJ44MkUBZL/BzpGXaKzMfroF4ZR6+haRuw9p+eSWfoNaH2AxVc8xmiEPC08jhzJSeM6w7/iMUGet8b4oBQ== + dependencies: + hoek "6.x.x" + amqplib@^0.5.1: version "0.5.3" resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.5.3.tgz#7ccfc85d12ee7cd3c6dc861bb07f0648ec3d7193" @@ -1264,6 +1284,16 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +args@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/args/-/args-5.0.0.tgz#8a3e376f28550f9fbdfefcb097179f2f75848efe" + integrity sha512-eCZo33yLdQ3DiG/Ko5n11uPonyYofYd9F2cqWID8TKGZwK/Z2ZcUj/oZ1HNMeNL2lgraPnv3JBZumfbUMqmZtg== + dependencies: + camelcase "5.0.0" + chalk "2.4.1" + leven "2.1.0" + mri "1.1.1" + arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" @@ -1443,6 +1473,13 @@ async@^2.0.0, async@^2.0.1, async@^2.5.0, async@^2.6.0, async@^2.6.1, async@~2.6 dependencies: lodash "^4.17.10" +async@^2.6.2: + version "2.6.2" + resolved "https://registry.npmjs.org/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381" + integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg== + dependencies: + lodash "^4.17.11" + async@~0.2.9: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" @@ -1480,6 +1517,13 @@ b64@3.x.x: resolved "https://registry.yarnpkg.com/b64/-/b64-3.0.3.tgz#36afeee0d9345f046387ce6de8a6702afe5bb56e" integrity sha512-Pbeh0i6OLubPJdIdCepn8ZQHwN2MWznZHbHABSTEfQ706ie+yuxNSaPdqX1xRatT6WanaS1EazMiSg0NUW2XxQ== +b64@4.x.x: + version "4.1.2" + resolved "https://registry.npmjs.org/b64/-/b64-4.1.2.tgz#7015372ba8101f7fb18da070717a93c28c8580d8" + integrity sha512-+GUspBxlH3CJaxMUGUE1EBoWM6RKgWiYwUDal0qdf8m3ArnXNN1KzKVo5HOnE/FSq4HHyWf3TlHLsZI8PKQgrQ== + dependencies: + hoek "6.x.x" + babel-code-frame@^6.16.0, babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" @@ -1736,6 +1780,14 @@ bl@^2.1.2: readable-stream "^2.3.5" safe-buffer "^5.1.1" +bl@^2.2.0: + version "2.2.0" + resolved "https://registry.npmjs.org/bl/-/bl-2.2.0.tgz#e1a574cdf528e4053019bb800b041c0ac88da493" + integrity sha512-wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA== + dependencies: + readable-stream "^2.3.5" + safe-buffer "^5.1.1" + blakejs@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.1.0.tgz#69df92ef953aa88ca51a32df6ab1c54a155fc7a5" @@ -1811,7 +1863,7 @@ boom@5.x.x: dependencies: hoek "4.x.x" -boom@^7.2.0: +boom@7.x.x, boom@^7.2.0: version "7.3.0" resolved "https://registry.yarnpkg.com/boom/-/boom-7.3.0.tgz#733a6d956d33b0b1999da3fe6c12996950d017b9" integrity sha512-Swpoyi2t5+GhOEGw8rEsKvTxFLIDiiKoUc2gsoV6Lyr43LHBIzch3k2MvYUs8RTROrIkVJ3Al0TkaOGjnb+B6A== @@ -1828,6 +1880,19 @@ borc@^2.0.3: ieee754 "^1.1.8" json-text-sequence "^0.1" +bounce@1.x.x: + version "1.2.3" + resolved "https://registry.npmjs.org/bounce/-/bounce-1.2.3.tgz#2b286d36eb21d5f08fe672dd8cd37a109baad121" + integrity sha512-3G7B8CyBnip5EahCZJjnvQ1HLyArC6P5e+xcolo13BVI9ogFaDOsNMAE7FIWliHtIkYI8/nTRCvCY9tZa3Mu4g== + dependencies: + boom "7.x.x" + hoek "6.x.x" + +bourne@1.x.x: + version "1.1.2" + resolved "https://registry.npmjs.org/bourne/-/bourne-1.1.2.tgz#e290b5bd7166635632eaf8ef12b006b2d4a75b83" + integrity sha512-b2dgVkTZhkQirNMohgC00rWfpVqEi9y5tKM1k3JvoNx05ODtfQoPPd4js9CYFQoY0IM8LAmnJulEuWv74zjUOg== + boxen@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" @@ -2143,6 +2208,14 @@ call@4.x.x: boom "5.x.x" hoek "4.x.x" +call@5.x.x: + version "5.0.3" + resolved "https://registry.npmjs.org/call/-/call-5.0.3.tgz#5dc82c698141c2d45c51a9c3c7e0697f43ac46a2" + integrity sha512-eX16KHiAYXugbFu6VifstSdwH6aMuWWb4s0qvpq1nR1b+Sf+u68jjttg8ixDBEldPqBi30bDU35OJQWKeTLKxg== + dependencies: + boom "7.x.x" + hoek "6.x.x" + callbackify@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/callbackify/-/callbackify-1.1.0.tgz#d2a36986d28aa69714526c111209beeb9979d31e" @@ -2214,6 +2287,11 @@ camelcase@4.1.0, camelcase@^4.0.0, camelcase@^4.1.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= +camelcase@5.0.0, camelcase@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42" + integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA== + camelcase@^2.0.0, camelcase@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" @@ -2224,11 +2302,6 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= -camelcase@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42" - integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA== - caniuse-lite@^1.0.30000921: version "1.0.30000921" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000921.tgz#7a607c1623444b22351d834e093aedda3c42fbe8" @@ -2251,6 +2324,23 @@ catbox-memory@2.x.x: dependencies: hoek "4.x.x" +catbox-memory@4.x.x: + version "4.0.1" + resolved "https://registry.npmjs.org/catbox-memory/-/catbox-memory-4.0.1.tgz#3371ae0dd91bbf5d9dd88dcab5332470354cbd1f" + integrity sha512-ZmqNiLsYCIu9qvBJ/MQbznDV2bFH5gFiH67TgIJgSSffJFtTXArT+MM3AvJQlby9NSkLHOX4eH/uuUqnch/Ldw== + dependencies: + boom "7.x.x" + hoek "6.x.x" + +catbox@10.x.x: + version "10.0.6" + resolved "https://registry.npmjs.org/catbox/-/catbox-10.0.6.tgz#d8d8dc3c36c965560539f94245904b229a8af428" + integrity sha512-gQWCnF/jbHcfwGbQ4FQxyRiAwLRipqWTTXjpq7rTqqdcsnZosFa0L3LsCZcPTF33QIeMMkS7QmFBHt6QdzGPvg== + dependencies: + boom "7.x.x" + hoek "6.x.x" + joi "14.x.x" + catbox@7.x.x: version "7.1.5" resolved "https://registry.yarnpkg.com/catbox/-/catbox-7.1.5.tgz#c56f7e8e9555d27c0dc038a96ef73e57d186bb1f" @@ -2300,6 +2390,15 @@ chalk@2.4.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@2.4.1, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" + integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -2311,10 +2410,10 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ== +chalk@^2.3.2: + version "2.4.2" + resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== dependencies: ansi-styles "^3.2.1" escape-string-regexp "^1.0.5" @@ -2547,6 +2646,16 @@ clone-deep@^0.3.0: kind-of "^3.2.2" shallow-clone "^0.1.2" +clone-deep@^2.0.1: + version "2.0.2" + resolved "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713" + integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ== + dependencies: + for-own "^1.0.0" + is-plain-object "^2.0.4" + kind-of "^6.0.0" + shallow-clone "^1.0.0" + clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" @@ -2750,6 +2859,13 @@ content@3.x.x, content@^3.0.0: dependencies: boom "5.x.x" +content@4.x.x: + version "4.0.6" + resolved "https://registry.npmjs.org/content/-/content-4.0.6.tgz#76ffd96c5cbccf64fe3923cbb9c48b8bc04b273e" + integrity sha512-lR9ND3dXiMdmsE84K6l02rMdgiBVmtYWu1Vr/gfSGHcIcznBj2QxmSdUgDuNFOA+G9yrb1IIWkZ7aKtB6hDGyA== + dependencies: + boom "7.x.x" + convert-source-map@^1.1.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" @@ -2915,6 +3031,13 @@ cryptiles@3.x.x: dependencies: boom "5.x.x" +cryptiles@4.x.x: + version "4.1.3" + resolved "https://registry.npmjs.org/cryptiles/-/cryptiles-4.1.3.tgz#2461d3390ea0b82c643a6ba79f0ed491b0934c25" + integrity sha512-gT9nyTMSUC1JnziQpPbxKGBbUg8VL7Zn2NB4E1cJYvuXdElHrwxrV9bmltZGDzet45zSDGyYceueke1TjynGzw== + dependencies: + boom "7.x.x" + crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -3052,6 +3175,11 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= +dateformat@^3.0.3: + version "3.0.3" + resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" + integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== + debounce@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.1.0.tgz#6a1a4ee2a9dc4b7c24bb012558dbcdb05b37f408" @@ -4488,6 +4616,11 @@ fast-redact@^1.2.0, fast-redact@^1.4.0: resolved "https://registry.js.ipfs.io/fast-redact/-/fast-redact-1.4.2.tgz#14989f452ee07f0723fbb483ee778d363135b7ad" integrity sha512-ttC8IgelNvYqb9RBC+rirgUCVPtPVonfdeRdsHBcBx3kzQat1DafbUKAEhLo5GnvuBqda+Xe1BvblecPpQkZ2Q== +fast-redact@^1.4.2: + version "1.4.4" + resolved "https://registry.npmjs.org/fast-redact/-/fast-redact-1.4.4.tgz#d29bd1d0cc3ab808a9d4f9870f6e27e85c750db4" + integrity sha512-QOQZ8sDDQPZMJ6x6zlm6hLZ2cjPDqfN3R/AYnAbM+yy8VNPvOnVXdUF/E/xbMv7g44c1krhWuzgjH2u0V5Vhsg== + fast-safe-stringify@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz#04b26106cc56681f51a044cfc0d76cf0008ac2c2" @@ -4707,9 +4840,9 @@ flatmap@0.0.3: resolved "https://registry.yarnpkg.com/flatmap/-/flatmap-0.0.3.tgz#1f18a4d938152d495965f9c958d923ab2dd669b4" integrity sha1-Hxik2TgVLUlZZfnJWNkjqy3WabQ= -flatstr@^1.0.5, flatstr@^1.0.8: +flatstr@^1.0.5, flatstr@^1.0.8, flatstr@^1.0.9: version "1.0.9" - resolved "https://registry.yarnpkg.com/flatstr/-/flatstr-1.0.9.tgz#0950d56fec02de1030c1311847ecd58c25690eb9" + resolved "https://registry.npmjs.org/flatstr/-/flatstr-1.0.9.tgz#0950d56fec02de1030c1311847ecd58c25690eb9" integrity sha512-qFlJnOBWDfIaunF54/lBqNKmXOI0HqNhu+mHkLmbaBXlS71PUd9OjFOdyevHt/aHoHB1+eW7eKHgRKOG5aHSpw== fluent-syntax@0.7.0: @@ -5288,10 +5421,15 @@ handlebars@^4.0.11: optionalDependencies: uglify-js "^3.1.4" -hapi-set-header@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/hapi-set-header/-/hapi-set-header-1.0.2.tgz#2afae002c6719d6d54f3fa88462f822892d2df13" - integrity sha1-KvrgAsZxnW1U8/qIRi+CKJLS3xM= +hapi-pino@^5.2.0: + version "5.4.1" + resolved "https://registry.npmjs.org/hapi-pino/-/hapi-pino-5.4.1.tgz#b4ea582037b924b05e826cb68907295ba9bbe531" + integrity sha512-Bmt0XtRm5xPRE26bcn4dakgLPyAPyadEI5LF9P4EMP43XDzbxl4wQqwe2uVC463X9txdkwOAjaan3vDTC/guaQ== + dependencies: + abstract-logging "^1.0.0" + hoek "^6.1.2" + pino "^5.10.1" + pino-pretty "^2.5.0" hapi@^16.6.2: version "16.7.0" @@ -5318,6 +5456,30 @@ hapi@^16.6.2: subtext "5.x.x" topo "2.x.x" +hapi@^18.0.0: + version "18.1.0" + resolved "https://registry.npmjs.org/hapi/-/hapi-18.1.0.tgz#98a2a5a8f37a41eb196bdad9727f66b1fbca5fec" + integrity sha512-nSU1VLyTAgp7P5gy47QzJIP2JAb+wOFvJIV3gnL0lFj/mD+HuTXhyUsDYXjF/dhADMVXVEz31z6SUHBJhtsvGA== + dependencies: + accept "3.x.x" + ammo "3.x.x" + boom "7.x.x" + bounce "1.x.x" + call "5.x.x" + catbox "10.x.x" + catbox-memory "4.x.x" + heavy "6.x.x" + hoek "6.x.x" + joi "14.x.x" + mimos "4.x.x" + podium "3.x.x" + shot "4.x.x" + somever "2.x.x" + statehood "6.x.x" + subtext "6.x.x" + teamwork "3.x.x" + topo "3.x.x" + har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -5485,6 +5647,15 @@ heavy@4.x.x: hoek "4.x.x" joi "10.x.x" +heavy@6.x.x: + version "6.1.2" + resolved "https://registry.npmjs.org/heavy/-/heavy-6.1.2.tgz#e5d56f18170a37b01d4381bc07fece5edc68520b" + integrity sha512-cJp884bqhiebNcEHydW0g6V1MUGYOXRPw9c7MFiHQnuGxtbWuSZpsbojwb2kxb3AA1/Rfs8CNiV9MMOF8pFRDg== + dependencies: + boom "7.x.x" + hoek "6.x.x" + joi "14.x.x" + hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -5936,7 +6107,7 @@ ipfs-bitswap@~0.22.0: pull-stream "^3.6.9" varint-decoder "~0.1.1" -ipfs-block-service@~0.15.0, ipfs-block-service@~0.15.1: +ipfs-block-service@~0.15.1: version "0.15.2" resolved "https://registry.yarnpkg.com/ipfs-block-service/-/ipfs-block-service-0.15.2.tgz#8c35505fc9d9c883e27890fe99b587f270440d43" integrity sha512-iudmJO7UJZHonWoXyakuzy+bpV/7QVDm/g8eCqKN2BvhSjnLepaxdTyaXxJ76F2EOav1hdBP+U3Z9Mg/aCFPgg== @@ -6075,10 +6246,10 @@ ipfs-http-response@0.2.1, ipfs-http-response@~0.2.1: promisify-es6 "^1.0.3" stream-to-blob "^1.0.1" -ipfs-mfs@~0.8.0: - version "0.8.1" - resolved "https://registry.js.ipfs.io/ipfs-mfs/-/ipfs-mfs-0.8.1.tgz#86f0a0e498d1baecaf84e7fe86b343e28827c00d" - integrity sha512-pP7YM4b4iYB8E3R9P4gdOFGsiN1QP9+Jzarj2Zs9mVM1CEgGOQPTmx5KTPZJlG74PntypM7bt9IcuODdV7Vcfw== +ipfs-mfs@~0.9.1: + version "0.9.2" + resolved "https://registry.npmjs.org/ipfs-mfs/-/ipfs-mfs-0.9.2.tgz#336cefcc84e0f637d143bfda575ab3124213673f" + integrity sha512-QYPM5vtuI67+wz+RyoLZytfN3+aAbFkElq2uORAYf83iVkUT7fx9dQHmHBOLelGzL/VorGGfUCFiZQHBMG4BdQ== dependencies: async "^2.6.1" cids "~0.5.5" @@ -6090,10 +6261,10 @@ ipfs-mfs@~0.8.0: ipfs-unixfs "~0.1.16" ipfs-unixfs-exporter "~0.35.5" ipfs-unixfs-importer "~0.38.0" - ipld-dag-pb "~0.15.0" + ipld-dag-pb "~0.15.2" is-pull-stream "~0.0.0" is-stream "^1.1.0" - joi "^14.0.4" + joi "^14.3.0" joi-browser "^13.4.0" mortice "^1.2.1" once "^1.4.0" @@ -6137,29 +6308,6 @@ ipfs-postmsg-proxy@3.1.1: shortid "^2.2.8" stream-to-pull-stream "^1.7.2" -ipfs-repo@~0.26.0: - version "0.26.0" - resolved "https://registry.js.ipfs.io/ipfs-repo/-/ipfs-repo-0.26.0.tgz#95d4afe86d6734ad297e97ce91720b6cb3048813" - integrity sha512-fmA/bUcmTQ8Odn4mmCxemOfe8Rq+MdqbE0a/NLpAE2ljxaVeOutKuD5ztKAzkAvQN6uj/hoy+HRToRHsFO3QNw== - dependencies: - async "^2.6.1" - base32.js "~0.1.0" - big.js "^5.2.2" - cids "~0.5.7" - datastore-core "~0.6.0" - datastore-fs "~0.7.0" - datastore-level "~0.10.0" - debug "^4.1.0" - interface-datastore "~0.6.0" - ipfs-block "~0.8.0" - lodash.get "^4.4.2" - lodash.has "^4.5.2" - lodash.set "^4.3.2" - multiaddr "^6.0.0" - proper-lockfile "^3.2.0" - pull-stream "^3.6.9" - sort-keys "^2.0.0" - ipfs-repo@~0.26.1: version "0.26.1" resolved "https://registry.js.ipfs.io/ipfs-repo/-/ipfs-repo-0.26.1.tgz#8ab8fcb8d028f544c7b731bc0eefb547a85605c2" @@ -6239,10 +6387,10 @@ ipfs-unixfs@~0.1.14, ipfs-unixfs@~0.1.16: dependencies: protons "^1.0.1" -ipfs@0.34.0: - version "0.34.0" - resolved "https://registry.js.ipfs.io/ipfs/-/ipfs-0.34.0.tgz#3337d2de07e897d2e9e8e137947fac0d2e2633c8" - integrity sha512-NYjBYHcXTEyHKIeaX7Qkn/t+7HuKIV0rJ1m/ZttZbSsGaQJkxWn8BC7Ly9yOqQARVMtpM8jvgV/eo68TY1mibQ== +ipfs@0.35.0-pre.0: + version "0.35.0-pre.0" + resolved "https://registry.npmjs.org/ipfs/-/ipfs-0.35.0-pre.0.tgz#98b84cec584560e59a4a79b01ff4e95efcddb73a" + integrity sha512-2LeR1HGD6jJFYFjQf69DhDmIiQUcGe/kdLycYJEJZk/PrE8wnP9LcHcP8BJjFwHbZLF/v9z98EL/yyIg0AGSbg== dependencies: "@nodeutils/defaults-deep" "^1.1.0" async "^2.6.1" @@ -6264,8 +6412,8 @@ ipfs@0.34.0: fsm-event "^2.1.0" get-folder-size "^2.0.0" glob "^7.1.3" - hapi "^16.6.2" - hapi-set-header "^1.0.2" + hapi "^18.0.0" + hapi-pino "^5.2.0" hoek "^6.1.2" human-to-milliseconds "^1.0.0" interface-datastore "~0.6.0" @@ -6274,12 +6422,12 @@ ipfs@0.34.0: ipfs-block-service "~0.15.1" ipfs-http-client "^29.0.0" ipfs-http-response "~0.2.1" - ipfs-mfs "~0.8.0" + ipfs-mfs "~0.9.1" ipfs-multipart "~0.1.0" ipfs-repo "~0.26.1" ipfs-unixfs "~0.1.16" ipfs-unixfs-engine "~0.35.3" - ipld "~0.20.1" + ipld "~0.21.1" ipld-bitcoin "~0.1.8" ipld-dag-pb "~0.15.0" ipld-ethereum "^2.0.1" @@ -6292,7 +6440,7 @@ ipfs@0.34.0: joi "^14.3.0" joi-browser "^13.4.0" joi-multiaddr "^4.0.0" - libp2p "~0.24.1" + libp2p "~0.25.0-rc.0" libp2p-bootstrap "~0.9.3" libp2p-crypto "~0.16.0" libp2p-kad-dht "~0.14.4" @@ -6303,8 +6451,8 @@ ipfs@0.34.0: libp2p-secio "~0.11.0" libp2p-tcp "~0.13.0" libp2p-webrtc-star "~0.15.5" - libp2p-websocket-star "~0.10.0" - libp2p-websockets "~0.12.0" + libp2p-websocket-star-multi "~0.4.0" + libp2p-websockets "~0.12.2" lodash "^4.17.11" mafmt "^6.0.2" mime-types "^2.1.21" @@ -6332,11 +6480,10 @@ ipfs@0.34.0: pull-stream "^3.6.9" pull-stream-to-stream "^1.3.4" pump "^3.0.0" - read-pkg-up "^4.0.0" readable-stream "^3.1.1" receptacle "^1.3.2" stream-to-pull-stream "^1.7.2" - tar-stream "^1.6.2" + tar-stream "^2.0.0" temp "~0.9.0" update-notifier "^2.5.0" varint "^5.0.0" @@ -6484,17 +6631,14 @@ ipld-zcash@~0.1.6: multihashing-async "~0.5.1" zcash-bitcore-lib "~0.13.20-rc3" -ipld@~0.20.1: - version "0.20.2" - resolved "https://registry.js.ipfs.io/ipld/-/ipld-0.20.2.tgz#1b4c007c361dd0426207d86305805ef8df79b763" - integrity sha512-VXGUqcMSfS1L0n8hCFCEbMj86nOkNRCXBihjAlzEOcUbdfdZZsv0wnhgExYCE1JPrCuTqmVV5b/PBfSrhQdMqQ== +ipld@~0.21.1: + version "0.21.1" + resolved "https://registry.npmjs.org/ipld/-/ipld-0.21.1.tgz#17101b026fdee8286227dc63af162d8152c523a7" + integrity sha512-3RWJEtJtX8m3iaUNZCYD+4/F/ETF7MRYPN+2S4gl2OEHV8S0Cs3PoI6KvyZYDKlAkWTQtFLpWUYlUy1tMj4zqw== dependencies: async "^2.6.1" cids "~0.5.5" - interface-datastore "~0.6.0" ipfs-block "~0.8.0" - ipfs-block-service "~0.15.0" - ipfs-repo "~0.26.0" ipld-dag-cbor "~0.13.0" ipld-dag-pb "~0.15.2" ipld-raw "^2.0.1" @@ -6527,6 +6671,16 @@ iron@4.x.x: cryptiles "3.x.x" hoek "4.x.x" +iron@5.x.x: + version "5.0.6" + resolved "https://registry.npmjs.org/iron/-/iron-5.0.6.tgz#7121d4a6e3ac2f65e4d02971646fea1995434744" + integrity sha512-zYUMOSkEXGBdwlV/AXF9zJC0aLuTJUKHkGeYS5I2g225M5i6SrxQyGJGhPgOR8BK1omL6N5i6TcwfsXbP8/Exw== + dependencies: + b64 "4.x.x" + boom "7.x.x" + cryptiles "4.x.x" + hoek "6.x.x" + is-absolute@^0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.1.7.tgz#847491119fccb5fb436217cc737f7faad50f603f" @@ -6930,6 +7084,11 @@ iso-random-stream@^1.1.0: resolved "https://registry.js.ipfs.io/iso-random-stream/-/iso-random-stream-1.1.0.tgz#c1dc1bb43dd8da6524df9cbc6253b010806585c8" integrity sha512-ywSWt0KrWcsaK0jVoVJIR30rLyjg9Rw3k2Sm/qp+3tdtSV0SNH7L7KilKnENcENOSoJxDFvpt2idvuMMQohdCQ== +iso-url@^0.4.4: + version "0.4.6" + resolved "https://registry.npmjs.org/iso-url/-/iso-url-0.4.6.tgz#45005c4af4984cad4f8753da411b41b74cf0a8a6" + integrity sha512-YQO7+aIe6l1aSJUKOx+Vrv08DlhZeLFIVfehG2L29KLSEb9RszqPXilxJRVpp57px36BddKR5ZsebacO5qG0tg== + isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -7022,6 +7181,11 @@ jetpack-id@1.0.0: resolved "https://registry.yarnpkg.com/jetpack-id/-/jetpack-id-1.0.0.tgz#2cf9fbae46d8074fc16b7de0071c8efebca473a6" integrity sha1-LPn7rkbYB0/Ba33gBxyO/rykc6Y= +jmespath@^0.15.0: + version "0.15.0" + resolved "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" + integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= + joi-browser@^13.4.0: version "13.4.0" resolved "https://registry.yarnpkg.com/joi-browser/-/joi-browser-13.4.0.tgz#b72ba61b610e3f58e51b563a14e0f5225cfb6896" @@ -7054,7 +7218,7 @@ joi@11.x.x: isemail "3.x.x" topo "2.x.x" -joi@^14.0.4, joi@^14.0.6, joi@^14.3.0: +joi@14.x.x, joi@^14.3.0: version "14.3.1" resolved "https://registry.js.ipfs.io/joi/-/joi-14.3.1.tgz#164a262ec0b855466e0c35eea2a885ae8b6c703c" integrity sha512-LQDdM+pkOrpAn4Lp+neNIFV3axv1Vna3j38bisbQhETPMANYRbFJFUyOZcOClYvM/hppMhGWuKSFEK9vjrB+bQ== @@ -7350,7 +7514,7 @@ kind-of@^5.0.0: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -kind-of@^6.0.0, kind-of@^6.0.2: +kind-of@^6.0.0, kind-of@^6.0.1, kind-of@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== @@ -7518,6 +7682,11 @@ levelup@^2.0.2: level-iterator-stream "~2.0.0" xtend "~4.0.0" +leven@2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" + integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA= + levn@^0.3.0, levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" @@ -7538,16 +7707,16 @@ libp2p-bootstrap@~0.9.3: peer-id "~0.12.0" peer-info "~0.14.1" -libp2p-circuit@~0.3.1: - version "0.3.4" - resolved "https://registry.js.ipfs.io/libp2p-circuit/-/libp2p-circuit-0.3.4.tgz#e7096321e1637b020ec79044bf261bb8c71779d7" - integrity sha512-9xI9bL9cSXlxeEecl4xkaxLA55wjRjAusF40tm6g27zgLJwpmQG3pb5lnsBAodnIuSCoVzseFehMie8yLseyow== +libp2p-circuit@~0.3.4: + version "0.3.5" + resolved "https://registry.npmjs.org/libp2p-circuit/-/libp2p-circuit-0.3.5.tgz#fe4553ceb58eb9b25ea3407ebc0b3a8480011009" + integrity sha512-uQy4wbpTFyl5YIEpooz1nYISrZj/WLf4R6m/cqhhdCHTFUSAyQsZaeNwxzGqG6dU4APq503+EoPVbQZdjSSw7Q== dependencies: - async "^2.6.1" - debug "^4.1.0" - interface-connection "~0.3.2" - mafmt "^6.0.4" - multiaddr "^6.0.3" + async "^2.6.2" + debug "^4.1.1" + interface-connection "~0.3.3" + mafmt "^6.0.6" + multiaddr "^6.0.4" once "^1.4.0" peer-id "~0.12.2" peer-info "~0.15.1" @@ -7665,30 +7834,33 @@ libp2p-crypto@~0.16.0: tweetnacl "^1.0.0" ursa-optional "~0.9.10" -libp2p-floodsub@~0.15.1: - version "0.15.7" - resolved "https://registry.js.ipfs.io/libp2p-floodsub/-/libp2p-floodsub-0.15.7.tgz#ec16a92bfb5070abebada2737d50ddd0579767e8" - integrity sha512-JZ+lENPuGq0CmQL52eAbVbwS9jxot1Lryh+6XjsRZa/n8oYImPUid26J8yqYOp9xnpaxWvqCxLvH6yraGdpMgw== +libp2p-floodsub@~0.15.7: + version "0.15.8" + resolved "https://registry.npmjs.org/libp2p-floodsub/-/libp2p-floodsub-0.15.8.tgz#ecfd94162825ed7b5431ccbe672f5bf58f7efab2" + integrity sha512-tsRTRRz9vg3iPqhSgkn4gotX635Hp/VMxPd4VQZlRvO8pZsfZwd61Qn9Vx8bES881RhRX0YpGM4Sa0izInHEWA== dependencies: async "^2.6.1" bs58 "^4.0.1" debug "^4.1.1" length-prefixed-stream "^1.6.0" libp2p-crypto "~0.16.0" + libp2p-pubsub "~0.0.1" protons "^1.0.1" + pull-length-prefixed "^1.3.1" pull-pushable "^2.2.0" + pull-stream "^3.6.9" time-cache "~0.3.0" -libp2p-identify@~0.7.2: - version "0.7.3" - resolved "https://registry.yarnpkg.com/libp2p-identify/-/libp2p-identify-0.7.3.tgz#f2f8b9030361c79924dee5e504a1d8a9033169b5" - integrity sha512-RnOXphXxwEzDw8e+aQIE2tqqxXEqZXf457PuzQlOdfMpxDnhHeKObXrjcyfMosyguwJeAzv1x1DJ45ZCXIXFiw== +libp2p-identify@~0.7.5: + version "0.7.5" + resolved "https://registry.npmjs.org/libp2p-identify/-/libp2p-identify-0.7.5.tgz#53038a1b0cf42e8feefd6a5ccc59d3df6c1da7a2" + integrity sha512-sOhCLGjvA8rUa0IqN1BRpm4cfSFTy3VAo0iOBhaOAficNbzSG2bdn9pCCy5F/wXfgEGjByQldMxyNa6eHNyQjg== dependencies: - multiaddr "^5.0.2" - peer-id "~0.12.0" - peer-info "~0.14.1" + multiaddr "^6.0.3" + peer-id "~0.12.2" + peer-info "~0.15.1" protons "^1.0.1" - pull-length-prefixed "^1.3.0" + pull-length-prefixed "^1.3.1" pull-stream "^3.6.9" libp2p-kad-dht@~0.14.4: @@ -7760,15 +7932,28 @@ libp2p-mplex@~0.8.4: stream-to-pull-stream "^1.7.2" varint "^5.0.0" -libp2p-ping@~0.8.3: +libp2p-ping@~0.8.5: version "0.8.5" - resolved "https://registry.js.ipfs.io/libp2p-ping/-/libp2p-ping-0.8.5.tgz#e7fb9fb32d9ff0d6b51be52caef4395ce1a17613" + resolved "https://registry.npmjs.org/libp2p-ping/-/libp2p-ping-0.8.5.tgz#e7fb9fb32d9ff0d6b51be52caef4395ce1a17613" integrity sha512-BzCN3+jp1SvJQZlXq2G3TMkyK5UOOf3JO+CZMnaUEHYlRgQf2zShYta5XU2IGx0EJA/23iCdCL+LjBP/DOvbkQ== dependencies: libp2p-crypto "~0.16.0" pull-handshake "^1.1.4" pull-stream "^3.6.9" +libp2p-pubsub@~0.0.1: + version "0.0.2" + resolved "https://registry.npmjs.org/libp2p-pubsub/-/libp2p-pubsub-0.0.2.tgz#67b42182af2fe00eb199ab680c1334b98b8111d9" + integrity sha512-1/ZzP+QmEG/J1D20JKORar9H1QgNLvFVHnaGPSWt0D4oGtzY790oRSyybYFEV+tkshii/gm74na5UmDHL/1q7g== + dependencies: + async "^2.6.1" + debug "^4.1.1" + err-code "^1.1.2" + length-prefixed-stream "^1.6.0" + protons "^1.0.1" + pull-pushable "^2.2.0" + time-cache "~0.3.0" + libp2p-record@~0.6.1: version "0.6.1" resolved "https://registry.js.ipfs.io/libp2p-record/-/libp2p-record-0.6.1.tgz#8502948704349292a7492354b6b693412ac6de29" @@ -7800,29 +7985,27 @@ libp2p-secio@~0.11.0: pull-length-prefixed "^1.3.1" pull-stream "^3.6.9" -libp2p-switch@~0.41.3: - version "0.41.4" - resolved "https://registry.js.ipfs.io/libp2p-switch/-/libp2p-switch-0.41.4.tgz#60b83e23ff5f2791d47e62e9a853b233e5e37280" - integrity sha512-PsECvraq8RdDirn2FN2GoL4++KJEDsh/3I47nU8WAVYmIUEcnTq6IcVVqZ9rrRdXDLcdnc4wLaZPUjvmb9ObDQ== +libp2p-switch@~0.41.5: + version "0.41.5" + resolved "https://registry.npmjs.org/libp2p-switch/-/libp2p-switch-0.41.5.tgz#f1d0be14cbfe2c3929bb539a3b1e661875b6c8a4" + integrity sha512-bKfkFsEiRXfc3+2Fcbep9WtuuNzKKQziHH5PkQWihn+BVh5UrUGXoWCip/YwsGV7CcGI2zhp3qAmBJ+Cde9EDg== dependencies: async "^2.6.1" - big.js "^5.2.2" + bignumber.js "^8.0.1" class-is "^1.1.0" - debug "^4.1.0" + debug "^4.1.1" err-code "^1.1.2" fsm-event "^2.1.0" hashlru "^2.3.0" interface-connection "~0.3.3" - ip-address "^5.8.9" - libp2p-circuit "~0.3.1" - libp2p-identify "~0.7.2" - lodash.includes "^4.3.0" + libp2p-circuit "~0.3.4" + libp2p-identify "~0.7.5" moving-average "^1.0.0" - multiaddr "^6.0.0" - multistream-select "~0.14.3" + multiaddr "^6.0.3" + multistream-select "~0.14.4" once "^1.4.0" - peer-id "~0.12.0" - peer-info "~0.15.0" + peer-id "~0.12.2" + peer-info "~0.15.1" pull-stream "^3.6.9" retimer "^2.0.0" @@ -7868,9 +8051,21 @@ libp2p-webrtc-star@~0.15.5: stream-to-pull-stream "^1.7.2" webrtcsupport "github:ipfs/webrtcsupport" -libp2p-websocket-star@~0.10.0: +libp2p-websocket-star-multi@~0.4.0: + version "0.4.3" + resolved "https://registry.npmjs.org/libp2p-websocket-star-multi/-/libp2p-websocket-star-multi-0.4.3.tgz#28d5aa4efffb7cf14ac147fc927841a5e275cfd7" + integrity sha512-AhiBQABPw0uCRX4T1XzixRvCRXIq3k/IqrXcdRLgBZ8Yi6SXl0l7YwfAv5bO4fjq+jJTj2ypPvyM16ftNnWqBw== + dependencies: + async "^2.6.1" + debug "^4.1.0" + libp2p-websocket-star "~0.10.2" + mafmt "^6.0.2" + multiaddr "^6.0.3" + once "^1.4.0" + +libp2p-websocket-star@~0.10.2: version "0.10.2" - resolved "https://registry.js.ipfs.io/libp2p-websocket-star/-/libp2p-websocket-star-0.10.2.tgz#74df4c651292bf64307d1198746e249827041ea5" + resolved "https://registry.npmjs.org/libp2p-websocket-star/-/libp2p-websocket-star-0.10.2.tgz#74df4c651292bf64307d1198746e249827041ea5" integrity sha512-ccjMqy7lrKV6vbTdsm9XOZ+eWt01ZCS3hI2s+I+ZpglnPQNg8z+dGs+8rdl8/hU44Sq3EbmUw0gCxPB/2ZbPlg== dependencies: async "^2.6.1" @@ -7888,38 +8083,39 @@ libp2p-websocket-star@~0.10.0: socket.io-client "^2.1.1" socket.io-pull-stream "~0.1.5" -libp2p-websockets@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/libp2p-websockets/-/libp2p-websockets-0.12.0.tgz#b0044535041b7689f116f36e46f511671c8b1f12" - integrity sha512-I4m0MNqzBOwoIneCF/5mXHGaavNf0Hoe/7NFg2WUm74o7240dZEIuNkAoLu1+OJyOPyu4RXeIBhUOS4cjBdCew== +libp2p-websockets@~0.12.1, libp2p-websockets@~0.12.2: + version "0.12.2" + resolved "https://registry.npmjs.org/libp2p-websockets/-/libp2p-websockets-0.12.2.tgz#eecf25564cbe6b0e9017bb411c2a8abec8c9f29b" + integrity sha512-K/Jg/fWFfP5NyiLx01EJcoAcYQO00RSHpZfPQDR3May6ABvOseAjq45SrUDdDCW5mCS0502Vz1VjRrZdOXw8zQ== dependencies: class-is "^1.1.0" + debug "^4.1.1" interface-connection "~0.3.2" - lodash.includes "^4.3.0" - mafmt "^6.0.0" - pull-ws "^3.3.1" + mafmt "^6.0.4" + multiaddr-to-uri "^4.0.1" + pull-ws hugomrdias/pull-ws#fix/bundle-size -libp2p@~0.24.1: - version "0.24.4" - resolved "https://registry.js.ipfs.io/libp2p/-/libp2p-0.24.4.tgz#aca6fa665349f118e845eafd13ca804a53355c9a" - integrity sha512-Od6we8H6P/sm3tuJCYFiP/PJ+O6ZNaNw0q5DuNw6obMHgKm/XSsJcDYzgfrPs1P9ASpAMTXAe0cYtjHRoQ9yPQ== +libp2p@~0.25.0-rc.0: + version "0.25.0-rc.3" + resolved "https://registry.npmjs.org/libp2p/-/libp2p-0.25.0-rc.3.tgz#c5a4b46e96865ca3b79bd42b7d574d9a31b053e8" + integrity sha512-tl16Sj1qsy3gWS/O3tPMb5uAMRpBiYYsWulL675ehNSfs5FqAPrJFxgHPcZ7ViHr2lJ0CMrwDZeXfAWiKgdekg== dependencies: async "^2.6.1" debug "^4.1.0" err-code "^1.1.2" fsm-event "^2.1.0" - joi "^14.0.6" - joi-browser "^13.4.0" libp2p-connection-manager "~0.0.2" - libp2p-floodsub "~0.15.1" - libp2p-ping "~0.8.3" - libp2p-switch "~0.41.3" - libp2p-websockets "~0.12.0" - mafmt "^6.0.2" - multiaddr "^6.0.2" - peer-book "~0.9.0" - peer-id "~0.12.0" - peer-info "~0.15.0" + libp2p-floodsub "~0.15.7" + libp2p-ping "~0.8.5" + libp2p-switch "~0.41.5" + libp2p-websockets "~0.12.1" + mafmt "^6.0.4" + multiaddr "^6.0.3" + once "^1.4.0" + peer-book "~0.9.1" + peer-id "~0.12.2" + peer-info "~0.15.1" + superstruct "~0.6.0" lie@~3.1.0: version "3.1.1" @@ -8148,11 +8344,6 @@ lodash.padstart@^4.6.1: resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= -lodash.range@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.range/-/lodash.range-3.2.0.tgz#f461e588f66683f7eadeade513e38a69a565a15d" - integrity sha1-9GHliPZmg/fq3q3lE+OKaaVloV0= - lodash.repeat@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/lodash.repeat/-/lodash.repeat-4.1.0.tgz#fc7de8131d8c8ac07e4b49f74ffe829d1f2bec44" @@ -8293,6 +8484,13 @@ mafmt@^6.0.4: dependencies: multiaddr "^6.0.3" +mafmt@^6.0.6: + version "6.0.7" + resolved "https://registry.npmjs.org/mafmt/-/mafmt-6.0.7.tgz#80312e08bfba0f89e2daa403525f33e07d9b97fa" + integrity sha512-2OG/EGAJZmpZBl7YRT1hD83sZa2gKsUEdegRuURreIOe7B4VeHU1rYYmhgk7BkLzknGL3xGYsDx3bbSgEEzE7g== + dependencies: + multiaddr "^6.0.4" + magic-string@^0.23.2: version "0.23.2" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.23.2.tgz#204d7c3ea36c7d940209fcc54c39b9f243f13369" @@ -8556,6 +8754,14 @@ mimos@3.x.x: hoek "4.x.x" mime-db "1.x.x" +mimos@4.x.x: + version "4.0.2" + resolved "https://registry.npmjs.org/mimos/-/mimos-4.0.2.tgz#f2762d7c60118ce51c2231afa090bc335d21d0f8" + integrity sha512-5XBsDqBqzSN88XPPH/TFpOalWOjHJM5Z2d3AMx/30iq+qXvYKd/8MPhqBwZDOLtoaIWInR3nLzMQcxfGK9djXA== + dependencies: + hoek "6.x.x" + mime-db "1.x.x" + min-document@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" @@ -8721,6 +8927,11 @@ moz-download-url@^2.0.0: resolved "https://registry.yarnpkg.com/moz-download-url/-/moz-download-url-2.0.0.tgz#69b5d73daa1a2fa068b76bb6a33fb6a634c4bbb0" integrity sha512-RYU0CmPsNOsuQ66ZEo9eDUbghYY51LJEF4YTyJRXu2cn82EBY5Zkbxa6seBUB3OM5W23qLoGBIbdD96eP8PYPQ== +mri@1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/mri/-/mri-1.1.1.tgz#85aa26d3daeeeedf80dc5984af95cc5ca5cad9f1" + integrity sha1-haom09ru7t+A3FmEr5XMXKXK2fE= + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -8731,14 +8942,14 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== -multiaddr-to-uri@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/multiaddr-to-uri/-/multiaddr-to-uri-4.0.0.tgz#39ac2cc4b81e273a013aa33778894b3f4822114c" - integrity sha512-uxaH4LxjqcUyusDK+iSBNu/PCSHr2zBS4lKABA4upCXkfxQliE3/DMjuuBydIT2zY2MyYLONtvdoXgJgzgKGHg== +multiaddr-to-uri@^4.0.0, multiaddr-to-uri@^4.0.1: + version "4.0.1" + resolved "https://registry.npmjs.org/multiaddr-to-uri/-/multiaddr-to-uri-4.0.1.tgz#3b89d2a460a96602a16f3bfe296ee771ecb2558b" + integrity sha512-RVHKm5NXcMWMIhrwF4B4Q34JtMXt1/2wgnDTnKRE+AGAiXfqFika0bIfCsAtLp+gZJOWeDLeT1vR6P0gGyVAtg== dependencies: - multiaddr "^5.0.0" + multiaddr "^6.0.3" -multiaddr@6.0.3, multiaddr@^4.0.0, multiaddr@^5.0.0, multiaddr@^5.0.2, multiaddr@^6.0.0, multiaddr@^6.0.2, multiaddr@^6.0.3: +multiaddr@6.0.3, multiaddr@^4.0.0, multiaddr@^5.0.0, multiaddr@^5.0.2, multiaddr@^6.0.0, multiaddr@^6.0.2, multiaddr@^6.0.3, multiaddr@^6.0.4: version "6.0.3" resolved "https://registry.js.ipfs.io/multiaddr/-/multiaddr-6.0.3.tgz#36797d110ad1d912a69c07ca5fca6f8a08690bf3" integrity sha512-ZYKAmSQ6j3x3fJQGF8yoAb5aDwrNFT/QVhfN8rId+M4/E1RYR3fsitFwMG3l7TuWhow+ET01mA+BViz+8NaktQ== @@ -8824,16 +9035,14 @@ multimatch@2.1.0: arrify "^1.0.0" minimatch "^3.0.0" -multistream-select@~0.14.3: - version "0.14.3" - resolved "https://registry.yarnpkg.com/multistream-select/-/multistream-select-0.14.3.tgz#655654538bffc6c55a58d50d7fe8c4cecc0fed8d" - integrity sha512-Wu2ulJtUv5DWrilQ3I3rMRd+zdN8K+fZGX09UYfBGr9ZFLeiukCKvftkTiF6j7viCDNDS5VnjwVqwjrLwoS06g== +multistream-select@~0.14.4: + version "0.14.4" + resolved "https://registry.npmjs.org/multistream-select/-/multistream-select-0.14.4.tgz#76d67e72decb0e8f5f47563ab65fb096a3dfc442" + integrity sha512-pWC3AOtcJXXUtN+GpY66enRN0Qrw51mFuzhxs9TjVcjSllpA3bGYkwBlORUHiVjSTxBGZy7mR4VbsBDGrhQV3g== dependencies: async "^2.6.0" - debug "^3.1.0" + debug "^4.1.0" interface-connection "~0.3.2" - lodash.isfunction "^3.0.9" - lodash.range "^3.2.0" once "^1.4.0" pull-handshake "^1.1.4" pull-length-prefixed "^1.3.1" @@ -9105,6 +9314,14 @@ nigel@2.x.x: hoek "4.x.x" vise "2.x.x" +nigel@3.x.x: + version "3.0.4" + resolved "https://registry.npmjs.org/nigel/-/nigel-3.0.4.tgz#edcd82f2e9387fe34ba21e3127ae4891547c7945" + integrity sha512-3SZCCS/duVDGxFpTROHEieC+itDo4UqL9JNUyQJv3rljudQbK6aqus5B4470OxhESPJLN93Qqxg16rH7DUjbfQ== + dependencies: + hoek "6.x.x" + vise "3.x.x" + nise@^1.2.0, nise@^1.4.7: version "1.4.8" resolved "https://registry.js.ipfs.io/nise/-/nise-1.4.8.tgz#ce91c31e86cf9b2c4cac49d7fcd7f56779bfd6b0" @@ -9913,7 +10130,7 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" -peer-book@~0.9.0: +peer-book@~0.9.0, peer-book@~0.9.1: version "0.9.1" resolved "https://registry.js.ipfs.io/peer-book/-/peer-book-0.9.1.tgz#42dffd7b1faf263bd6abe2907a26f7411f4dbf34" integrity sha512-Bnhsrruilysw5nFU0V2hcTmLnT2cRfc6mud62aaG1dkh9J8IkQ83IclcC2ziVPnEi8AFX8SQ1sSG7Qe0JTwIBA== @@ -10039,6 +10256,17 @@ pez@2.x.x: hoek "4.x.x" nigel "2.x.x" +pez@4.x.x: + version "4.0.5" + resolved "https://registry.npmjs.org/pez/-/pez-4.0.5.tgz#a975c49deff330d298d82851b39f81c2710556df" + integrity sha512-HvL8uiFIlkXbx/qw4B8jKDCWzo7Pnnd65Uvanf9OOCtb20MRcb9gtTVBf9NCnhETif1/nzbDHIjAWC/sUp7LIQ== + dependencies: + b64 "4.x.x" + boom "7.x.x" + content "4.x.x" + hoek "6.x.x" + nigel "3.x.x" + pidtree@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b" @@ -10071,6 +10299,21 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= +pino-pretty@^2.5.0: + version "2.5.0" + resolved "https://registry.npmjs.org/pino-pretty/-/pino-pretty-2.5.0.tgz#fade5b6d2acbdbf2c7e77adf220e7b7d89d04437" + integrity sha512-odR4SKdyubhe4aFts0/mBau2/mJLG23Ghyo86a+GZ2/Cev3CRr5nYv2+82V7v1hQL93yRSO004ASrrF7278TNQ== + dependencies: + args "^5.0.0" + chalk "^2.3.2" + dateformat "^3.0.3" + fast-json-parse "^1.0.3" + fast-safe-stringify "^2.0.6" + jmespath "^0.15.0" + pump "^3.0.0" + readable-stream "^3.0.6" + split2 "^3.0.0" + pino-std-serializers@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-2.3.0.tgz#34eeaab97c055c28e22c0542ae55978e7e427786" @@ -10090,6 +10333,18 @@ pino@5.9.0: quick-format-unescaped "^3.0.0" sonic-boom "^0.6.3" +pino@^5.10.1: + version "5.11.1" + resolved "https://registry.npmjs.org/pino/-/pino-5.11.1.tgz#2d6d8edb7ebc7c354be03bfa04fd436352e1d67b" + integrity sha512-NIua0mGb9Adknq35ONvQmvh93LCUVUjp2+1q1EcvIkJmpJnSd3E5rHVKlKNjzMXFl/z3fI+QA0xXCjPEKNiLvQ== + dependencies: + fast-redact "^1.4.2" + fast-safe-stringify "^2.0.6" + flatstr "^1.0.9" + pino-std-serializers "^2.3.0" + quick-format-unescaped "^3.0.0" + sonic-boom "^0.7.1" + pino@~5.8.0: version "5.8.1" resolved "https://registry.yarnpkg.com/pino/-/pino-5.8.1.tgz#1385335f8c356b6d80cd357bcc767d42aac7f263" @@ -10183,6 +10438,14 @@ podium@1.x.x: items "2.x.x" joi "10.x.x" +podium@3.x.x: + version "3.2.0" + resolved "https://registry.npmjs.org/podium/-/podium-3.2.0.tgz#2a7c579ddd5408f412d014c9ffac080c41d83477" + integrity sha512-rbwvxwVkI6gRRlxZQ1zUeafrpGxZ7QPHIheinehAvGATvGIPfWRkaTeWedc5P4YjXJXEV8ZbBxPtglNylF9hjw== + dependencies: + hoek "6.x.x" + joi "14.x.x" + posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -10519,7 +10782,7 @@ pull-handshake@^1.1.4: pull-pushable "^2.0.0" pull-reader "^1.2.3" -pull-length-prefixed@^1.3.0, pull-length-prefixed@^1.3.1: +pull-length-prefixed@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/pull-length-prefixed/-/pull-length-prefixed-1.3.1.tgz#32292d44a87f5b2397cb281cf63a64d2da68ea0c" integrity sha512-Ho0KoVKOILITGPusghadRVcUzflFHAHcv1Hvi/OkUSJLkGK2LNmVjsmIaJbWkizI//okIj2n376JyTFwCWdsYA== @@ -10643,11 +10906,11 @@ pull-write@^1.1.4: pull-cat "^1.1.11" pull-stream "^3.4.5" -pull-ws@^3.3.1: +pull-ws@hugomrdias/pull-ws#fix/bundle-size: version "3.3.1" - resolved "https://registry.yarnpkg.com/pull-ws/-/pull-ws-3.3.1.tgz#a7a659c3144c29d3ad2a66969b943ec69c465768" - integrity sha512-kJodbLQT+oKjcRIQO+vQNw6xWBuEo7Kxp51VMOvb6cvPvHYA+aNLzm+NmkB/5dZwbuTRYGMal9QPvH52tzM1ZA== + resolved "https://codeload.github.com/hugomrdias/pull-ws/tar.gz/8e2ce0bb3b1cd6804828316e937fff8e0bef6225" dependencies: + iso-url "^0.4.4" relative-url "^1.0.2" safe-buffer "^5.1.1" ws "^1.1.0" @@ -10894,7 +11157,7 @@ readable-stream@1.1.x, "readable-stream@1.x >=1.1.9", readable-stream@^1.0.33: isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.1.1: +"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1: version "3.1.1" resolved "https://registry.js.ipfs.io/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06" integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA== @@ -11441,7 +11704,7 @@ sax@>=0.6.0, sax@^1.2.4: schema-utils@^0.4.4: version "0.4.7" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" + resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ== dependencies: ajv "^6.1.0" @@ -11623,6 +11886,15 @@ shallow-clone@^0.1.2: lazy-cache "^0.2.3" mixin-object "^2.0.1" +shallow-clone@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571" + integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA== + dependencies: + is-extendable "^0.1.1" + kind-of "^5.0.0" + mixin-object "^2.0.1" + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -11692,6 +11964,14 @@ shot@3.x.x: hoek "4.x.x" joi "10.x.x" +shot@4.x.x: + version "4.0.7" + resolved "https://registry.npmjs.org/shot/-/shot-4.0.7.tgz#b05d2858634fedc18ece99e8f638fab7c9f9d4c4" + integrity sha512-RKaKAGKxJ11EjJl0cf2fYVSsd4KB5Cncb9J0v7w+0iIaXpxNqFWTYNDNhBX7f0XSyDrjOH9a4OWZ9Gp/ZML+ew== + dependencies: + hoek "6.x.x" + joi "14.x.x" + shx@0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/shx/-/shx-0.3.2.tgz#40501ce14eb5e0cbcac7ddbd4b325563aad8c123" @@ -12141,6 +12421,14 @@ somever@1.x.x: dependencies: hoek "4.x.x" +somever@2.x.x: + version "2.0.0" + resolved "https://registry.npmjs.org/somever/-/somever-2.0.0.tgz#7bdbed3bee8ece2c7c8a2e7d9a1c022bd98d6c89" + integrity sha512-9JaIPP+HxwYGqCDqqK3tRaTqdtQHoK6Qy3IrXhIt2q5x8fs8RcfU7BMWlFTCOgFazK8p88zIv1tHQXvAwtXMyw== + dependencies: + bounce "1.x.x" + hoek "6.x.x" + sonic-boom@^0.6.1, sonic-boom@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-0.6.3.tgz#a02f9fc8d5ec42166e28c39760cc833552056595" @@ -12148,6 +12436,13 @@ sonic-boom@^0.6.1, sonic-boom@^0.6.3: dependencies: flatstr "^1.0.8" +sonic-boom@^0.7.1: + version "0.7.3" + resolved "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.3.tgz#cbfc18e87c2b8078b00e38ad9475c05fce5ea696" + integrity sha512-A9EyoIeLD+g9vMLYQKjNCatJtAKdBQMW03+L8ZWWX/A6hq+srRCwdqHrBD1R8oSMLXov3oHN13dljtZf12q2Ow== + dependencies: + flatstr "^1.0.9" + sort-keys-length@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188" @@ -12300,6 +12595,13 @@ split2@^2.1.0: dependencies: through2 "^2.0.2" +split2@^3.0.0: + version "3.1.0" + resolved "https://registry.npmjs.org/split2/-/split2-3.1.0.tgz#064bbfac70cdb66f77827870d42f159a8b442201" + integrity sha512-ePE1otNQVMnBRyqf3INbZvZwBPGsdBDThgrOWZ6z8zXGNVQNVCSEoOO9aBMTzDN1mXoNSZJ2kHSFH7AA5SPWww== + dependencies: + readable-stream "^3.0.0" + split@~0.3.0, split@~0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" @@ -12381,6 +12683,19 @@ statehood@5.x.x: items "2.x.x" joi "10.x.x" +statehood@6.x.x: + version "6.0.9" + resolved "https://registry.npmjs.org/statehood/-/statehood-6.0.9.tgz#b347ae19818aec7fc26645fe1ec6a61928a57a3c" + integrity sha512-jbFg1+MYEqfC7ABAoWZoeF4cQUtp3LUvMDUGExL76cMmleBHG7I6xlZFsE8hRi7nEySIvutHmVlLmBe9+2R5LQ== + dependencies: + boom "7.x.x" + bounce "1.x.x" + bourne "1.x.x" + cryptiles "4.x.x" + hoek "6.x.x" + iron "5.x.x" + joi "14.x.x" + static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" @@ -12634,6 +12949,18 @@ subtext@5.x.x: pez "2.x.x" wreck "12.x.x" +subtext@6.x.x: + version "6.0.12" + resolved "https://registry.npmjs.org/subtext/-/subtext-6.0.12.tgz#ac09be3eac1eca3396933adeadd65fc781f64fc1" + integrity sha512-yT1wCDWVgqvL9BIkWzWqgj5spUSYo/Enu09iUV8t2ZvHcr2tKGTGg2kc9tUpVEsdhp1ihsZeTAiDqh0TQciTPQ== + dependencies: + boom "7.x.x" + bourne "1.x.x" + content "4.x.x" + hoek "6.x.x" + pez "4.x.x" + wreck "14.x.x" + superagent@^3.1.0, superagent@~3.8.1: version "3.8.3" resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128" @@ -12650,6 +12977,14 @@ superagent@^3.1.0, superagent@~3.8.1: qs "^6.5.1" readable-stream "^2.3.5" +superstruct@~0.6.0: + version "0.6.0" + resolved "https://registry.npmjs.org/superstruct/-/superstruct-0.6.0.tgz#20d2073526cf683a57f258695e009c4a19134ad0" + integrity sha512-6Y+bh5oFXCMUmGGzcdwd8M2qXMWn9aH3Qu2wV8Cg/Lxu+3fTxJ0dTx54nKd/Sm3lSz3i901xVatzev7c/xN8Lg== + dependencies: + clone-deep "^2.0.1" + kind-of "^6.0.1" + supports-color@5.4.0: version "5.4.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" @@ -12736,6 +13071,17 @@ tar-stream@^1.1.2, tar-stream@^1.5.0, tar-stream@^1.5.2, tar-stream@^1.6.2: to-buffer "^1.1.1" xtend "^4.0.0" +tar-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.0.0.tgz#8829bbf83067bc0288a9089db49c56be395b6aea" + integrity sha512-n2vtsWshZOVr/SY4KtslPoUlyNh06I2SGgAOCZmquCEjlbV/LjY2CY80rDtdQRHFOYXNlgBDo6Fr3ww2CWPOtA== + dependencies: + bl "^2.2.0" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + tar@4.4.8, tar@^4: version "4.4.8" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" @@ -12775,6 +13121,11 @@ tdigest@^0.1.1: dependencies: bintrees "1.0.1" +teamwork@3.x.x: + version "3.0.3" + resolved "https://registry.npmjs.org/teamwork/-/teamwork-3.0.3.tgz#0c08748efe00c32c1eaf1128ef7f07ba0c7cc4ea" + integrity sha512-OCB56z+G70iA1A1OFoT+51TPzfcgN0ks75uN3yhxA+EU66WTz2BevNDK4YzMqfaL5tuAvxy4iFUn35/u8pxMaQ== + temp-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" @@ -13517,6 +13868,13 @@ vise@2.x.x: dependencies: hoek "4.x.x" +vise@3.x.x: + version "3.0.2" + resolved "https://registry.npmjs.org/vise/-/vise-3.0.2.tgz#9a8b7450f783aa776faa327fe47d7bfddb227266" + integrity sha512-X52VtdRQbSBXdjcazRiY3eRgV3vTQ0B+7Wh8uC9cVv7lKfML5m9+9NHlbcgCY0R9EAqD1v/v7o9mhGh2A3ANFg== + dependencies: + hoek "6.x.x" + vm-browserify@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" @@ -13668,7 +14026,7 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0: webpack@4.28.1: version "4.28.1" - resolved "https://registry.js.ipfs.io/webpack/-/webpack-4.28.1.tgz#d0e2856e75d1224b170bf16c30b6ca9b75f0d958" + resolved "https://registry.npmjs.org/webpack/-/webpack-4.28.1.tgz#d0e2856e75d1224b170bf16c30b6ca9b75f0d958" integrity sha512-qAS7BFyS5iuOZzGJxyDXmEI289h7tVNtJ5XMxf6Tz55J2riOyH42uaEsWF0F32TRaI+54SmI6qRgHM3GzsZ+sQ== dependencies: "@webassemblyjs/ast" "1.7.11" @@ -13828,6 +14186,15 @@ wreck@12.x.x: boom "5.x.x" hoek "4.x.x" +wreck@14.x.x: + version "14.1.4" + resolved "https://registry.npmjs.org/wreck/-/wreck-14.1.4.tgz#c635358f4f5c99c2b977978258443193830e8274" + integrity sha512-gW04OgnCDjF/V4JRILqz/vLN/Ywlls8HUPKtXzUH0EClb1SkwyebFBpO71Wp2hFtKCgZJfodzFYa+CZoWrYflA== + dependencies: + boom "7.x.x" + bourne "1.x.x" + hoek "6.x.x" + write-file-atomic@^2.0.0, write-file-atomic@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"