From 5ae5b934c391d652462765c102b6d01997a4d090 Mon Sep 17 00:00:00 2001 From: Alex Potsides Date: Sat, 30 Dec 2023 12:45:19 +0100 Subject: [PATCH] deps!: update libp2p deps to v1 (#299) Updates all libp2p deps BREAKING CHANGE: requires libp2p v1 or later --- package.json | 20 ++++++++++---------- src/index.ts | 3 +-- src/utils.ts | 4 ++-- src/validator.ts | 2 +- test/index.spec.ts | 2 +- test/selector.spec.ts | 2 +- test/validator.spec.ts | 2 +- 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 8e96b77..25fdce2 100644 --- a/package.json +++ b/package.json @@ -166,22 +166,22 @@ "docs:no-publish": "NODE_OPTIONS=--max_old_space_size=8192 aegir docs --publish false" }, "dependencies": { - "@libp2p/crypto": "^2.0.3", - "@libp2p/interface": "^0.1.2", - "@libp2p/logger": "^3.0.2", - "@libp2p/peer-id": "^3.0.2", + "@libp2p/crypto": "^3.0.3", + "@libp2p/interface": "^1.1.0", + "@libp2p/logger": "^4.0.3", + "@libp2p/peer-id": "^4.0.3", "cborg": "^4.0.1", "err-code": "^3.0.1", "interface-datastore": "^8.1.0", - "multiformats": "^12.0.1", - "protons-runtime": "^5.0.0", + "multiformats": "^13.0.0", + "protons-runtime": "^5.2.1", "timestamp-nano": "^1.0.0", - "uint8arraylist": "^2.4.3", + "uint8arraylist": "^2.4.8", "uint8arrays": "^5.0.1" }, "devDependencies": { - "@libp2p/peer-id-factory": "^3.0.3", - "aegir": "^40.0.11", - "protons": "^7.0.2" + "@libp2p/peer-id-factory": "^4.0.2", + "aegir": "^41.3.5", + "protons": "^7.3.3" } } diff --git a/src/index.ts b/src/index.ts index 2db9203..3739c14 100644 --- a/src/index.ts +++ b/src/index.ts @@ -11,8 +11,7 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import * as ERRORS from './errors.js' import { IpnsEntry } from './pb/ipns.js' import { createCborData, ipnsRecordDataForV1Sig, ipnsRecordDataForV2Sig, normalizeValue } from './utils.js' -import type { PrivateKey } from '@libp2p/interface/keys' -import type { PeerId } from '@libp2p/interface/peer-id' +import type { PrivateKey, PeerId } from '@libp2p/interface' import type { CID } from 'multiformats/cid' const log = logger('ipns') diff --git a/src/utils.ts b/src/utils.ts index 9c3bff6..9e99429 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,5 +1,5 @@ import { unmarshalPublicKey } from '@libp2p/crypto/keys' -import { isPeerId, type PeerId } from '@libp2p/interface/peer-id' +import { isPeerId } from '@libp2p/interface' import { logger } from '@libp2p/logger' import { peerIdFromBytes, peerIdFromKeys } from '@libp2p/peer-id' import * as cborg from 'cborg' @@ -14,7 +14,7 @@ import { toString as uint8ArrayToString } from 'uint8arrays/to-string' import * as ERRORS from './errors.js' import { IpnsEntry } from './pb/ipns.js' import type { IPNSRecord, IPNSRecordV2, IPNSRecordData } from './index.js' -import type { PublicKey } from '@libp2p/interface/keys' +import type { PublicKey, PeerId } from '@libp2p/interface' const log = logger('ipns:utils') const IPNS_PREFIX = uint8ArrayFromString('/ipns/') diff --git a/src/validator.ts b/src/validator.ts index 3518e47..a7102fe 100644 --- a/src/validator.ts +++ b/src/validator.ts @@ -3,7 +3,7 @@ import errCode from 'err-code' import * as ERRORS from './errors.js' import { IpnsEntry } from './pb/ipns.js' import { extractPublicKey, ipnsRecordDataForV2Sig, unmarshal, peerIdFromRoutingKey } from './utils.js' -import type { PublicKey } from '@libp2p/interface/keys' +import type { PublicKey } from '@libp2p/interface' const log = logger('ipns:validator') diff --git a/test/index.spec.ts b/test/index.spec.ts index 867a35d..4a787dc 100644 --- a/test/index.spec.ts +++ b/test/index.spec.ts @@ -16,7 +16,7 @@ import * as ipns from '../src/index.js' import { IpnsEntry } from '../src/pb/ipns.js' import { extractPublicKey, peerIdToRoutingKey, parseCborData, createCborData, ipnsRecordDataForV2Sig } from '../src/utils.js' import { ipnsValidator } from '../src/validator.js' -import type { PeerId } from '@libp2p/interface/peer-id' +import type { PeerId } from '@libp2p/interface' describe('ipns', function () { this.timeout(20 * 1000) diff --git a/test/selector.spec.ts b/test/selector.spec.ts index 249e59b..20295c8 100644 --- a/test/selector.spec.ts +++ b/test/selector.spec.ts @@ -6,7 +6,7 @@ import { expect } from 'aegir/chai' import * as ipns from '../src/index.js' import { ipnsSelector } from '../src/selector.js' import { marshal, peerIdToRoutingKey } from '../src/utils.js' -import type { PeerId } from '@libp2p/interface/peer-id' +import type { PeerId } from '@libp2p/interface' describe('selector', function () { this.timeout(20 * 1000) diff --git a/test/validator.spec.ts b/test/validator.spec.ts index dbacced..11a0c2e 100644 --- a/test/validator.spec.ts +++ b/test/validator.spec.ts @@ -12,7 +12,7 @@ import * as ERRORS from '../src/errors.js' import * as ipns from '../src/index.js' import { marshal, peerIdToRoutingKey } from '../src/utils.js' import { ipnsValidator } from '../src/validator.js' -import type { PeerId } from '@libp2p/interface/peer-id' +import type { PeerId } from '@libp2p/interface' describe('validator', function () { this.timeout(20 * 1000)