diff --git a/package.json b/package.json index 6b1facca..595fb18a 100644 --- a/package.json +++ b/package.json @@ -70,11 +70,12 @@ }, "homepage": "https://github.com/ipfs/js-ipfs-bitswap#readme", "devDependencies": { + "@chainsafe/libp2p-noise": "^4.1.0", "@nodeutils/defaults-deep": "^1.1.0", "@types/debug": "^4.1.5", "@types/stats-lite": "^2.2.0", "@types/varint": "^6.0.0", - "aegir": "^34.0.2", + "aegir": "^35.0.2", "assert": "^2.0.0", "benchmark": "^2.1.4", "delay": "^5.0.0", @@ -82,10 +83,9 @@ "iso-random-stream": "^2.0.0", "it-all": "^1.0.5", "it-drain": "^1.0.4", - "libp2p": "next", + "libp2p": "libp2p/js-libp2p", "libp2p-kad-dht": "^0.23.1", "libp2p-mplex": "^0.10.2", - "libp2p-noise": "^4.0.0", "libp2p-tcp": "^0.17.1", "lodash.difference": "^4.5.0", "lodash.flatten": "^4.4.0", @@ -122,7 +122,7 @@ "native-abort-controller": "^1.0.3", "protobufjs": "^6.10.2", "readable-stream": "^3.6.0", - "uint8arrays": "^2.1.3", + "uint8arrays": "^3.0.0", "varint-decoder": "^1.0.0" }, "pre-push": [ diff --git a/src/notifications.js b/src/notifications.js index 65dfe751..40b0c2dc 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -1,7 +1,7 @@ 'use strict' const { EventEmitter } = require('events') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const CONSTANTS = require('./constants') const logger = require('./utils').logger diff --git a/src/types/message/index.js b/src/types/message/index.js index bde1282e..7e3b2459 100644 --- a/src/types/message/index.js +++ b/src/types/message/index.js @@ -8,7 +8,7 @@ const vd = require('varint-decoder') const { isMapEqual } = require('../../utils') const { Message } = require('./message') const Entry = require('./entry') -const uint8ArrayConcat = require('uint8arrays/concat') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') const errcode = require('err-code') /** diff --git a/src/utils/index.js b/src/utils/index.js index 365358f0..9b65ee2f 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,7 +1,7 @@ 'use strict' const debug = require('debug') -const uint8ArrayEquals = require('uint8arrays/equals') +const { equals: uint8ArrayEquals } = require('uint8arrays/equals') const BitswapMessageEntry = require('../types/message/entry') /** diff --git a/test/decision-engine/decision-engine.js b/test/decision-engine/decision-engine.js index 3cfb469a..2bee3870 100644 --- a/test/decision-engine/decision-engine.js +++ b/test/decision-engine/decision-engine.js @@ -12,8 +12,8 @@ const flatten = require('lodash.flatten') const { CID } = require('multiformats') const { sha256 } = require('multiformats/hashes/sha2') const { base58btc } = require('multiformats/bases/base58') -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayToString = require('uint8arrays/to-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const drain = require('it-drain') const defer = require('p-defer') diff --git a/test/notifications.spec.js b/test/notifications.spec.js index 728ab0c0..2e82f378 100644 --- a/test/notifications.spec.js +++ b/test/notifications.spec.js @@ -5,7 +5,7 @@ const { expect } = require('aegir/utils/chai') const { CID } = require('multiformats') const { base32 } = require('multiformats/bases/base32') const { AbortController } = require('native-abort-controller') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const Notifications = require('../src/notifications') diff --git a/test/types/message.spec.js b/test/types/message.spec.js index e69dfe5a..887a170e 100644 --- a/test/types/message.spec.js +++ b/test/types/message.spec.js @@ -6,8 +6,8 @@ const { CID } = require('multiformats') const { base32 } = require('multiformats/bases/base32') const { base64 } = require('multiformats/bases/base64') const { base58btc } = require('multiformats/bases/base58') -const uint8ArrayFromString = require('uint8arrays/from-string') -const uint8ArrayConcat = require('uint8arrays/concat') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') +const { concat: uint8ArrayConcat } = require('uint8arrays/concat') const loadFixture = require('aegir/utils/fixtures') const testDataPath = 'test/fixtures/serialized-from-go' const rawMessageFullWantlist = loadFixture(testDataPath + '/bitswap110-message-full-wantlist') diff --git a/test/utils.spec.js b/test/utils.spec.js index 958f2b7e..f605d379 100644 --- a/test/utils.spec.js +++ b/test/utils.spec.js @@ -5,7 +5,7 @@ const { expect } = require('aegir/utils/chai') const { CID } = require('multiformats') const { sha256 } = require('multiformats/hashes/sha2') const BitswapMessageEntry = require('../src/types/message/entry') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const BitswapMessage = require('../src/types/message') const { groupBy, uniqWith, pullAllWith, includesWith, sortBy, isMapEqual } = require('../src/utils') diff --git a/test/utils/create-libp2p-node.js b/test/utils/create-libp2p-node.js index 985fef8b..0b7fb124 100644 --- a/test/utils/create-libp2p-node.js +++ b/test/utils/create-libp2p-node.js @@ -4,7 +4,7 @@ const TCP = require('libp2p-tcp') // @ts-ignore const MPLEX = require('libp2p-mplex') -const { NOISE } = require('libp2p-noise') +const { NOISE } = require('@chainsafe/libp2p-noise') const Libp2p = require('libp2p') const KadDHT = require('libp2p-kad-dht') const PeerId = require('peer-id') diff --git a/test/utils/make-blocks.js b/test/utils/make-blocks.js index 5f1d9d84..01521b03 100644 --- a/test/utils/make-blocks.js +++ b/test/utils/make-blocks.js @@ -6,7 +6,7 @@ const { sha256 } = require('multiformats/hashes/sha2') const randomBytes = require('iso-random-stream/src/random') // @ts-ignore const range = require('lodash.range') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') // @ts-ignore const { v4: uuid } = require('uuid')