@libp2p/peer-id 1.0.4 → 1.1.3

package/dist/src/index.d.ts

@@ -1,30 +1,21 @@
 import { CID } from 'multiformats/cid';
+import { symbol } from '@libp2p/interfaces/peer-id';
 import type { MultibaseDecoder, MultibaseEncoder } from 'multiformats/bases/interface';
 import type { MultihashDigest } from 'multiformats/hashes/interface';
+import type { PeerId } from '@libp2p/interfaces/peer-id';
 interface PeerIdOptions {
     type: 'RSA' | 'Ed25519' | 'secp256k1';
     multihash: MultihashDigest;
     privateKey?: Uint8Array;
 }
-interface RSAPeerIdOptions {
-    multihash: MultihashDigest;
-    privateKey?: Uint8Array;
-    publicKey?: Uint8Array;
-}
-interface Ed25519PeerIdOptions {
-    multihash: MultihashDigest;
-    privateKey?: Uint8Array;
-}
-interface Secp256k1PeerIdOptions {
-    multihash: MultihashDigest;
-    privateKey?: Uint8Array;
-}
-export declare class PeerId {
+declare class PeerIdImpl {
     type: 'RSA' | 'Ed25519' | 'secp256k1';
     readonly multihash: MultihashDigest;
     readonly privateKey?: Uint8Array;
     readonly publicKey?: Uint8Array;
     constructor(opts: PeerIdOptions);
+    get [Symbol.toStringTag](): string;
+    get [symbol](): boolean;
     toString(codec?: MultibaseEncoder<any>): string;
     toCID(): CID;
     toBytes(): Uint8Array;
@@ -35,29 +26,16 @@ export declare class PeerId {
      * @returns {boolean}
      */
     equals(id: any): boolean;
-    static fromString(str: string, decoder?: MultibaseDecoder<any>): Ed25519PeerId | Secp256k1PeerId | RSAPeerId;
-    static fromBytes(buf: Uint8Array): Ed25519PeerId | Secp256k1PeerId | RSAPeerId;
-    static fromCID(cid: CID): Ed25519PeerId | Secp256k1PeerId | RSAPeerId;
-    /**
-     * @param publicKey - A marshalled public key
-     * @param privateKey - A marshalled private key
-     */
-    static fromKeys(publicKey: Uint8Array, privateKey?: Uint8Array): Promise<Ed25519PeerId | Secp256k1PeerId | RSAPeerId>;
-}
-export declare class RSAPeerId extends PeerId {
-    readonly type = "RSA";
-    readonly publicKey?: Uint8Array;
-    constructor(opts: RSAPeerIdOptions);
-}
-export declare class Ed25519PeerId extends PeerId {
-    readonly type = "Ed25519";
-    readonly publicKey: Uint8Array;
-    constructor(opts: Ed25519PeerIdOptions);
-}
-export declare class Secp256k1PeerId extends PeerId {
-    readonly type = "secp256k1";
-    readonly publicKey: Uint8Array;
-    constructor(opts: Secp256k1PeerIdOptions);
 }
+export declare function createPeerId(opts: PeerIdOptions): PeerIdImpl;
+export declare function peerIdFromPeerId(other: any): PeerId;
+export declare function peerIdFromString(str: string, decoder?: MultibaseDecoder<any>): PeerId;
+export declare function peerIdFromBytes(buf: Uint8Array): PeerId;
+export declare function peerIdFromCID(cid: CID): PeerId;
+/**
+ * @param publicKey - A marshalled public key
+ * @param privateKey - A marshalled private key
+ */
+export declare function peerIdFromKeys(publicKey: Uint8Array, privateKey?: Uint8Array): Promise<PeerId>;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAMtC,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAepE,UAAU,aAAa;IACrB,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,CAAA;IACrC,SAAS,EAAE,eAAe,CAAA;IAC1B,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB;AAED,UAAU,gBAAgB;IACxB,SAAS,EAAE,eAAe,CAAA;IAC1B,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,SAAS,CAAC,EAAE,UAAU,CAAA;CACvB;AAED,UAAU,oBAAoB;IAC5B,SAAS,EAAE,eAAe,CAAA;IAC1B,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB;AAED,UAAU,sBAAsB;IAC9B,SAAS,EAAE,eAAe,CAAA;IAC1B,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB;AAED,qBAAa,MAAM;IACV,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,CAAA;IAC5C,SAAgB,SAAS,EAAE,eAAe,CAAA;IAC1C,SAAgB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvC,SAAgB,SAAS,CAAC,EAAE,UAAU,CAAA;gBAEzB,IAAI,EAAE,aAAa;IAMhC,QAAQ,CAAE,KAAK,CAAC,EAAE,gBAAgB,CAAC,GAAG,CAAC;IAUvC,KAAK;IAIL,OAAO;IAIP;;;;;OAKG;IACH,MAAM,CAAE,EAAE,EAAE,GAAG;IAUf,MAAM,CAAC,UAAU,CAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,CAAC,GAAG,CAAC;IAoB/D,MAAM,CAAC,SAAS,CAAE,GAAG,EAAE,UAAU;IAsBjC,MAAM,CAAC,OAAO,CAAE,GAAG,EAAE,GAAG;IAoBxB;;;OAGG;WACU,QAAQ,CAAE,SAAS,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,UAAU;CAWtE;AAED,qBAAa,SAAU,SAAQ,MAAM;IACnC,SAAgB,IAAI,SAAQ;IAC5B,SAAgB,SAAS,CAAC,EAAE,UAAU,CAAA;gBAEzB,IAAI,EAAE,gBAAgB;CAKpC;AAED,qBAAa,aAAc,SAAQ,MAAM;IACvC,SAAgB,IAAI,aAAY;IAChC,SAAgB,SAAS,EAAE,UAAU,CAAA;gBAExB,IAAI,EAAE,oBAAoB;CAKxC;AAED,qBAAa,eAAgB,SAAQ,MAAM;IACzC,SAAgB,IAAI,eAAc;IAClC,SAAgB,SAAS,EAAE,UAAU,CAAA;gBAExB,IAAI,EAAE,sBAAsB;CAK1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAQtC,OAAO,EAA6C,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAC9F,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAcxD,UAAU,aAAa;IACrB,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,CAAA;IACrC,SAAS,EAAE,eAAe,CAAA;IAC1B,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB;AAkBD,cAAM,UAAU;IACP,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,CAAA;IAC5C,SAAgB,SAAS,EAAE,eAAe,CAAA;IAC1C,SAAgB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvC,SAAgB,SAAS,CAAC,EAAE,UAAU,CAAA;gBAEzB,IAAI,EAAE,aAAa;IAMhC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAEvB;IAED,IAAI,CAAC,MAAM,CAAC,YAEX;IAED,QAAQ,CAAE,KAAK,CAAC,EAAE,gBAAgB,CAAC,GAAG,CAAC;IAUvC,KAAK;IAIL,OAAO;IAIP;;;;;OAKG;IACH,MAAM,CAAE,EAAE,EAAE,GAAG;CAShB;AAmCD,wBAAgB,YAAY,CAAE,IAAI,EAAE,aAAa,cAEhD;AAED,wBAAgB,gBAAgB,CAAE,KAAK,EAAE,GAAG,GAAG,MAAM,CAgBpD;AAED,wBAAgB,gBAAgB,CAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,CAAC,GAAG,CAAC,GAAG,MAAM,CAkBtF;AAED,wBAAgB,eAAe,CAAE,GAAG,EAAE,UAAU,UAoB/C;AAED,wBAAgB,aAAa,CAAE,GAAG,EAAE,GAAG,GAAG,MAAM,CAkB/C;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAE,SAAS,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAUrG"}

package/dist/src/index.js

@@ -5,6 +5,8 @@ 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 errcode from 'err-code';
+import { symbol } from '@libp2p/interfaces/peer-id';
 const baseDecoder = Object
     .values(bases)
     .map(codec => codec.decoder)
@@ -14,12 +16,18 @@ const baseDecoder = Object
 const LIBP2P_KEY_CODE = 0x72;
 const MARSHALLED_ED225519_PUBLIC_KEY_LENGTH = 36;
 const MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH = 37;
-export class PeerId {
+class PeerIdImpl {
     constructor(opts) {
         this.type = opts.type;
         this.multihash = opts.multihash;
         this.privateKey = opts.privateKey;
     }
+    get [Symbol.toStringTag]() {
+        return symbol.toString();
+    }
+    get [symbol]() {
+        return true;
+    }
     toString(codec) {
         if (codec == null) {
             codec = base58btc;
@@ -51,95 +59,111 @@ export class PeerId {
             throw new Error('not valid Id');
         }
     }
-    static fromString(str, decoder) {
-        decoder = decoder ?? baseDecoder;
-        if (str.charAt(0) === '1' || str.charAt(0) === 'Q') {
-            // identity hash ed25519/secp256k1 key or sha2-256 hash of
-            // rsa public key - base58btc encoded either way
-            const multihash = Digest.decode(base58btc.decode(`z${str}`));
-            if (str.startsWith('12D')) {
-                return new Ed25519PeerId({ multihash });
-            }
-            else if (str.startsWith('16U')) {
-                return new Secp256k1PeerId({ multihash });
-            }
-            else {
-                return new RSAPeerId({ multihash });
-            }
-        }
-        return PeerId.fromBytes(baseDecoder.decode(str));
-    }
-    static fromBytes(buf) {
-        try {
-            const multihash = Digest.decode(buf);
-            if (multihash.code === identity.code) {
-                if (multihash.digest.length === MARSHALLED_ED225519_PUBLIC_KEY_LENGTH) {
-                    return new Ed25519PeerId({ multihash });
-                }
-                else if (multihash.digest.length === MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH) {
-                    return new Secp256k1PeerId({ multihash });
-                }
-            }
-            if (multihash.code === sha256.code) {
-                return new RSAPeerId({ multihash });
-            }
-        }
-        catch {
-            return PeerId.fromCID(CID.decode(buf));
-        }
-        throw new Error('Supplied PeerID CID is invalid');
-    }
-    static fromCID(cid) {
-        if (cid == null || cid.multihash == null || cid.version == null || (cid.version === 1 && cid.code !== LIBP2P_KEY_CODE)) {
-            throw new Error('Supplied PeerID CID is invalid');
-        }
-        const multihash = cid.multihash;
-        if (multihash.code === sha256.code) {
-            return new RSAPeerId({ multihash: cid.multihash });
-        }
-        else if (multihash.code === identity.code) {
-            if (multihash.bytes.length === MARSHALLED_ED225519_PUBLIC_KEY_LENGTH) {
-                return new Ed25519PeerId({ multihash: cid.multihash });
-            }
-            else if (multihash.bytes.length === MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH) {
-                return new Secp256k1PeerId({ multihash: cid.multihash });
-            }
-        }
-        throw new Error('Supplied PeerID CID is invalid');
-    }
-    /**
-     * @param publicKey - A marshalled public key
-     * @param privateKey - A marshalled private key
-     */
-    static async fromKeys(publicKey, privateKey) {
-        if (publicKey.length === MARSHALLED_ED225519_PUBLIC_KEY_LENGTH) {
-            return new Ed25519PeerId({ multihash: Digest.create(identity.code, publicKey), privateKey });
-        }
-        if (publicKey.length === MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH) {
-            return new Secp256k1PeerId({ multihash: Digest.create(identity.code, publicKey), privateKey });
-        }
-        return new RSAPeerId({ multihash: await sha256.digest(publicKey), publicKey, privateKey });
-    }
 }
-export class RSAPeerId extends PeerId {
+class RSAPeerIdImpl extends PeerIdImpl {
     constructor(opts) {
         super({ ...opts, type: 'RSA' });
         this.type = 'RSA';
         this.publicKey = opts.publicKey;
     }
 }
-export class Ed25519PeerId extends PeerId {
+class Ed25519PeerIdImpl extends PeerIdImpl {
     constructor(opts) {
         super({ ...opts, type: 'Ed25519' });
         this.type = 'Ed25519';
         this.publicKey = opts.multihash.digest;
     }
 }
-export class Secp256k1PeerId extends PeerId {
+class Secp256k1PeerIdImpl extends PeerIdImpl {
     constructor(opts) {
         super({ ...opts, type: 'secp256k1' });
         this.type = 'secp256k1';
         this.publicKey = opts.multihash.digest;
     }
 }
+export function createPeerId(opts) {
+    return new PeerIdImpl(opts);
+}
+export function peerIdFromPeerId(other) {
+    const err = errcode(new Error('Not a PeerId'), 'ERR_INVALID_PARAMETERS');
+    if (other.type === 'RSA') {
+        return new RSAPeerIdImpl(other);
+    }
+    if (other.type === 'Ed25519') {
+        return new Ed25519PeerIdImpl(other);
+    }
+    if (other.type === 'secp256k1') {
+        return new Secp256k1PeerIdImpl(other);
+    }
+    throw err;
+}
+export function peerIdFromString(str, decoder) {
+    decoder = decoder ?? baseDecoder;
+    if (str.charAt(0) === '1' || str.charAt(0) === 'Q') {
+        // identity hash ed25519/secp256k1 key or sha2-256 hash of
+        // rsa public key - base58btc encoded either way
+        const multihash = Digest.decode(base58btc.decode(`z${str}`));
+        if (str.startsWith('12D')) {
+            return new Ed25519PeerIdImpl({ multihash });
+        }
+        else if (str.startsWith('16U')) {
+            return new Secp256k1PeerIdImpl({ multihash });
+        }
+        else {
+            return new RSAPeerIdImpl({ multihash });
+        }
+    }
+    return peerIdFromBytes(baseDecoder.decode(str));
+}
+export function peerIdFromBytes(buf) {
+    try {
+        const multihash = Digest.decode(buf);
+        if (multihash.code === identity.code) {
+            if (multihash.digest.length === MARSHALLED_ED225519_PUBLIC_KEY_LENGTH) {
+                return new Ed25519PeerIdImpl({ multihash });
+            }
+            else if (multihash.digest.length === MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH) {
+                return new Secp256k1PeerIdImpl({ multihash });
+            }
+        }
+        if (multihash.code === sha256.code) {
+            return new RSAPeerIdImpl({ multihash });
+        }
+    }
+    catch {
+        return peerIdFromCID(CID.decode(buf));
+    }
+    throw new Error('Supplied PeerID CID is invalid');
+}
+export function peerIdFromCID(cid) {
+    if (cid == null || cid.multihash == null || cid.version == null || (cid.version === 1 && cid.code !== LIBP2P_KEY_CODE)) {
+        throw new Error('Supplied PeerID CID is invalid');
+    }
+    const multihash = cid.multihash;
+    if (multihash.code === sha256.code) {
+        return new RSAPeerIdImpl({ multihash: cid.multihash });
+    }
+    else if (multihash.code === identity.code) {
+        if (multihash.bytes.length === MARSHALLED_ED225519_PUBLIC_KEY_LENGTH) {
+            return new Ed25519PeerIdImpl({ multihash: cid.multihash });
+        }
+        else if (multihash.bytes.length === MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH) {
+            return new Secp256k1PeerIdImpl({ multihash: cid.multihash });
+        }
+    }
+    throw new Error('Supplied PeerID CID is invalid');
+}
+/**
+ * @param publicKey - A marshalled public key
+ * @param privateKey - A marshalled private key
+ */
+export async function peerIdFromKeys(publicKey, privateKey) {
+    if (publicKey.length === MARSHALLED_ED225519_PUBLIC_KEY_LENGTH) {
+        return new Ed25519PeerIdImpl({ multihash: Digest.create(identity.code, publicKey), privateKey });
+    }
+    if (publicKey.length === MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH) {
+        return new Secp256k1PeerIdImpl({ multihash: Digest.create(identity.code, publicKey), privateKey });
+    }
+    return new RSAPeerIdImpl({ multihash: await sha256.digest(publicKey), publicKey, privateKey });
+}
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/peer-id",
-  "version": "1.0.4",
+  "version": "1.1.3",
   "description": "IPFS Peer Id implementation in Node.js",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/libp2p-peer-id#readme",
@@ -120,10 +120,10 @@
   },
   "scripts": {
     "lint": "aegir lint",
-    "dep-check": "aegir dep-check dist/src/**/*.js",
+    "dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",
     "build": "tsc",
     "pretest": "npm run build",
-    "test": "aegir test -f ./dist/test/**/*.js",
+    "test": "aegir test -f ./dist/test/*.js -f ./dist/test/**/*.js",
     "test:chrome": "npm run test -- -t browser",
     "test:chrome-webworker": "npm run test -- -t webworker",
     "test:firefox": "npm run test -- -t browser -- --browser firefox",
@@ -133,6 +133,7 @@
   },
   "dependencies": {
     "@libp2p/interfaces": "^1.0.0",
+    "err-code": "^3.0.1",
     "multiformats": "^9.4.5",
     "uint8arrays": "^3.0.0"
   },

package/src/index.ts

@@ -4,9 +4,12 @@ import { base58btc } from 'multiformats/bases/base58'
 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 errcode from 'err-code'
+import { Ed25519PeerId, RSAPeerId, Secp256k1PeerId, symbol } from '@libp2p/interfaces/peer-id'
 import type { MultibaseDecoder, MultibaseEncoder } from 'multiformats/bases/interface'
 import type { MultihashDigest } from 'multiformats/hashes/interface'
-import { sha256 } from 'multiformats/hashes/sha2'
+import type { PeerId } from '@libp2p/interfaces/peer-id'
 
 const baseDecoder = Object
   .values(bases)
@@ -42,7 +45,7 @@ interface Secp256k1PeerIdOptions {
   privateKey?: Uint8Array
 }
 
-export class PeerId {
+class PeerIdImpl {
   public type: 'RSA' | 'Ed25519' | 'secp256k1'
   public readonly multihash: MultihashDigest
   public readonly privateKey?: Uint8Array
@@ -54,6 +57,14 @@ export class PeerId {
     this.privateKey = opts.privateKey
   }
 
+  get [Symbol.toStringTag] () {
+    return symbol.toString()
+  }
+
+  get [symbol] () {
+    return true
+  }
+
   toString (codec?: MultibaseEncoder<any>) {
     if (codec == null) {
       codec = base58btc
@@ -87,115 +98,137 @@ export class PeerId {
       throw new Error('not valid Id')
     }
   }
+}
 
-  static fromString (str: string, decoder?: MultibaseDecoder<any>) {
-    decoder = decoder ?? baseDecoder
-
-    if (str.charAt(0) === '1' || str.charAt(0) === 'Q') {
-      // identity hash ed25519/secp256k1 key or sha2-256 hash of
-      // rsa public key - base58btc encoded either way
-      const multihash = Digest.decode(base58btc.decode(`z${str}`))
+class RSAPeerIdImpl extends PeerIdImpl implements RSAPeerId {
+  public readonly type = 'RSA'
+  public readonly publicKey?: Uint8Array
 
-      if (str.startsWith('12D')) {
-        return new Ed25519PeerId({ multihash })
-      } else if (str.startsWith('16U')) {
-        return new Secp256k1PeerId({ multihash })
-      } else {
-        return new RSAPeerId({ multihash })
-      }
-    }
+  constructor (opts: RSAPeerIdOptions) {
+    super({ ...opts, type: 'RSA' })
 
-    return PeerId.fromBytes(baseDecoder.decode(str))
+    this.publicKey = opts.publicKey
   }
+}
 
-  static fromBytes (buf: Uint8Array) {
-    try {
-      const multihash = Digest.decode(buf)
+class Ed25519PeerIdImpl extends PeerIdImpl implements Ed25519PeerId {
+  public readonly type = 'Ed25519'
+  public readonly publicKey: Uint8Array
 
-      if (multihash.code === identity.code) {
-        if (multihash.digest.length === MARSHALLED_ED225519_PUBLIC_KEY_LENGTH) {
-          return new Ed25519PeerId({ multihash })
-        } else if (multihash.digest.length === MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH) {
-          return new Secp256k1PeerId({ multihash })
-        }
-      }
+  constructor (opts: Ed25519PeerIdOptions) {
+    super({ ...opts, type: 'Ed25519' })
 
-      if (multihash.code === sha256.code) {
-        return new RSAPeerId({ multihash })
-      }
-    } catch {
-      return PeerId.fromCID(CID.decode(buf))
-    }
+    this.publicKey = opts.multihash.digest
+  }
+}
 
-    throw new Error('Supplied PeerID CID is invalid')
+class Secp256k1PeerIdImpl extends PeerIdImpl implements Secp256k1PeerId {
+  public readonly type = 'secp256k1'
+  public readonly publicKey: Uint8Array
+
+  constructor (opts: Secp256k1PeerIdOptions) {
+    super({ ...opts, type: 'secp256k1' })
+
+    this.publicKey = opts.multihash.digest
   }
+}
 
-  static fromCID (cid: CID) {
-    if (cid == null || cid.multihash == null || cid.version == null || (cid.version === 1 && cid.code !== LIBP2P_KEY_CODE)) {
-      throw new Error('Supplied PeerID CID is invalid')
-    }
+export function createPeerId (opts: PeerIdOptions) {
+  return new PeerIdImpl(opts)
+}
 
-    const multihash = cid.multihash
+export function peerIdFromPeerId (other: any): PeerId {
+  const err = errcode(new Error('Not a PeerId'), 'ERR_INVALID_PARAMETERS')
 
-    if (multihash.code === sha256.code) {
-      return new RSAPeerId({ multihash: cid.multihash })
-    } else if (multihash.code === identity.code) {
-      if (multihash.bytes.length === MARSHALLED_ED225519_PUBLIC_KEY_LENGTH) {
-        return new Ed25519PeerId({ multihash: cid.multihash })
-      } else if (multihash.bytes.length === MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH) {
-        return new Secp256k1PeerId({ multihash: cid.multihash })
-      }
-    }
+  if (other.type === 'RSA') {
+    return new RSAPeerIdImpl(other)
+  }
 
-    throw new Error('Supplied PeerID CID is invalid')
+  if (other.type === 'Ed25519') {
+    return new Ed25519PeerIdImpl(other)
   }
 
-  /**
-   * @param publicKey - A marshalled public key
-   * @param privateKey - A marshalled private key
-   */
-  static async fromKeys (publicKey: Uint8Array, privateKey?: Uint8Array) {
-    if (publicKey.length === MARSHALLED_ED225519_PUBLIC_KEY_LENGTH) {
-      return new Ed25519PeerId({ multihash: Digest.create(identity.code, publicKey), privateKey })
-    }
+  if (other.type === 'secp256k1') {
+    return new Secp256k1PeerIdImpl(other)
+  }
 
-    if (publicKey.length === MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH) {
-      return new Secp256k1PeerId({ multihash: Digest.create(identity.code, publicKey), privateKey })
-    }
+  throw err
+}
+
+export function peerIdFromString (str: string, decoder?: MultibaseDecoder<any>): PeerId {
+  decoder = decoder ?? baseDecoder
+
+  if (str.charAt(0) === '1' || str.charAt(0) === 'Q') {
+    // identity hash ed25519/secp256k1 key or sha2-256 hash of
+    // rsa public key - base58btc encoded either way
+    const multihash = Digest.decode(base58btc.decode(`z${str}`))
 
-    return new RSAPeerId({ multihash: await sha256.digest(publicKey), publicKey, privateKey })
+    if (str.startsWith('12D')) {
+      return new Ed25519PeerIdImpl({ multihash })
+    } else if (str.startsWith('16U')) {
+      return new Secp256k1PeerIdImpl({ multihash })
+    } else {
+      return new RSAPeerIdImpl({ multihash })
+    }
   }
+
+  return peerIdFromBytes(baseDecoder.decode(str))
 }
 
-export class RSAPeerId extends PeerId {
-  public readonly type = 'RSA'
-  public readonly publicKey?: Uint8Array
+export function peerIdFromBytes (buf: Uint8Array) {
+  try {
+    const multihash = Digest.decode(buf)
 
-  constructor (opts: RSAPeerIdOptions) {
-    super({ ...opts, type: 'RSA' })
+    if (multihash.code === identity.code) {
+      if (multihash.digest.length === MARSHALLED_ED225519_PUBLIC_KEY_LENGTH) {
+        return new Ed25519PeerIdImpl({ multihash })
+      } else if (multihash.digest.length === MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH) {
+        return new Secp256k1PeerIdImpl({ multihash })
+      }
+    }
 
-    this.publicKey = opts.publicKey
+    if (multihash.code === sha256.code) {
+      return new RSAPeerIdImpl({ multihash })
+    }
+  } catch {
+    return peerIdFromCID(CID.decode(buf))
   }
+
+  throw new Error('Supplied PeerID CID is invalid')
 }
 
-export class Ed25519PeerId extends PeerId {
-  public readonly type = 'Ed25519'
-  public readonly publicKey: Uint8Array
+export function peerIdFromCID (cid: CID): PeerId {
+  if (cid == null || cid.multihash == null || cid.version == null || (cid.version === 1 && cid.code !== LIBP2P_KEY_CODE)) {
+    throw new Error('Supplied PeerID CID is invalid')
+  }
 
-  constructor (opts: Ed25519PeerIdOptions) {
-    super({ ...opts, type: 'Ed25519' })
+  const multihash = cid.multihash
 
-    this.publicKey = opts.multihash.digest
+  if (multihash.code === sha256.code) {
+    return new RSAPeerIdImpl({ multihash: cid.multihash })
+  } else if (multihash.code === identity.code) {
+    if (multihash.bytes.length === MARSHALLED_ED225519_PUBLIC_KEY_LENGTH) {
+      return new Ed25519PeerIdImpl({ multihash: cid.multihash })
+    } else if (multihash.bytes.length === MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH) {
+      return new Secp256k1PeerIdImpl({ multihash: cid.multihash })
+    }
   }
-}
 
-export class Secp256k1PeerId extends PeerId {
-  public readonly type = 'secp256k1'
-  public readonly publicKey: Uint8Array
+  throw new Error('Supplied PeerID CID is invalid')
+}
 
-  constructor (opts: Secp256k1PeerIdOptions) {
-    super({ ...opts, type: 'secp256k1' })
+/**
+ * @param publicKey - A marshalled public key
+ * @param privateKey - A marshalled private key
+ */
+export async function peerIdFromKeys (publicKey: Uint8Array, privateKey?: Uint8Array): Promise<PeerId> {
+  if (publicKey.length === MARSHALLED_ED225519_PUBLIC_KEY_LENGTH) {
+    return new Ed25519PeerIdImpl({ multihash: Digest.create(identity.code, publicKey), privateKey })
+  }
 
-    this.publicKey = opts.multihash.digest
+  if (publicKey.length === MARSHALLED_SECP258K1_PUBLIC_KEY_LENGTH) {
+    return new Secp256k1PeerIdImpl({ multihash: Digest.create(identity.code, publicKey), privateKey })
   }
+
+  return new RSAPeerIdImpl({ multihash: await sha256.digest(publicKey), publicKey, privateKey })
 }