From 617bc471f11996c1f17b358ccd7da90b1b157c7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 14:56:31 +0200 Subject: [PATCH] deps: bump aegir from 38.1.8 to 39.0.10 (#69) * deps: bump aegir from 38.1.8 to 39.0.10 Bumps [aegir](https://github.com/ipfs/aegir) from 38.1.8 to 39.0.10. - [Release notes](https://github.com/ipfs/aegir/releases) - [Changelog](https://github.com/ipfs/aegir/blob/master/CHANGELOG.md) - [Commits](https://github.com/ipfs/aegir/compare/v38.1.8...v39.0.10) --- updated-dependencies: - dependency-name: aegir dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * chore: fix linting --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: achingbrain --- package.json | 2 +- packages/libp2p-peer-id-factory/package.json | 5 ++--- packages/libp2p-peer-id-factory/src/index.ts | 14 +++++++------- .../libp2p-peer-id-factory/test/index.spec.ts | 12 ++++++------ packages/libp2p-peer-id/package.json | 2 +- packages/libp2p-peer-id/src/index.ts | 15 ++++++--------- packages/libp2p-peer-id/test/index.spec.ts | 2 +- 7 files changed, 24 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 195489aee0..8ec354a986 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "release": "npm run docs:no-publish && aegir run release && npm run docs" }, "dependencies": { - "aegir": "^38.1.0" + "aegir": "^39.0.10" }, "workspaces": [ "packages/*" diff --git a/packages/libp2p-peer-id-factory/package.json b/packages/libp2p-peer-id-factory/package.json index be81f84eed..264be86cb4 100644 --- a/packages/libp2p-peer-id-factory/package.json +++ b/packages/libp2p-peer-id-factory/package.json @@ -152,9 +152,8 @@ "uint8arrays": "^4.0.2" }, "devDependencies": { - "aegir": "^38.1.0", - "protons": "^7.0.2", - "util": "^0.12.4" + "aegir": "^39.0.10", + "protons": "^7.0.2" }, "typedoc": { "entryPoint": "./src/index.ts" diff --git a/packages/libp2p-peer-id-factory/src/index.ts b/packages/libp2p-peer-id-factory/src/index.ts index eaf4147f4b..f3b66da887 100644 --- a/packages/libp2p-peer-id-factory/src/index.ts +++ b/packages/libp2p-peer-id-factory/src/index.ts @@ -1,6 +1,6 @@ import { generateKeyPair, marshalPrivateKey, unmarshalPrivateKey, marshalPublicKey, unmarshalPublicKey } from '@libp2p/crypto/keys' -import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { peerIdFromKeys, peerIdFromBytes } from '@libp2p/peer-id' +import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { PeerIdProto } from './proto.js' import type { PublicKey, PrivateKey } from '@libp2p/interface-keys' import type { RSAPeerId, Ed25519PeerId, Secp256k1PeerId, PeerId } from '@libp2p/interface-peer-id' @@ -39,11 +39,11 @@ export const createRSAPeerId = async (opts?: { bits: number }): Promise { - return await peerIdFromKeys(marshalPublicKey(publicKey)) + return peerIdFromKeys(marshalPublicKey(publicKey)) } export async function createFromPrivKey (privateKey: PrivateKey): Promise { - return await peerIdFromKeys(marshalPublicKey(privateKey.public), marshalPrivateKey(privateKey)) + return peerIdFromKeys(marshalPublicKey(privateKey.public), marshalPrivateKey(privateKey)) } export function exportToProtobuf (peerId: RSAPeerId | Ed25519PeerId | Secp256k1PeerId, excludePrivateKey?: boolean): Uint8Array { @@ -61,7 +61,7 @@ export async function createFromProtobuf (buf: Uint8Array): Promise { pubKey } = PeerIdProto.decode(buf) - return await createFromParts( + return createFromParts( id ?? new Uint8Array(0), privKey, pubKey @@ -69,7 +69,7 @@ export async function createFromProtobuf (buf: Uint8Array): Promise { } export async function createFromJSON (obj: { id: string, privKey?: string, pubKey?: string }): Promise { - return await createFromParts( + return createFromParts( uint8ArrayFromString(obj.id, 'base58btc'), obj.privKey != null ? uint8ArrayFromString(obj.privKey, 'base64pad') : undefined, obj.pubKey != null ? uint8ArrayFromString(obj.pubKey, 'base64pad') : undefined @@ -80,11 +80,11 @@ async function createFromParts (multihash: Uint8Array, privKey?: Uint8Array, pub if (privKey != null) { const key = await unmarshalPrivateKey(privKey) - return await createFromPrivKey(key) + return createFromPrivKey(key) } else if (pubKey != null) { const key = unmarshalPublicKey(pubKey) - return await createFromPubKey(key) + return createFromPubKey(key) } return peerIdFromBytes(multihash) diff --git a/packages/libp2p-peer-id-factory/test/index.spec.ts b/packages/libp2p-peer-id-factory/test/index.spec.ts index 8a126369a1..aa32dd2574 100644 --- a/packages/libp2p-peer-id-factory/test/index.spec.ts +++ b/packages/libp2p-peer-id-factory/test/index.spec.ts @@ -1,21 +1,21 @@ /* eslint max-nested-callbacks: ["error", 8] */ /* eslint-env mocha */ -import { expect } from 'aegir/chai' +import util from 'util' import { keys } from '@libp2p/crypto' -import { CID } from 'multiformats/cid' -import * as Digest from 'multiformats/hashes/digest' +import { peerIdFromString, peerIdFromBytes, peerIdFromCID, createPeerId } from '@libp2p/peer-id' +import { expect } from 'aegir/chai' import { base16 } from 'multiformats/bases/base16' import { base36 } from 'multiformats/bases/base36' import { base58btc } from 'multiformats/bases/base58' +import { CID } from 'multiformats/cid' +import * as Digest from 'multiformats/hashes/digest' import { identity } from 'multiformats/hashes/identity' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' import { toString as uint8ArrayToString } from 'uint8arrays/to-string' -import { peerIdFromString, peerIdFromBytes, peerIdFromCID, createPeerId } from '@libp2p/peer-id' import * as PeerIdFactory from '../src/index.js' -import util from 'util' -import testId from './fixtures/sample-id.js' import goId from './fixtures/go-private-key.js' +import testId from './fixtures/sample-id.js' const LIBP2P_KEY_CODE = 0x72 const RAW_CODE = 0x55 diff --git a/packages/libp2p-peer-id/package.json b/packages/libp2p-peer-id/package.json index ef1165b8d0..fbd646c24f 100644 --- a/packages/libp2p-peer-id/package.json +++ b/packages/libp2p-peer-id/package.json @@ -144,7 +144,7 @@ "uint8arrays": "^4.0.2" }, "devDependencies": { - "aegir": "^38.1.0" + "aegir": "^39.0.10" }, "typedoc": { "entryPoint": "./src/index.ts" diff --git a/packages/libp2p-peer-id/src/index.ts b/packages/libp2p-peer-id/src/index.ts index 6d017fbd3c..9ef86986c5 100644 --- a/packages/libp2p-peer-id/src/index.ts +++ b/packages/libp2p-peer-id/src/index.ts @@ -1,15 +1,14 @@ -import { CID } from 'multiformats/cid' -import { bases } from 'multiformats/basics' +import { type Ed25519PeerId, type PeerIdType, type RSAPeerId, type Secp256k1PeerId, symbol, type PeerId } from '@libp2p/interface-peer-id' +import { CodeError } from '@libp2p/interfaces/errors' import { base58btc } from 'multiformats/bases/base58' +import { bases } from 'multiformats/basics' +import { CID } from 'multiformats/cid' import * as Digest from 'multiformats/hashes/digest' import { identity } from 'multiformats/hashes/identity' -import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import { sha256 } from 'multiformats/hashes/sha2' -import { CodeError } from '@libp2p/interfaces/errors' -import { Ed25519PeerId, PeerIdType, RSAPeerId, Secp256k1PeerId, symbol } from '@libp2p/interface-peer-id' +import { equals as uint8ArrayEquals } from 'uint8arrays/equals' import type { MultibaseDecoder } from 'multiformats/bases/interface' import type { MultihashDigest } from 'multiformats/hashes/interface' -import type { PeerId } from '@libp2p/interface-peer-id' const inspect = Symbol.for('nodejs.util.inspect.custom') @@ -70,9 +69,7 @@ class PeerIdImpl { return `PeerId(${this.toString()})` } - get [symbol] (): boolean { - return true - } + readonly [symbol] = true toString (): string { if (this.string == null) { diff --git a/packages/libp2p-peer-id/test/index.spec.ts b/packages/libp2p-peer-id/test/index.spec.ts index e139c6f860..98af69f365 100644 --- a/packages/libp2p-peer-id/test/index.spec.ts +++ b/packages/libp2p-peer-id/test/index.spec.ts @@ -1,7 +1,7 @@ /* eslint-env mocha */ import { expect } from 'aegir/chai' -import { createPeerId, peerIdFromBytes, peerIdFromString } from '../src/index.js' import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' +import { createPeerId, peerIdFromBytes, peerIdFromString } from '../src/index.js' describe('PeerId', () => { it('create an id without \'new\'', () => {