@peerbit/keychain 1.0.32 → 1.1.0-0fddff8

package/dist/src/crypto.d.ts

@@ -0,0 +1,20 @@
+import { type Constructor } from "@dao-xyz/borsh";
+import { type AnyStore } from "@peerbit/any-store";
+import { type ByteKey, Ed25519Keypair, type Ed25519PublicKey, type PublicKeyEncryptionKey, type PublicSignKey, type Secp256k1Keypair, type Secp256k1PublicKey, X25519Keypair, type X25519PublicKey } from "@peerbit/crypto";
+import { type CryptoKeychain, type KeyParameters, type KeypairFromPublicKey, type KeypairParameters } from "./interface.js";
+export declare class DefaultCryptoKeychain implements CryptoKeychain {
+    readonly properties: {
+        store: AnyStore;
+    };
+    constructor(properties?: {
+        store: AnyStore;
+    });
+    import(parameters: (KeypairParameters | KeyParameters) & {
+        id?: Uint8Array;
+    }): Promise<void>;
+    exportByKey<T extends X25519PublicKey | Ed25519PublicKey | Secp256k1PublicKey | PublicSignKey | PublicKeyEncryptionKey, Q = KeypairFromPublicKey<T>>(publicKey: T): Promise<Q | undefined>;
+    exportById<T = Ed25519Keypair | Secp256k1Keypair | X25519Keypair | ByteKey>(id: Uint8Array, type: Constructor<T>): Promise<T | undefined>;
+    start(): Promise<void>;
+    stop(): Promise<void>;
+}
+//# sourceMappingURL=crypto.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../../src/crypto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAA0B,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EACN,KAAK,OAAO,EACZ,cAAc,EACd,KAAK,gBAAgB,EAErB,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,aAAa,EACb,KAAK,eAAe,EAEpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACN,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACtB,MAAM,gBAAgB,CAAC;AAExB,qBAAa,qBAAsB,YAAW,cAAc;IAE1D,QAAQ,CAAC,UAAU,EAAE;QAAE,KAAK,EAAE,QAAQ,CAAA;KAAE;gBAA/B,UAAU,GAAE;QAAE,KAAK,EAAE,QAAQ,CAAA;KAA6B;IAG9D,MAAM,CACX,UAAU,EAAE,CAAC,iBAAiB,GAAG,aAAa,CAAC,GAAG;QAAE,EAAE,CAAC,EAAE,UAAU,CAAA;KAAE,GACnE,OAAO,CAAC,IAAI,CAAC;IAyBV,WAAW,CAChB,CAAC,SACE,eAAe,GACf,gBAAgB,GAChB,kBAAkB,GAClB,aAAa,GACb,sBAAsB,EACzB,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EAC1B,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAQjC,UAAU,CACf,CAAC,GAAG,cAAc,GAAG,gBAAgB,GAAG,aAAa,GAAG,OAAO,EAC9D,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAiBzD,KAAK;IAIL,IAAI;CAGV"}

package/dist/src/crypto.js

@@ -0,0 +1,60 @@
+import { deserialize, serialize } from "@dao-xyz/borsh";
+import {} from "@peerbit/any-store";
+import { createStore } from "@peerbit/any-store";
+import { Ed25519Keypair, Keypair, X25519Keypair, toBase64, } from "@peerbit/crypto";
+import {} from "./interface.js";
+export class DefaultCryptoKeychain {
+    properties;
+    constructor(properties = { store: createStore() }) {
+        this.properties = properties;
+    }
+    async import(parameters) {
+        let bytes;
+        let publicKey;
+        if (parameters.keypair) {
+            const kp = parameters.keypair;
+            bytes = serialize(kp);
+            publicKey = serialize(kp.publicKey);
+            if (kp instanceof Ed25519Keypair) {
+                // also import as X25519Keypair for convenience
+                const xkp = await X25519Keypair.from(kp);
+                await this.import({ keypair: xkp });
+            }
+        }
+        else {
+            bytes = serialize(parameters.key);
+        }
+        if (parameters.id) {
+            await this.properties.store.put(toBase64(parameters.id), bytes);
+        }
+        if (publicKey) {
+            await this.properties.store.put(toBase64(publicKey), bytes);
+        }
+    }
+    async exportByKey(publicKey) {
+        const key = await this.properties.store.get(toBase64(serialize(publicKey)));
+        if (key) {
+            return deserialize(key, Keypair);
+        }
+        return undefined;
+    }
+    async exportById(id, type) {
+        const key = await this.properties.store.get(toBase64(id));
+        if (key) {
+            const maybeConvert = type === X25519Keypair;
+            const exported = deserialize(key, maybeConvert ? Keypair : type);
+            if (maybeConvert && exported instanceof Ed25519Keypair) {
+                return X25519Keypair.from(exported);
+            }
+            return exported;
+        }
+        return undefined;
+    }
+    async start() {
+        await this.properties.store.open();
+    }
+    async stop() {
+        await this.properties.store.close();
+    }
+}
+//# sourceMappingURL=crypto.js.map

package/dist/src/crypto.js.map

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

package/dist/src/index.d.ts

@@ -1,22 +1,4 @@
-import { type Constructor } from "@dao-xyz/borsh";
-import { type AnyStore } from "@peerbit/any-store";
-import { type ByteKey, Ed25519Keypair, type Ed25519PublicKey, Keypair, type PublicKeyEncryptionKey, type PublicSignKey, type Secp256k1Keypair, type Secp256k1PublicKey, X25519Keypair, type X25519PublicKey } from "@peerbit/crypto";
-import { type KeyParameters, type Keychain, type KeypairParameters } from "./interface.js";
-export type { Keychain };
-export type KeypairFromPublicKey<T> = T extends X25519PublicKey ? X25519Keypair : T extends Ed25519PublicKey ? Ed25519Keypair : T extends Secp256k1PublicKey ? Secp256k1Keypair : T extends PublicSignKey | PublicKeyEncryptionKey ? Keypair : never;
-export declare class DefaultKeychain implements Keychain {
-    readonly properties: {
-        store: AnyStore;
-    };
-    constructor(properties?: {
-        store: AnyStore;
-    });
-    import(parameters: (KeypairParameters | KeyParameters) & {
-        id?: Uint8Array;
-    }): Promise<void>;
-    exportByKey<T extends X25519PublicKey | Ed25519PublicKey | Secp256k1PublicKey | PublicSignKey | PublicKeyEncryptionKey, Q = KeypairFromPublicKey<T>>(publicKey: T): Promise<Q | undefined>;
-    exportById<T = Ed25519Keypair | Secp256k1Keypair | X25519Keypair | ByteKey>(id: Uint8Array, type: Constructor<T>): Promise<T | undefined>;
-    start(): Promise<void>;
-    stop(): Promise<void>;
-}
+export * from "./crypto.js";
+export * from "./interface.js";
+export * from "./libp2p.js";
 //# 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,KAAK,WAAW,EAA0B,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EACN,KAAK,OAAO,EACZ,cAAc,EACd,KAAK,gBAAgB,EACrB,OAAO,EACP,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,aAAa,EACb,KAAK,eAAe,EAEpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACN,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,iBAAiB,EACtB,MAAM,gBAAgB,CAAC;AAExB,YAAY,EAAE,QAAQ,EAAE,CAAC;AAEzB,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,CAAC,SAAS,eAAe,GAC5D,aAAa,GACb,CAAC,SAAS,gBAAgB,GACzB,cAAc,GACd,CAAC,SAAS,kBAAkB,GAC3B,gBAAgB,GAChB,CAAC,SAAS,aAAa,GAAG,sBAAsB,GAC/C,OAAO,GACP,KAAK,CAAC;AAEZ,qBAAa,eAAgB,YAAW,QAAQ;IAE9C,QAAQ,CAAC,UAAU,EAAE;QAAE,KAAK,EAAE,QAAQ,CAAA;KAAE;gBAA/B,UAAU,GAAE;QAAE,KAAK,EAAE,QAAQ,CAAA;KAA6B;IAE9D,MAAM,CACX,UAAU,EAAE,CAAC,iBAAiB,GAAG,aAAa,CAAC,GAAG;QAAE,EAAE,CAAC,EAAE,UAAU,CAAA;KAAE,GACnE,OAAO,CAAC,IAAI,CAAC;IAyBV,WAAW,CAChB,CAAC,SACE,eAAe,GACf,gBAAgB,GAChB,kBAAkB,GAClB,aAAa,GACb,sBAAsB,EACzB,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EAC1B,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAQjC,UAAU,CACf,CAAC,GAAG,cAAc,GAAG,gBAAgB,GAAG,aAAa,GAAG,OAAO,EAC9D,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAiBzD,KAAK;IAIL,IAAI;CAGV"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC"}

package/dist/src/index.js

@@ -1,60 +1,4 @@
-import { deserialize, serialize } from "@dao-xyz/borsh";
-import {} from "@peerbit/any-store";
-import { createStore } from "@peerbit/any-store";
-import { Ed25519Keypair, Keypair, X25519Keypair, toBase64, } from "@peerbit/crypto";
-import {} from "./interface.js";
-export class DefaultKeychain {
-    properties;
-    constructor(properties = { store: createStore() }) {
-        this.properties = properties;
-    }
-    async import(parameters) {
-        let bytes;
-        let publicKey;
-        if (parameters.keypair) {
-            const kp = parameters.keypair;
-            bytes = serialize(kp);
-            publicKey = serialize(kp.publicKey);
-            if (kp instanceof Ed25519Keypair) {
-                // also import as X25519Keypair for convenience
-                const xkp = await X25519Keypair.from(kp);
-                await this.import({ keypair: xkp });
-            }
-        }
-        else {
-            bytes = serialize(parameters.key);
-        }
-        if (parameters.id) {
-            await this.properties.store.put(toBase64(parameters.id), bytes);
-        }
-        if (publicKey) {
-            await this.properties.store.put(toBase64(publicKey), bytes);
-        }
-    }
-    async exportByKey(publicKey) {
-        const key = await this.properties.store.get(toBase64(serialize(publicKey)));
-        if (key) {
-            return deserialize(key, Keypair);
-        }
-        return undefined;
-    }
-    async exportById(id, type) {
-        const key = await this.properties.store.get(toBase64(id));
-        if (key) {
-            const maybeConvert = type === X25519Keypair;
-            const exported = deserialize(key, maybeConvert ? Keypair : type);
-            if (maybeConvert && exported instanceof Ed25519Keypair) {
-                return X25519Keypair.from(exported);
-            }
-            return exported;
-        }
-        return undefined;
-    }
-    async start() {
-        await this.properties.store.open();
-    }
-    async stop() {
-        await this.properties.store.close();
-    }
-}
+export * from "./crypto.js";
+export * from "./interface.js";
+export * from "./libp2p.js";
 //# 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":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC"}

package/dist/src/interface.d.ts

@@ -1,4 +1,5 @@
 import { type AbstractType } from "@dao-xyz/borsh";
+import { type Keychain as ILibp2pKeychain } from "@libp2p/keychain";
 import type { ByteKey, Ed25519Keypair, Ed25519PublicKey, Keypair, PublicKeyEncryptionKey, PublicSignKey, Secp256k1Keypair, Secp256k1PublicKey, X25519Keypair, X25519PublicKey } from "@peerbit/crypto";
 export type KeypairFromPublicKey<T> = T extends X25519PublicKey ? X25519Keypair : T extends Ed25519PublicKey ? Ed25519Keypair : T extends Secp256k1PublicKey ? Secp256k1Keypair : T extends PublicSignKey | PublicKeyEncryptionKey ? Keypair : never;
 export type KeypairParameters = {
@@ -7,11 +8,14 @@ export type KeypairParameters = {
 export type KeyParameters = {
     key: ByteKey;
 };
-export interface Keychain {
+export interface CryptoKeychain {
     import(parameters: (KeypairParameters | KeyParameters) & {
         id: Uint8Array;
     }): Promise<void>;
     exportByKey<T extends Ed25519PublicKey | X25519PublicKey | Secp256k1PublicKey | PublicSignKey | PublicKeyEncryptionKey, Q = KeypairFromPublicKey<T>>(publicKey: T): Promise<Q | undefined>;
     exportById<T extends Ed25519Keypair | Secp256k1Keypair | X25519Keypair | ByteKey>(id: Uint8Array, type: AbstractType<T>): Promise<T | undefined>;
+    start(): Promise<void>;
+    stop(): Promise<void>;
 }
+export type IPeerbitKeychain = CryptoKeychain & ILibp2pKeychain;
 //# sourceMappingURL=interface.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EACX,OAAO,EACP,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,sBAAsB,EACtB,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACb,eAAe,EACf,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,CAAC,SAAS,eAAe,GAC5D,aAAa,GACb,CAAC,SAAS,gBAAgB,GACzB,cAAc,GACd,CAAC,SAAS,kBAAkB,GAC3B,gBAAgB,GAChB,CAAC,SAAS,aAAa,GAAG,sBAAsB,GAC/C,OAAO,GACP,KAAK,CAAC;AAEZ,MAAM,MAAM,iBAAiB,GAAG;IAC/B,OAAO,EAAE,cAAc,GAAG,aAAa,GAAG,gBAAgB,GAAG,OAAO,CAAC;CACrE,CAAC;AACF,MAAM,MAAM,aAAa,GAAG;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,CAAC;AAE7C,MAAM,WAAW,QAAQ;IAExB,MAAM,CACL,UAAU,EAAE,CAAC,iBAAiB,GAAG,aAAa,CAAC,GAAG;QAAE,EAAE,EAAE,UAAU,CAAA;KAAE,GAClE,OAAO,CAAC,IAAI,CAAC,CAAC;IAGjB,WAAW,CACV,CAAC,SACE,gBAAgB,GAChB,eAAe,GACf,kBAAkB,GAClB,aAAa,GACb,sBAAsB,EACzB,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EAE3B,SAAS,EAAE,CAAC,GACV,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAK1B,UAAU,CACT,CAAC,SAAS,cAAc,GAAG,gBAAgB,GAAG,aAAa,GAAG,OAAO,EAErE,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;CAC1B"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,KAAK,QAAQ,IAAI,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,KAAK,EACX,OAAO,EACP,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,sBAAsB,EACtB,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACb,eAAe,EACf,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,CAAC,SAAS,eAAe,GAC5D,aAAa,GACb,CAAC,SAAS,gBAAgB,GACzB,cAAc,GACd,CAAC,SAAS,kBAAkB,GAC3B,gBAAgB,GAChB,CAAC,SAAS,aAAa,GAAG,sBAAsB,GAC/C,OAAO,GACP,KAAK,CAAC;AAEZ,MAAM,MAAM,iBAAiB,GAAG;IAC/B,OAAO,EAAE,cAAc,GAAG,aAAa,GAAG,gBAAgB,GAAG,OAAO,CAAC;CACrE,CAAC;AACF,MAAM,MAAM,aAAa,GAAG;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,CAAC;AAE7C,MAAM,WAAW,cAAc;IAE9B,MAAM,CACL,UAAU,EAAE,CAAC,iBAAiB,GAAG,aAAa,CAAC,GAAG;QAAE,EAAE,EAAE,UAAU,CAAA;KAAE,GAClE,OAAO,CAAC,IAAI,CAAC,CAAC;IAGjB,WAAW,CACV,CAAC,SACE,gBAAgB,GAChB,eAAe,GACf,kBAAkB,GAClB,aAAa,GACb,sBAAsB,EACzB,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EAE3B,SAAS,EAAE,CAAC,GACV,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAK1B,UAAU,CACT,CAAC,SAAS,cAAc,GAAG,gBAAgB,GAAG,aAAa,GAAG,OAAO,EAErE,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAE1B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACtB;AAED,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG,eAAe,CAAC"}

package/dist/src/interface.js

@@ -1,2 +1,3 @@
 import {} from "@dao-xyz/borsh";
+import {} from "@libp2p/keychain";
 //# sourceMappingURL=interface.js.map

package/dist/src/interface.js.map

@@ -1 +1 @@
-{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAoC,MAAM,kBAAkB,CAAC"}

package/dist/src/libp2p.d.ts

@@ -0,0 +1,38 @@
+import type { Constructor } from "@dao-xyz/borsh";
+import type { PrivateKey } from "@libp2p/interface";
+import { type Keychain as ILibp2pKeychain, type KeyInfo, type KeychainComponents, type KeychainInit } from "@libp2p/keychain";
+import { type AnyStore } from "@peerbit/any-store";
+import type { ByteKey, Ed25519Keypair, Ed25519PublicKey, PublicKeyEncryptionKey, PublicSignKey, Secp256k1Keypair, Secp256k1PublicKey, X25519Keypair, X25519PublicKey } from "@peerbit/crypto/dist/src";
+import type { CryptoKeychain, KeyParameters, KeypairFromPublicKey, KeypairParameters } from "./interface.js";
+export declare class PeerbitKeychain implements CryptoKeychain, ILibp2pKeychain {
+    private libp2p;
+    private crypto;
+    constructor(components: KeychainComponents, init: {
+        libp2p?: KeychainInit;
+        crypto?: {
+            store: AnyStore;
+        } | CryptoKeychain;
+    });
+    import(parameters: (KeypairParameters | KeyParameters) & {
+        id: Uint8Array;
+    }): Promise<void>;
+    exportByKey<T extends Ed25519PublicKey | X25519PublicKey | Secp256k1PublicKey | PublicSignKey | PublicKeyEncryptionKey, Q = KeypairFromPublicKey<T>>(publicKey: T): Promise<Q | undefined>;
+    exportById<T extends Ed25519Keypair | Secp256k1Keypair | X25519Keypair | ByteKey>(id: Uint8Array, type: Constructor<T>): Promise<T | undefined>;
+    findKeyByName(name: string): Promise<KeyInfo>;
+    findKeyById(id: string): Promise<KeyInfo>;
+    importKey(name: string, key: PrivateKey): Promise<KeyInfo>;
+    exportKey(name: string): Promise<PrivateKey>;
+    removeKey(name: string): Promise<KeyInfo>;
+    renameKey(oldName: string, newName: string): Promise<KeyInfo>;
+    listKeys(): Promise<KeyInfo[]>;
+    rotateKeychainPass(oldPass: string, newPass: string): Promise<void>;
+    start(): Promise<void>;
+    stop(): Promise<void>;
+}
+export declare function keychain(init?: {
+    libp2p: KeychainInit;
+    crypto?: CryptoKeychain | {
+        store: AnyStore;
+    };
+}): (components: KeychainComponents) => PeerbitKeychain;
+//# sourceMappingURL=libp2p.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"libp2p.d.ts","sourceRoot":"","sources":["../../src/libp2p.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACN,KAAK,QAAQ,IAAI,eAAe,EAChC,KAAK,OAAO,EACZ,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAEjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,QAAQ,EAAe,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EACX,OAAO,EACP,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACb,eAAe,EACf,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EACX,cAAc,EACd,aAAa,EACb,oBAAoB,EACpB,iBAAiB,EACjB,MAAM,gBAAgB,CAAC;AAExB,qBAAa,eAAgB,YAAW,cAAc,EAAE,eAAe;IACtE,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,MAAM,CAAiB;gBAG9B,UAAU,EAAE,kBAAkB,EAC9B,IAAI,EAAE;QACL,MAAM,CAAC,EAAE,YAAY,CAAC;QACtB,MAAM,CAAC,EAAE;YAAE,KAAK,EAAE,QAAQ,CAAA;SAAE,GAAG,cAAc,CAAC;KAC9C;IAQF,MAAM,CACL,UAAU,EAAE,CAAC,iBAAiB,GAAG,aAAa,CAAC,GAAG;QAAE,EAAE,EAAE,UAAU,CAAA;KAAE,GAClE,OAAO,CAAC,IAAI,CAAC;IAGhB,WAAW,CACV,CAAC,SACE,gBAAgB,GAChB,eAAe,GACf,kBAAkB,GAClB,aAAa,GACb,sBAAsB,EACzB,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EAC1B,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAGvC,UAAU,CACT,CAAC,SAAS,cAAc,GAAG,gBAAgB,GAAG,aAAa,GAAG,OAAO,EACpE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAG/D,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAG7C,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAGzC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAG1D,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAG5C,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAGzC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAG7D,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAG9B,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAG7D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAGtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG3B;AAED,wBAAgB,QAAQ,CACvB,IAAI,GAAE;IACL,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,CAAC,EAAE,cAAc,GAAG;QAAE,KAAK,EAAE,QAAQ,CAAA;KAAE,CAAC;CACK,GAClD,CAAC,UAAU,EAAE,kBAAkB,KAAK,eAAe,CAIrD"}

package/dist/src/libp2p.js

@@ -0,0 +1,59 @@
+import { keychain as libp2pKeyChain, } from "@libp2p/keychain";
+import { createStore } from "@peerbit/any-store";
+import { DefaultCryptoKeychain } from "./crypto.js";
+export class PeerbitKeychain {
+    libp2p;
+    crypto;
+    constructor(components, init) {
+        this.libp2p = libp2pKeyChain(init.libp2p)(components);
+        this.crypto =
+            init.crypto instanceof DefaultCryptoKeychain
+                ? init.crypto
+                : new DefaultCryptoKeychain({ store: createStore() });
+    }
+    import(parameters) {
+        return this.crypto.import(parameters);
+    }
+    exportByKey(publicKey) {
+        return this.crypto.exportByKey(publicKey);
+    }
+    exportById(id, type) {
+        return this.crypto.exportById(id, type);
+    }
+    findKeyByName(name) {
+        return this.libp2p.findKeyByName(name);
+    }
+    findKeyById(id) {
+        return this.libp2p.findKeyById(id);
+    }
+    importKey(name, key) {
+        return this.libp2p.importKey(name, key);
+    }
+    exportKey(name) {
+        return this.libp2p.exportKey(name);
+    }
+    removeKey(name) {
+        return this.libp2p.removeKey(name);
+    }
+    renameKey(oldName, newName) {
+        return this.libp2p.renameKey(oldName, newName);
+    }
+    listKeys() {
+        return this.libp2p.listKeys();
+    }
+    rotateKeychainPass(oldPass, newPass) {
+        return this.libp2p.rotateKeychainPass(oldPass, newPass);
+    }
+    async start() {
+        await this.crypto.start();
+    }
+    async stop() {
+        await this.crypto.stop();
+    }
+}
+export function keychain(init = { libp2p: {}, crypto: { store: createStore() } }) {
+    return (components) => {
+        return new PeerbitKeychain(components, init);
+    };
+}
+//# sourceMappingURL=libp2p.js.map

package/dist/src/libp2p.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"libp2p.js","sourceRoot":"","sources":["../../src/libp2p.ts"],"names":[],"mappings":"AAEA,OAAO,EAKN,QAAQ,IAAI,cAAc,GAC1B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAiB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAYhE,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAQpD,MAAM,OAAO,eAAe;IACnB,MAAM,CAAkB;IACxB,MAAM,CAAiB;IAE/B,YACC,UAA8B,EAC9B,IAGC;QAED,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM;YACV,IAAI,CAAC,MAAM,YAAY,qBAAqB;gBAC3C,CAAC,CAAC,IAAI,CAAC,MAAM;gBACb,CAAC,CAAC,IAAI,qBAAqB,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,CACL,UAAoE;QAEpE,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;IACD,WAAW,CAQT,SAAY;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC3C,CAAC;IACD,UAAU,CAER,EAAc,EAAE,IAAoB;QACrC,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IACD,aAAa,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IACD,WAAW,CAAC,EAAU;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC;IACD,SAAS,CAAC,IAAY,EAAE,GAAe;QACtC,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC;IACD,SAAS,CAAC,IAAY;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IACD,SAAS,CAAC,IAAY;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IACD,SAAS,CAAC,OAAe,EAAE,OAAe;QACzC,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IACD,QAAQ;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IACD,kBAAkB,CAAC,OAAe,EAAE,OAAe;QAClD,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IACD,KAAK,CAAC,KAAK;QACV,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IACD,KAAK,CAAC,IAAI;QACT,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;CACD;AAED,MAAM,UAAU,QAAQ,CACvB,OAGI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE;IAEpD,OAAO,CAAC,UAA8B,EAAE,EAAE;QACzC,OAAO,IAAI,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC;AACH,CAAC"}

package/package.json

@@ -1,63 +1,64 @@
 {
-	"name": "@peerbit/keychain",
-	"version": "1.0.32",
-	"description": "Utility functions for keychain",
-	"sideEffects": false,
-	"type": "module",
-	"types": "./dist/src/index.d.ts",
-	"typesVersions": {
-		"*": {
-			"*": [
-				"*",
-				"dist/*",
-				"dist/src/*",
-				"dist/src/*/index"
-			],
-			"src/*": [
-				"*",
-				"dist/*",
-				"dist/src/*",
-				"dist/src/*/index"
-			]
-		}
-	},
-	"files": [
-		"src",
-		"dist",
-		"!dist/test",
-		"!**/*.tsbuildinfo"
-	],
-	"exports": {
-		".": {
-			"types": "./dist/src/index.d.ts",
-			"import": "./dist/src/index.js"
-		}
-	},
-	"eslintConfig": {
-		"extends": "peerbit",
-		"parserOptions": {
-			"project": true,
-			"sourceType": "module"
-		},
-		"ignorePatterns": [
-			"!.aegir.js",
-			"test/ts-use",
-			"*.d.ts"
-		]
-	},
-	"publishConfig": {
-		"access": "public"
-	},
-	"scripts": {
-		"clean": "aegir clean",
-		"build": "aegir build  --no-bundle",
-		"test": "aegir test",
-		"lint": "aegir lint"
-	},
-	"author": "dao.xyz",
-	"license": "MIT",
-	"dependencies": {
-		"@peerbit/crypto": "^2.3.11",
-		"@peerbit/any-store": "^2.1.14"
-	}
+  "name": "@peerbit/keychain",
+  "version": "1.1.0-0fddff8",
+  "description": "Utility functions for keychain",
+  "sideEffects": false,
+  "type": "module",
+  "types": "./dist/src/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "*": [
+        "*",
+        "dist/*",
+        "dist/src/*",
+        "dist/src/*/index"
+      ],
+      "src/*": [
+        "*",
+        "dist/*",
+        "dist/src/*",
+        "dist/src/*/index"
+      ]
+    }
+  },
+  "files": [
+    "src",
+    "dist",
+    "!dist/test",
+    "!**/*.tsbuildinfo"
+  ],
+  "exports": {
+    ".": {
+      "types": "./dist/src/index.d.ts",
+      "import": "./dist/src/index.js"
+    }
+  },
+  "eslintConfig": {
+    "extends": "peerbit",
+    "parserOptions": {
+      "project": true,
+      "sourceType": "module"
+    },
+    "ignorePatterns": [
+      "!.aegir.js",
+      "test/ts-use",
+      "*.d.ts"
+    ]
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "clean": "aegir clean",
+    "build": "aegir build  --no-bundle",
+    "test": "aegir test",
+    "lint": "aegir lint"
+  },
+  "author": "dao.xyz",
+  "license": "MIT",
+  "dependencies": {
+    "@peerbit/crypto": "2.3.11-0fddff8",
+    "@peerbit/any-store": "2.1.14-0fddff8",
+    "@libp2p/keychain": "^5.2.9"
+  }
 }

package/src/crypto.ts

@@ -0,0 +1,98 @@
+import { type Constructor, deserialize, serialize } from "@dao-xyz/borsh";
+import { type AnyStore } from "@peerbit/any-store";
+import { createStore } from "@peerbit/any-store";
+import {
+	type ByteKey,
+	Ed25519Keypair,
+	type Ed25519PublicKey,
+	Keypair,
+	type PublicKeyEncryptionKey,
+	type PublicSignKey,
+	type Secp256k1Keypair,
+	type Secp256k1PublicKey,
+	X25519Keypair,
+	type X25519PublicKey,
+	toBase64,
+} from "@peerbit/crypto";
+import {
+	type CryptoKeychain,
+	type KeyParameters,
+	type KeypairFromPublicKey,
+	type KeypairParameters,
+} from "./interface.js";
+
+export class DefaultCryptoKeychain implements CryptoKeychain {
+	constructor(
+		readonly properties: { store: AnyStore } = { store: createStore() },
+	) {}
+
+	async import(
+		parameters: (KeypairParameters | KeyParameters) & { id?: Uint8Array },
+	): Promise<void> {
+		let bytes: Uint8Array;
+		let publicKey: Uint8Array | undefined;
+		if ((parameters as KeypairParameters).keypair) {
+			const kp = (parameters as KeypairParameters).keypair;
+			bytes = serialize(kp);
+			publicKey = serialize(kp.publicKey);
+
+			if (kp instanceof Ed25519Keypair) {
+				// also import as X25519Keypair for convenience
+				const xkp = await X25519Keypair.from(kp);
+				await this.import({ keypair: xkp });
+			}
+		} else {
+			bytes = serialize((parameters as KeyParameters).key);
+		}
+
+		if (parameters.id) {
+			await this.properties.store.put(toBase64(parameters.id), bytes);
+		}
+
+		if (publicKey) {
+			await this.properties.store.put(toBase64(publicKey), bytes);
+		}
+	}
+	async exportByKey<
+		T extends
+			| X25519PublicKey
+			| Ed25519PublicKey
+			| Secp256k1PublicKey
+			| PublicSignKey
+			| PublicKeyEncryptionKey,
+		Q = KeypairFromPublicKey<T>,
+	>(publicKey: T): Promise<Q | undefined> {
+		const key = await this.properties.store.get(toBase64(serialize(publicKey)));
+		if (key) {
+			return deserialize(key, Keypair) as Q;
+		}
+		return undefined;
+	}
+
+	async exportById<
+		T = Ed25519Keypair | Secp256k1Keypair | X25519Keypair | ByteKey,
+	>(id: Uint8Array, type: Constructor<T>): Promise<T | undefined> {
+		const key = await this.properties.store.get(toBase64(id));
+		if (key) {
+			const maybeConvert = (type as any) === X25519Keypair;
+			const exported = deserialize(
+				key,
+				maybeConvert ? (Keypair as Constructor<T>) : type,
+			);
+
+			if (maybeConvert && exported instanceof Ed25519Keypair) {
+				return X25519Keypair.from(exported) as T;
+			}
+			return exported as T;
+		}
+		return undefined;
+	}
+
+	async start() {
+		await this.properties.store.open();
+	}
+
+	async stop() {
+		await this.properties.store.close();
+	}
+}

package/src/index.ts

@@ -1,108 +1,3 @@
-import { type Constructor, deserialize, serialize } from "@dao-xyz/borsh";
-import { type AnyStore } from "@peerbit/any-store";
-import { createStore } from "@peerbit/any-store";
-import {
-	type ByteKey,
-	Ed25519Keypair,
-	type Ed25519PublicKey,
-	Keypair,
-	type PublicKeyEncryptionKey,
-	type PublicSignKey,
-	type Secp256k1Keypair,
-	type Secp256k1PublicKey,
-	X25519Keypair,
-	type X25519PublicKey,
-	toBase64,
-} from "@peerbit/crypto";
-import {
-	type KeyParameters,
-	type Keychain,
-	type KeypairParameters,
-} from "./interface.js";
-
-export type { Keychain };
-
-export type KeypairFromPublicKey<T> = T extends X25519PublicKey
-	? X25519Keypair
-	: T extends Ed25519PublicKey
-		? Ed25519Keypair
-		: T extends Secp256k1PublicKey
-			? Secp256k1Keypair
-			: T extends PublicSignKey | PublicKeyEncryptionKey
-				? Keypair
-				: never;
-
-export class DefaultKeychain implements Keychain {
-	constructor(
-		readonly properties: { store: AnyStore } = { store: createStore() },
-	) {}
-	async import(
-		parameters: (KeypairParameters | KeyParameters) & { id?: Uint8Array },
-	): Promise<void> {
-		let bytes: Uint8Array;
-		let publicKey: Uint8Array | undefined;
-		if ((parameters as KeypairParameters).keypair) {
-			const kp = (parameters as KeypairParameters).keypair;
-			bytes = serialize(kp);
-			publicKey = serialize(kp.publicKey);
-
-			if (kp instanceof Ed25519Keypair) {
-				// also import as X25519Keypair for convenience
-				const xkp = await X25519Keypair.from(kp);
-				await this.import({ keypair: xkp });
-			}
-		} else {
-			bytes = serialize((parameters as KeyParameters).key);
-		}
-
-		if (parameters.id) {
-			await this.properties.store.put(toBase64(parameters.id), bytes);
-		}
-
-		if (publicKey) {
-			await this.properties.store.put(toBase64(publicKey), bytes);
-		}
-	}
-	async exportByKey<
-		T extends
-			| X25519PublicKey
-			| Ed25519PublicKey
-			| Secp256k1PublicKey
-			| PublicSignKey
-			| PublicKeyEncryptionKey,
-		Q = KeypairFromPublicKey<T>,
-	>(publicKey: T): Promise<Q | undefined> {
-		const key = await this.properties.store.get(toBase64(serialize(publicKey)));
-		if (key) {
-			return deserialize(key, Keypair) as Q;
-		}
-		return undefined;
-	}
-
-	async exportById<
-		T = Ed25519Keypair | Secp256k1Keypair | X25519Keypair | ByteKey,
-	>(id: Uint8Array, type: Constructor<T>): Promise<T | undefined> {
-		const key = await this.properties.store.get(toBase64(id));
-		if (key) {
-			const maybeConvert = (type as any) === X25519Keypair;
-			const exported = deserialize(
-				key,
-				maybeConvert ? (Keypair as Constructor<T>) : type,
-			);
-
-			if (maybeConvert && exported instanceof Ed25519Keypair) {
-				return X25519Keypair.from(exported) as T;
-			}
-			return exported as T;
-		}
-		return undefined;
-	}
-
-	async start() {
-		await this.properties.store.open();
-	}
-
-	async stop() {
-		await this.properties.store.close();
-	}
-}
+export * from "./crypto.js";
+export * from "./interface.js";
+export * from "./libp2p.js";

package/src/interface.ts

@@ -1,4 +1,5 @@
 import { type AbstractType } from "@dao-xyz/borsh";
+import { type Keychain as ILibp2pKeychain } from "@libp2p/keychain";
 import type {
 	ByteKey,
 	Ed25519Keypair,
@@ -27,7 +28,7 @@ export type KeypairParameters = {
 };
 export type KeyParameters = { key: ByteKey };
 
-export interface Keychain {
+export interface CryptoKeychain {
 	// Add a key to the keychain.
 	import(
 		parameters: (KeypairParameters | KeyParameters) & { id: Uint8Array },
@@ -55,4 +56,9 @@ export interface Keychain {
 		id: Uint8Array,
 		type: AbstractType<T>,
 	): Promise<T | undefined>;
+
+	start(): Promise<void>;
+	stop(): Promise<void>;
 }
+
+export type IPeerbitKeychain = CryptoKeychain & ILibp2pKeychain;

package/src/libp2p.ts

@@ -0,0 +1,109 @@
+import type { Constructor } from "@dao-xyz/borsh";
+import type { PrivateKey } from "@libp2p/interface";
+import {
+	type Keychain as ILibp2pKeychain,
+	type KeyInfo,
+	type KeychainComponents,
+	type KeychainInit,
+	keychain as libp2pKeyChain,
+} from "@libp2p/keychain";
+import { type AnyStore, createStore } from "@peerbit/any-store";
+import type {
+	ByteKey,
+	Ed25519Keypair,
+	Ed25519PublicKey,
+	PublicKeyEncryptionKey,
+	PublicSignKey,
+	Secp256k1Keypair,
+	Secp256k1PublicKey,
+	X25519Keypair,
+	X25519PublicKey,
+} from "@peerbit/crypto/dist/src";
+import { DefaultCryptoKeychain } from "./crypto.js";
+import type {
+	CryptoKeychain,
+	KeyParameters,
+	KeypairFromPublicKey,
+	KeypairParameters,
+} from "./interface.js";
+
+export class PeerbitKeychain implements CryptoKeychain, ILibp2pKeychain {
+	private libp2p: ILibp2pKeychain;
+	private crypto: CryptoKeychain;
+
+	constructor(
+		components: KeychainComponents,
+		init: {
+			libp2p?: KeychainInit;
+			crypto?: { store: AnyStore } | CryptoKeychain;
+		},
+	) {
+		this.libp2p = libp2pKeyChain(init.libp2p)(components);
+		this.crypto =
+			init.crypto instanceof DefaultCryptoKeychain
+				? init.crypto
+				: new DefaultCryptoKeychain({ store: createStore() });
+	}
+	import(
+		parameters: (KeypairParameters | KeyParameters) & { id: Uint8Array },
+	): Promise<void> {
+		return this.crypto.import(parameters);
+	}
+	exportByKey<
+		T extends
+			| Ed25519PublicKey
+			| X25519PublicKey
+			| Secp256k1PublicKey
+			| PublicSignKey
+			| PublicKeyEncryptionKey,
+		Q = KeypairFromPublicKey<T>,
+	>(publicKey: T): Promise<Q | undefined> {
+		return this.crypto.exportByKey(publicKey);
+	}
+	exportById<
+		T extends Ed25519Keypair | Secp256k1Keypair | X25519Keypair | ByteKey,
+	>(id: Uint8Array, type: Constructor<T>): Promise<T | undefined> {
+		return this.crypto.exportById(id, type);
+	}
+	findKeyByName(name: string): Promise<KeyInfo> {
+		return this.libp2p.findKeyByName(name);
+	}
+	findKeyById(id: string): Promise<KeyInfo> {
+		return this.libp2p.findKeyById(id);
+	}
+	importKey(name: string, key: PrivateKey): Promise<KeyInfo> {
+		return this.libp2p.importKey(name, key);
+	}
+	exportKey(name: string): Promise<PrivateKey> {
+		return this.libp2p.exportKey(name);
+	}
+	removeKey(name: string): Promise<KeyInfo> {
+		return this.libp2p.removeKey(name);
+	}
+	renameKey(oldName: string, newName: string): Promise<KeyInfo> {
+		return this.libp2p.renameKey(oldName, newName);
+	}
+	listKeys(): Promise<KeyInfo[]> {
+		return this.libp2p.listKeys();
+	}
+	rotateKeychainPass(oldPass: string, newPass: string): Promise<void> {
+		return this.libp2p.rotateKeychainPass(oldPass, newPass);
+	}
+	async start(): Promise<void> {
+		await this.crypto.start();
+	}
+	async stop(): Promise<void> {
+		await this.crypto.stop();
+	}
+}
+
+export function keychain(
+	init: {
+		libp2p: KeychainInit;
+		crypto?: CryptoKeychain | { store: AnyStore };
+	} = { libp2p: {}, crypto: { store: createStore() } },
+): (components: KeychainComponents) => PeerbitKeychain {
+	return (components: KeychainComponents) => {
+		return new PeerbitKeychain(components, init);
+	};
+}