@waku/rln 0.1.1-fa49e29 → 0.1.2-126bce3

package/dist/codec.d.ts

@@ -1,6 +1,7 @@
 import type { IDecodedMessage, IDecoder, IEncoder, IMessage, IProtoMessage } from "@waku/interfaces";
+import type { IdentityCredential } from "./identity.js";
 import { RlnMessage } from "./message.js";
-import { IdentityCredential, RLNInstance } from "./rln.js";
+import { RLNInstance } from "./rln.js";
 export declare class RLNEncoder implements IEncoder {
     private encoder;
     private rlnInstance;
@@ -10,10 +11,11 @@ export declare class RLNEncoder implements IEncoder {
     toWire(message: IMessage): Promise<Uint8Array | undefined>;
     toProtoObj(message: IMessage): Promise<IProtoMessage | undefined>;
     private generateProof;
+    get pubsubTopic(): string;
     get contentTopic(): string;
     get ephemeral(): boolean;
 }
-declare type RLNEncoderOptions = {
+type RLNEncoderOptions = {
     encoder: IEncoder;
     rlnInstance: RLNInstance;
     index: number;
@@ -24,11 +26,12 @@ export declare class RLNDecoder<T extends IDecodedMessage> implements IDecoder<R
     private rlnInstance;
     private decoder;
     constructor(rlnInstance: RLNInstance, decoder: IDecoder<T>);
+    get pubsubTopic(): string;
     get contentTopic(): string;
     fromWireToProtoObj(bytes: Uint8Array): Promise<IProtoMessage | undefined>;
-    fromProtoObj(pubSubTopic: string, proto: IProtoMessage): Promise<RlnMessage<T> | undefined>;
+    fromProtoObj(pubsubTopic: string, proto: IProtoMessage): Promise<RlnMessage<T> | undefined>;
 }
-declare type RLNDecoderOptions<T extends IDecodedMessage> = {
+type RLNDecoderOptions<T extends IDecodedMessage> = {
     decoder: IDecoder<T>;
     rlnInstance: RLNInstance;
 };

package/dist/codec.js

@@ -2,6 +2,10 @@ import debug from "debug";
 import { RlnMessage, toRLNSignal } from "./message.js";
 const log = debug("waku:rln:encoder");
 export class RLNEncoder {
+    encoder;
+    rlnInstance;
+    index;
+    idSecretHash;
     constructor(encoder, rlnInstance, index, identityCredential) {
         this.encoder = encoder;
         this.rlnInstance = rlnInstance;
@@ -26,11 +30,12 @@ export class RLNEncoder {
     }
     async generateProof(message) {
         const signal = toRLNSignal(this.contentTopic, message);
-        console.time("proof_gen_timer");
-        const proof = await this.rlnInstance.generateRLNProof(signal, this.index, message.timestamp, this.idSecretHash);
-        console.timeEnd("proof_gen_timer");
+        const proof = await this.rlnInstance.zerokit.generateRLNProof(signal, this.index, message.timestamp, this.idSecretHash);
         return proof;
     }
+    get pubsubTopic() {
+        return this.encoder.pubsubTopic;
+    }
     get contentTopic() {
         return this.encoder.contentTopic;
     }
@@ -42,10 +47,15 @@ export const createRLNEncoder = (options) => {
     return new RLNEncoder(options.encoder, options.rlnInstance, options.index, options.credential);
 };
 export class RLNDecoder {
+    rlnInstance;
+    decoder;
     constructor(rlnInstance, decoder) {
         this.rlnInstance = rlnInstance;
         this.decoder = decoder;
     }
+    get pubsubTopic() {
+        return this.decoder.pubsubTopic;
+    }
     get contentTopic() {
         return this.decoder.contentTopic;
     }
@@ -54,8 +64,8 @@ export class RLNDecoder {
         log("Message decoded", protoMessage);
         return Promise.resolve(protoMessage);
     }
-    async fromProtoObj(pubSubTopic, proto) {
-        const msg = await this.decoder.fromProtoObj(pubSubTopic, proto);
+    async fromProtoObj(pubsubTopic, proto) {
+        const msg = await this.decoder.fromProtoObj(pubsubTopic, proto);
         if (!msg)
             return;
         return new RlnMessage(this.rlnInstance, msg, proto.rateLimitProof);

package/dist/codec.js.map

@@ -1 +1 @@
-{"version":3,"file":"codec.js","sourceRoot":"","sources":["../src/codec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codec.js","sourceRoot":"","sources":["../src/codec.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGvD,MAAM,GAAG,GAAG,KAAK,CAAC,kBAAkB,CAAC,CAAC;AAEtC,MAAM,OAAO,UAAU;IAIX;IACA;IACA;IALO,YAAY,CAAa;IAE1C,YACU,OAAiB,EACjB,WAAwB,EACxB,KAAa,EACrB,kBAAsC;QAH9B,YAAO,GAAP,OAAO,CAAU;QACjB,gBAAW,GAAX,WAAW,CAAa;QACxB,UAAK,GAAL,KAAK,CAAQ;QAGrB,IAAI,KAAK,GAAG,CAAC;YAAE,MAAM,0BAA0B,CAAC;QAChD,IAAI,CAAC,YAAY,GAAG,kBAAkB,CAAC,YAAY,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAiB;QAC5B,OAAO,CAAC,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC3D,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAiB;QAChC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,YAAY;YAAE,OAAO;QAE1B,YAAY,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAC9C,YAAY,CAAC,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAChE,GAAG,CAAC,iBAAiB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;QACpD,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,OAAiB;QAC3C,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,CAC3D,MAAM,EACN,IAAI,CAAC,KAAK,EACV,OAAO,CAAC,SAAS,EACjB,IAAI,CAAC,YAAY,CAClB,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IAClC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;IACnC,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IAChC,CAAC;CACF;AASD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAA0B,EAAc,EAAE;IACzE,OAAO,IAAI,UAAU,CACnB,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,UAAU,CACnB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,OAAO,UAAU;IAIX;IACA;IAFV,YACU,WAAwB,EACxB,OAAoB;QADpB,gBAAW,GAAX,WAAW,CAAa;QACxB,YAAO,GAAP,OAAO,CAAa;IAC3B,CAAC;IAEJ,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IAClC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;IACnC,CAAC;IAED,kBAAkB,CAAC,KAAiB;QAClC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAC5D,GAAG,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;QACrC,OAAO,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,WAAmB,EACnB,KAAoB;QAEpB,MAAM,GAAG,GAAkB,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CACxD,WAAW,EACX,KAAK,CACN,CAAC;QACF,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACrE,CAAC;CACF;AAOD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,OAA6B,EACd,EAAE;IACjB,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAC"}

package/dist/{constants.js → contract/constants.js}

@@ -26,7 +26,7 @@ export const RLN_REGISTRY_ABI = [
     "function transferOwnership(address newOwner)",
     "function upgradeTo(address newImplementation)",
     "function upgradeToAndCall(address newImplementation, bytes data) payable",
-    "function usingStorageIndex() view returns (uint16)",
+    "function usingStorageIndex() view returns (uint16)"
 ];
 // ref https://github.com/waku-org/waku-rln-contract/blob/19fded82bca07e7b535b429dc507cfb83f10dfcf/deployments/sepolia/WakuRlnStorage_0.json#L3
 export const RLN_STORAGE_ABI = [
@@ -57,11 +57,11 @@ export const RLN_STORAGE_ABI = [
     "function transferOwnership(address newOwner)",
     "function verifier() view returns (address)",
     "function withdraw() pure",
-    "function withdrawalBalance(address) view returns (uint256)",
+    "function withdrawalBalance(address) view returns (uint256)"
 ];
 export const SEPOLIA_CONTRACT = {
     chainId: 11155111,
     address: "0xF471d71E9b1455bBF4b85d475afb9BB0954A29c4",
-    abi: RLN_REGISTRY_ABI,
+    abi: RLN_REGISTRY_ABI
 };
 //# sourceMappingURL=constants.js.map

package/dist/contract/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/contract/constants.ts"],"names":[],"mappings":"AAAA,6JAA6J;AAC7J,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,6BAA6B;IAC7B,kCAAkC;IAClC,oCAAoC;IACpC,oDAAoD;IACpD,6DAA6D;IAC7D,8CAA8C;IAC9C,kCAAkC;IAClC,gEAAgE;IAChE,qFAAqF;IACrF,gDAAgD;IAChD,0BAA0B;IAC1B,8CAA8C;IAC9C,uBAAuB;IACvB,mDAAmD;IACnD,yCAAyC;IACzC,kDAAkD;IAClD,iDAAiD;IACjD,4DAA4D;IAC5D,0CAA0C;IAC1C,+DAA+D;IAC/D,kDAAkD;IAClD,8BAA8B;IAC9B,kDAAkD;IAClD,8CAA8C;IAC9C,+CAA+C;IAC/C,0EAA0E;IAC1E,oDAAoD;CACrD,CAAC;AAEF,+IAA+I;AAC/I,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,6DAA6D;IAC7D,+BAA+B;IAC/B,kBAAkB;IAClB,iDAAiD;IACjD,wBAAwB;IACxB,6DAA6D;IAC7D,4DAA4D;IAC5D,qFAAqF;IACrF,yCAAyC;IACzC,sDAAsD;IACtD,4CAA4C;IAC5C,gDAAgD;IAChD,sDAAsD;IACtD,qDAAqD;IACrD,sEAAsE;IACtE,oDAAoD;IACpD,kDAAkD;IAClD,yCAAyC;IACzC,kDAAkD;IAClD,4CAA4C;IAC5C,iDAAiD;IACjD,8BAA8B;IAC9B,+EAA+E;IAC/E,wDAAwD;IACxD,8CAA8C;IAC9C,4CAA4C;IAC5C,0BAA0B;IAC1B,4DAA4D;CAC7D,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,4CAA4C;IACrD,GAAG,EAAE,gBAAgB;CACtB,CAAC"}

package/dist/contract/index.d.ts

@@ -0,0 +1,2 @@
+export { RLNContract } from "./rln_contract.js";
+export * from "./constants.js";

package/dist/contract/index.js

@@ -0,0 +1,3 @@
+export { RLNContract } from "./rln_contract.js";
+export * from "./constants.js";
+//# sourceMappingURL=index.js.map

package/dist/contract/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/contract/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,cAAc,gBAAgB,CAAC"}

package/dist/{rln_contract.d.ts → contract/rln_contract.d.ts}

@@ -1,19 +1,21 @@
 import { ethers } from "ethers";
-import { IdentityCredential, RLNInstance } from "./rln.js";
-declare type Member = {
+import type { IdentityCredential } from "../identity.js";
+import type { DecryptedCredentials } from "../keystore/index.js";
+import type { RLNInstance } from "../rln.js";
+type Member = {
     idCommitment: string;
     index: ethers.BigNumber;
 };
-declare type Provider = ethers.Signer | ethers.providers.Provider;
-declare type RLNContractOptions = {
-    provider: Provider;
+type Signer = ethers.Signer;
+type RLNContractOptions = {
+    signer: Signer;
     registryAddress: string;
 };
-declare type RLNStorageOptions = {
+type RLNStorageOptions = {
     storageIndex?: number;
 };
-declare type RLNContractInitOptions = RLNContractOptions & RLNStorageOptions;
-declare type FetchMembersOptions = {
+type RLNContractInitOptions = RLNContractOptions & RLNStorageOptions;
+type FetchMembersOptions = {
     fromBlock?: number;
     fetchRange?: number;
     fetchChunks?: number;
@@ -27,8 +29,9 @@ export declare class RLNContract {
     private _membersFilter;
     private _members;
     static init(rlnInstance: RLNInstance, options: RLNContractInitOptions): Promise<RLNContract>;
-    constructor(rlnInstance: RLNInstance, { registryAddress, provider }: RLNContractOptions);
+    constructor(rlnInstance: RLNInstance, { registryAddress, signer }: RLNContractOptions);
     private initStorageContract;
+    get registry(): ethers.Contract;
     get contract(): ethers.Contract;
     get members(): Member[];
     private get membersFilter();
@@ -37,8 +40,7 @@ export declare class RLNContract {
     private insertMembers;
     private removeMembers;
     subscribeToMembers(rlnInstance: RLNInstance): void;
-    registerWithSignature(rlnInstance: RLNInstance, signature: string): Promise<Member | undefined>;
-    registerWithKey(credential: IdentityCredential): Promise<Member | undefined>;
+    registerWithIdentity(identity: IdentityCredential): Promise<DecryptedCredentials | undefined>;
     roots(): Uint8Array[];
 }
 export {};

package/dist/{rln_contract.js → contract/rln_contract.js}

@@ -1,21 +1,31 @@
+import { hexToBytes } from "@waku/utils/bytes";
+import debug from "debug";
 import { ethers } from "ethers";
+import { MerkleRootTracker } from "../root_tracker.js";
+import { zeroPadLE } from "../utils/index.js";
 import { RLN_REGISTRY_ABI, RLN_STORAGE_ABI } from "./constants.js";
-import { MerkleRootTracker } from "./root_tracker.js";
+const log = debug("waku:rln:contract");
 export class RLNContract {
-    constructor(rlnInstance, { registryAddress, provider }) {
-        this._members = new Map();
-        const initialRoot = rlnInstance.getMerkleRoot();
-        this.registryContract = new ethers.Contract(registryAddress, RLN_REGISTRY_ABI, provider);
-        this.merkleRootTracker = new MerkleRootTracker(5, initialRoot);
-    }
+    registryContract;
+    merkleRootTracker;
+    deployBlock;
+    storageIndex;
+    storageContract;
+    _membersFilter;
+    _members = new Map();
     static async init(rlnInstance, options) {
         const rlnContract = new RLNContract(rlnInstance, options);
-        await rlnContract.initStorageContract(options.provider);
+        await rlnContract.initStorageContract(options.signer);
         await rlnContract.fetchMembers(rlnInstance);
         rlnContract.subscribeToMembers(rlnInstance);
         return rlnContract;
     }
-    async initStorageContract(provider, options = {}) {
+    constructor(rlnInstance, { registryAddress, signer }) {
+        const initialRoot = rlnInstance.zerokit.getMerkleRoot();
+        this.registryContract = new ethers.Contract(registryAddress, RLN_REGISTRY_ABI, signer);
+        this.merkleRootTracker = new MerkleRootTracker(5, initialRoot);
+    }
+    async initStorageContract(signer, options = {}) {
         const storageIndex = options?.storageIndex
             ? options.storageIndex
             : await this.registryContract.usingStorageIndex();
@@ -24,10 +34,16 @@ export class RLNContract {
             throw Error("No RLN Storage initialized on registry contract.");
         }
         this.storageIndex = storageIndex;
-        this.storageContract = new ethers.Contract(storageAddress, RLN_STORAGE_ABI, provider);
+        this.storageContract = new ethers.Contract(storageAddress, RLN_STORAGE_ABI, signer);
         this._membersFilter = this.storageContract.filters.MemberRegistered();
         this.deployBlock = await this.storageContract.deployedBlockNumber();
     }
+    get registry() {
+        if (!this.registryContract) {
+            throw Error("Registry contract was not initialized");
+        }
+        return this.registryContract;
+    }
     get contract() {
         if (!this.storageContract) {
             throw Error("Storage contract was not initialized");
@@ -48,7 +64,7 @@ export class RLNContract {
         const registeredMemberEvents = await queryFilter(this.contract, {
             fromBlock: this.deployBlock,
             ...options,
-            membersFilter: this.membersFilter,
+            membersFilter: this.membersFilter
         });
         this.processEvents(rlnInstance, registeredMemberEvents);
     }
@@ -78,9 +94,9 @@ export class RLNContract {
                 eventsPerBlock.push(evt);
                 toInsertTable.set(evt.blockNumber, eventsPerBlock);
             }
-            this.removeMembers(rlnInstance, toRemoveTable);
-            this.insertMembers(rlnInstance, toInsertTable);
         });
+        this.removeMembers(rlnInstance, toRemoveTable);
+        this.insertMembers(rlnInstance, toInsertTable);
     }
     insertMembers(rlnInstance, toInsert) {
         toInsert.forEach((events, blockNumber) => {
@@ -90,14 +106,14 @@ export class RLNContract {
                 if (!_idCommitment || !index) {
                     return;
                 }
-                const idCommitment = ethers.utils.zeroPad(ethers.utils.arrayify(_idCommitment), 32);
-                rlnInstance.insertMember(idCommitment);
+                const idCommitment = zeroPadLE(hexToBytes(_idCommitment?._hex), 32);
+                rlnInstance.zerokit.insertMember(idCommitment);
                 this._members.set(index.toNumber(), {
                     index,
-                    idCommitment: _idCommitment?._hex || ethers.utils.hexlify(idCommitment),
+                    idCommitment: _idCommitment?._hex
                 });
             });
-            const currentRoot = rlnInstance.getMerkleRoot();
+            const currentRoot = rlnInstance.zerokit.getMerkleRoot();
             this.merkleRootTracker.pushRoot(blockNumber, currentRoot);
         });
     }
@@ -107,8 +123,8 @@ export class RLNContract {
             indexes.forEach((index) => {
                 if (this._members.has(index)) {
                     this._members.delete(index);
+                    rlnInstance.zerokit.deleteMember(index);
                 }
-                rlnInstance.deleteMember(index);
             });
             this.merkleRootTracker.backFill(blockNumber);
         });
@@ -116,15 +132,11 @@ export class RLNContract {
     subscribeToMembers(rlnInstance) {
         this.contract.on(this.membersFilter, (_pubkey, _index, event) => this.processEvents(rlnInstance, [event]));
     }
-    async registerWithSignature(rlnInstance, signature) {
-        const identityCredential = await rlnInstance.generateSeededIdentityCredential(signature);
-        return this.registerWithKey(identityCredential);
-    }
-    async registerWithKey(credential) {
+    async registerWithIdentity(identity) {
         if (this.storageIndex === undefined) {
             throw Error("Cannot register credential, no storage contract index found.");
         }
-        const txRegisterResponse = await this.registryContract["register(uint16,uint256)"](this.storageIndex, credential.IDCommitmentBigInt, { gasLimit: 100000 });
+        const txRegisterResponse = await this.registryContract["register(uint16,uint256)"](this.storageIndex, identity.IDCommitmentBigInt, { gasLimit: 100000 });
         const txRegisterReceipt = await txRegisterResponse.wait();
         // assumption: register(uint16,uint256) emits one event
         const memberRegistered = txRegisterReceipt?.events?.[0];
@@ -132,9 +144,16 @@ export class RLNContract {
             return undefined;
         }
         const decodedData = this.contract.interface.decodeEventLog("MemberRegistered", memberRegistered.data);
+        const network = await this.registryContract.provider.getNetwork();
+        const address = this.registryContract.address;
+        const membershipId = decodedData.index.toNumber();
         return {
-            idCommitment: decodedData.idCommitment,
-            index: decodedData.index,
+            identity,
+            membership: {
+                address,
+                treeIndex: membershipId,
+                chainId: network.chainId
+            }
         };
     }
     roots() {
@@ -145,7 +164,7 @@ export class RLNContract {
 const FETCH_CHUNK = 5;
 const BLOCK_RANGE = 3000;
 async function queryFilter(contract, options) {
-    const { fromBlock, membersFilter, fetchRange = BLOCK_RANGE, fetchChunks = FETCH_CHUNK, } = options;
+    const { fromBlock, membersFilter, fetchRange = BLOCK_RANGE, fetchChunks = FETCH_CHUNK } = options;
     if (!fromBlock) {
         return contract.queryFilter(membersFilter);
     }
@@ -177,17 +196,15 @@ function splitToChunks(from, to, step) {
 }
 function* takeN(array, size) {
     let start = 0;
-    let skip = size;
-    while (skip < array.length) {
-        const portion = array.slice(start, skip);
+    while (start < array.length) {
+        const portion = array.slice(start, start + size);
         yield portion;
-        start = skip;
-        skip += size;
+        start += size;
     }
 }
 function ignoreErrors(promise, defaultValue) {
     return promise.catch((err) => {
-        console.error(`Ignoring an error during query: ${err?.message}`);
+        log(`Ignoring an error during query: ${err?.message}`);
         return defaultValue;
     });
 }

package/dist/contract/rln_contract.js.map

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

package/dist/create.d.ts

@@ -0,0 +1,2 @@
+import type { RLNInstance } from "./rln.js";
+export declare function createRLN(): Promise<RLNInstance>;

package/dist/create.js

@@ -0,0 +1,8 @@
+export async function createRLN() {
+    // A dependency graph that contains any wasm must all be imported
+    // asynchronously. This file does the single async import, so
+    // that no one else needs to worry about it again.
+    const rlnModule = await import("./rln.js");
+    return rlnModule.create();
+}
+//# sourceMappingURL=create.js.map

package/dist/create.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../src/create.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,SAAS;IAC7B,iEAAiE;IACjE,6DAA6D;IAC7D,kDAAkD;IAClD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;IAC3C,OAAO,SAAS,CAAC,MAAM,EAAE,CAAC;AAC5B,CAAC"}

package/dist/identity.d.ts

@@ -0,0 +1,9 @@
+export declare class IdentityCredential {
+    readonly IDTrapdoor: Uint8Array;
+    readonly IDNullifier: Uint8Array;
+    readonly IDSecretHash: Uint8Array;
+    readonly IDCommitment: Uint8Array;
+    readonly IDCommitmentBigInt: bigint;
+    constructor(IDTrapdoor: Uint8Array, IDNullifier: Uint8Array, IDSecretHash: Uint8Array, IDCommitment: Uint8Array, IDCommitmentBigInt: bigint);
+    static fromBytes(memKeys: Uint8Array): IdentityCredential;
+}

package/dist/identity.js

@@ -0,0 +1,24 @@
+import { buildBigIntFromUint8Array } from "./utils/index.js";
+export class IdentityCredential {
+    IDTrapdoor;
+    IDNullifier;
+    IDSecretHash;
+    IDCommitment;
+    IDCommitmentBigInt;
+    constructor(IDTrapdoor, IDNullifier, IDSecretHash, IDCommitment, IDCommitmentBigInt) {
+        this.IDTrapdoor = IDTrapdoor;
+        this.IDNullifier = IDNullifier;
+        this.IDSecretHash = IDSecretHash;
+        this.IDCommitment = IDCommitment;
+        this.IDCommitmentBigInt = IDCommitmentBigInt;
+    }
+    static fromBytes(memKeys) {
+        const idTrapdoor = memKeys.subarray(0, 32);
+        const idNullifier = memKeys.subarray(32, 64);
+        const idSecretHash = memKeys.subarray(64, 96);
+        const idCommitment = memKeys.subarray(96);
+        const idCommitmentBigInt = buildBigIntFromUint8Array(idCommitment, 96);
+        return new IdentityCredential(idTrapdoor, idNullifier, idSecretHash, idCommitment, idCommitmentBigInt);
+    }
+}
+//# sourceMappingURL=identity.js.map

package/dist/identity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"identity.js","sourceRoot":"","sources":["../src/identity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,MAAM,OAAO,kBAAkB;IAEX;IACA;IACA;IACA;IACA;IALlB,YACkB,UAAsB,EACtB,WAAuB,EACvB,YAAwB,EACxB,YAAwB,EACxB,kBAA0B;QAJ1B,eAAU,GAAV,UAAU,CAAY;QACtB,gBAAW,GAAX,WAAW,CAAY;QACvB,iBAAY,GAAZ,YAAY,CAAY;QACxB,iBAAY,GAAZ,YAAY,CAAY;QACxB,uBAAkB,GAAlB,kBAAkB,CAAQ;IACzC,CAAC;IAEJ,MAAM,CAAC,SAAS,CAAC,OAAmB;QAClC,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7C,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC1C,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QAEvE,OAAO,IAAI,kBAAkB,CAC3B,UAAU,EACV,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,kBAAkB,CACnB,CAAC;IACJ,CAAC;CACF"}

package/dist/index.d.ts

@@ -1,8 +1,11 @@
 import { RLNDecoder, RLNEncoder } from "./codec.js";
-import { RLN_REGISTRY_ABI, RLN_STORAGE_ABI, SEPOLIA_CONTRACT } from "./constants.js";
+import { RLN_REGISTRY_ABI, RLN_STORAGE_ABI, SEPOLIA_CONTRACT } from "./contract/index.js";
+import { RLNContract } from "./contract/index.js";
+import { createRLN } from "./create.js";
+import { IdentityCredential } from "./identity.js";
 import { Keystore } from "./keystore/index.js";
-import { IdentityCredential, Proof, ProofMetadata, RLNInstance } from "./rln.js";
-import { RLNContract } from "./rln_contract.js";
+import { Proof } from "./proof.js";
+import { RLNInstance } from "./rln.js";
 import { MerkleRootTracker } from "./root_tracker.js";
-export declare function create(): Promise<RLNInstance>;
-export { Keystore, RLNInstance, IdentityCredential, Proof, ProofMetadata, RLNEncoder, RLNDecoder, MerkleRootTracker, RLNContract, RLN_STORAGE_ABI, RLN_REGISTRY_ABI, SEPOLIA_CONTRACT, };
+import { extractMetaMaskSigner } from "./utils/index.js";
+export { createRLN, Keystore, RLNInstance, IdentityCredential, Proof, RLNEncoder, RLNDecoder, MerkleRootTracker, RLNContract, RLN_STORAGE_ABI, RLN_REGISTRY_ABI, SEPOLIA_CONTRACT, extractMetaMaskSigner };

package/dist/index.js

@@ -1,16 +1,12 @@
 import { RLNDecoder, RLNEncoder } from "./codec.js";
-import { RLN_REGISTRY_ABI, RLN_STORAGE_ABI, SEPOLIA_CONTRACT, } from "./constants.js";
+import { RLN_REGISTRY_ABI, RLN_STORAGE_ABI, SEPOLIA_CONTRACT } from "./contract/index.js";
+import { RLNContract } from "./contract/index.js";
+import { createRLN } from "./create.js";
+import { IdentityCredential } from "./identity.js";
 import { Keystore } from "./keystore/index.js";
-import { IdentityCredential, Proof, ProofMetadata, RLNInstance, } from "./rln.js";
-import { RLNContract } from "./rln_contract.js";
+import { Proof } from "./proof.js";
+import { RLNInstance } from "./rln.js";
 import { MerkleRootTracker } from "./root_tracker.js";
-// reexport the create function, dynamically imported from rln.ts
-export async function create() {
-    // A dependency graph that contains any wasm must all be imported
-    // asynchronously. This file does the single async import, so
-    // that no one else needs to worry about it again.
-    const rlnModule = await import("./rln.js");
-    return await rlnModule.create();
-}
-export { Keystore, RLNInstance, IdentityCredential, Proof, ProofMetadata, RLNEncoder, RLNDecoder, MerkleRootTracker, RLNContract, RLN_STORAGE_ABI, RLN_REGISTRY_ABI, SEPOLIA_CONTRACT, };
+import { extractMetaMaskSigner } from "./utils/index.js";
+export { createRLN, Keystore, RLNInstance, IdentityCredential, Proof, RLNEncoder, RLNDecoder, MerkleRootTracker, RLNContract, RLN_STORAGE_ABI, RLN_REGISTRY_ABI, SEPOLIA_CONTRACT, extractMetaMaskSigner };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EACL,kBAAkB,EAClB,KAAK,EACL,aAAa,EACb,WAAW,GACZ,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,iEAAiE;AACjE,MAAM,CAAC,KAAK,UAAU,MAAM;IAC1B,iEAAiE;IACjE,6DAA6D;IAC7D,kDAAkD;IAClD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;IAC3C,OAAO,MAAM,SAAS,CAAC,MAAM,EAAE,CAAC;AAClC,CAAC;AAED,OAAO,EACL,QAAQ,EACR,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,aAAa,EACb,UAAU,EACV,UAAU,EACV,iBAAiB,EACjB,WAAW,EACX,eAAe,EACf,gBAAgB,EAChB,gBAAgB,GACjB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EACL,SAAS,EACT,QAAQ,EACR,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,UAAU,EACV,UAAU,EACV,iBAAiB,EACjB,WAAW,EACX,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACtB,CAAC"}

package/dist/keystore/cipher.js

@@ -2,7 +2,7 @@ import { cipherDecrypt } from "@chainsafe/bls-keystore/lib/cipher.js";
 import { kdf } from "@chainsafe/bls-keystore/lib/kdf.js";
 import { normalizePassword } from "@chainsafe/bls-keystore/lib/password.js";
 import { keccak256 } from "ethereum-cryptography/keccak";
-import { bytesToHex, concatBytes, hexToBytes, } from "ethereum-cryptography/utils";
+import { bytesToHex, concatBytes, hexToBytes } from "ethereum-cryptography/utils";
 // eipKeystore supports only sha256 checksum so we just make an assumption it is keccak256
 const validateChecksum = async (password, eipKeystore) => {
     const computedChecksum = await keccak256Checksum(password, eipKeystore);

package/dist/keystore/cipher.js.map

@@ -1 +1 @@
-{"version":3,"file":"cipher.js","sourceRoot":"","sources":["../../src/keystore/cipher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,GAAG,EAAE,MAAM,oCAAoC,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EACL,UAAU,EACV,WAAW,EACX,UAAU,GACX,MAAM,6BAA6B,CAAC;AAIrC,0FAA0F;AAC1F,MAAM,gBAAgB,GAAG,KAAK,EAC5B,QAAkB,EAClB,WAAyB,EACP,EAAE;IACpB,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACxE,OAAO,gBAAgB,KAAK,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;AAClE,CAAC,CAAC;AAEF,4DAA4D;AAC5D,2BAA2B;AAC3B,sHAAsH;AACtH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,QAAkB,EAClB,WAAyB,EACJ,EAAE;IACvB,MAAM,aAAa,GAAG,MAAM,GAAG,CAC7B,WAAW,CAAC,MAAM,CAAC,GAAG,EACtB,iBAAiB,CAAC,QAAQ,CAAC,CAC5B,CAAC;IACF,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAEtE,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACrC;IAED,OAAO,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,QAAkB,EAClB,WAAyB,EACD,EAAE;IAC1B,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,WAAW,CACzB,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EACb,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAC9C,CAAC;IACF,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACtC,OAAO,UAAU,CAAC,UAAU,CAAC,CAAC;AAChC,CAAC,CAAC"}
+{"version":3,"file":"cipher.js","sourceRoot":"","sources":["../../src/keystore/cipher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,GAAG,EAAE,MAAM,oCAAoC,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EACL,UAAU,EACV,WAAW,EACX,UAAU,EACX,MAAM,6BAA6B,CAAC;AAIrC,0FAA0F;AAC1F,MAAM,gBAAgB,GAAG,KAAK,EAC5B,QAAkB,EAClB,WAAyB,EACP,EAAE;IACpB,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACxE,OAAO,gBAAgB,KAAK,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;AAClE,CAAC,CAAC;AAEF,4DAA4D;AAC5D,2BAA2B;AAC3B,sHAAsH;AACtH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,QAAkB,EAClB,WAAyB,EACJ,EAAE;IACvB,MAAM,aAAa,GAAG,MAAM,GAAG,CAC7B,WAAW,CAAC,MAAM,CAAC,GAAG,EACtB,iBAAiB,CAAC,QAAQ,CAAC,CAC5B,CAAC;IACF,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAEtE,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,QAAkB,EAClB,WAAyB,EACD,EAAE;IAC1B,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,WAAW,CACzB,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EACb,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAC9C,CAAC;IACF,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACtC,OAAO,UAAU,CAAC,UAAU,CAAC,CAAC;AAChC,CAAC,CAAC"}

package/dist/keystore/credential_validation_generated.js.map

@@ -1 +1 @@
-{"version":3,"file":"credential_validation_generated.js","sourceRoot":"","sources":["../../src/keystore/credential_validation_generated.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"credential_validation_generated.js","sourceRoot":"","sources":["../../src/keystore/credential_validation_generated.ts"],"names":[],"mappings":"AACA,wDAAwD;AACxD,mEAAmE;AACnE,mCAAmC;AAEnC,oBAAoB;AACpB,aAAa;AACb,YAAY,CAAC;AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,UAAU,CAAC;AAAA,MAAM,QAAQ,GAAG,EAAC,MAAM,EAAC,QAAQ,EAAC,YAAY,EAAC,EAAC,QAAQ,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC,YAAY,EAAC,EAAC,QAAQ,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC,EAAC,cAAc,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC,EAAC,YAAY,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC,EAAC,KAAK,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC,EAAC,WAAW,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC,EAAC,KAAK,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC,EAAC,EAAC,UAAU,EAAC,CAAC,QAAQ,EAAC,cAAc,EAAC,YAAY,EAAC,KAAK,EAAC,WAAW,EAAC,KAAK,CAAC,EAAC,EAAC,EAAC,UAAU,EAAC,CAAC,QAAQ,CAAC,EAAC,CAAC;AAAA,SAAS,UAAU,CAAC,IAAI,EAAE,EAAC,YAAY,GAAC,EAAE,EAAE,UAAU,EAAE,kBAAkB,EAAE,QAAQ,GAAC,IAAI,EAAC,GAAC,EAAE,IAAE,IAAI,OAAO,GAAG,IAAI,CAAC,CAAA,IAAI,MAAM,GAAG,CAAC,CAAC,CAAA,IAAG,MAAM,KAAK,CAAC,EAAC,CAAC;IAAA,IAAG,IAAI,IAAI,OAAO,IAAI,IAAI,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAC,CAAC;QAAA,IAAI,QAAQ,CAAC;QAAA,IAAG,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,EAAC,CAAC;YAAA,UAAU,CAAC,MAAM,GAAG,CAAC,EAAC,YAAY,EAAC,UAAU,EAAC,YAAY,EAAC,OAAO,EAAC,UAAU,EAAC,MAAM,EAAC,EAAC,eAAe,EAAE,QAAQ,EAAC,EAAC,OAAO,EAAC,+BAA+B,GAAC,QAAQ,GAAC,GAAG,EAAC,CAAC,CAAC;YAAA,OAAO,KAAK,CAAC;QAAA,CAAC;aAAK,CAAC;YAAA,IAAG,IAAI,CAAC,MAAM,KAAK,SAAS,EAAC,CAAC;gBAAA,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;gBAAA,MAAM,MAAM,GAAG,MAAM,CAAC;gBAAA,IAAG,MAAM,KAAK,MAAM,EAAC,CAAC;oBAAA,IAAG,KAAK,IAAI,OAAO,KAAK,IAAI,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAC,CAAC;wBAAA,IAAI,QAAQ,CAAC;wBAAA,IAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,KAAK,SAAS,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,KAAK,SAAS,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,EAAC,CAAC;4BAAA,UAAU,CAAC,MAAM,GAAG,CAAC,EAAC,YAAY,EAAC,YAAY,GAAC,SAAS,EAAC,UAAU,EAAC,8BAA8B,EAAC,OAAO,EAAC,UAAU,EAAC,MAAM,EAAC,EAAC,eAAe,EAAE,QAAQ,EAAC,EAAC,OAAO,EAAC,+BAA+B,GAAC,QAAQ,GAAC,GAAG,EAAC,CAAC,CAAC;4BAAA,OAAO,KAAK,CAAC;wBAAA,CAAC;6BAAK,CAAC;4BAAA,IAAG,KAAK,CAAC,MAAM,KAAK,SAAS,EAAC,CAAC;gCAAA,MAAM,MAAM,GAAG,MAAM,CAAC;gCAAA,IAAG,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAC,CAAC;oCAAA,UAAU,CAAC,MAAM,GAAG,CAAC,EAAC,YAAY,EAAC,YAAY,GAAC,gBAAgB,EAAC,UAAU,EAAC,4CAA4C,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAC,OAAO,EAAC,gBAAgB,EAAC,CAAC,CAAC;oCAAA,OAAO,KAAK,CAAC;gCAAA,CAAC;gCAAA,IAAI,MAAM,GAAG,MAAM,KAAK,MAAM,CAAC;4BAAA,CAAC;iCAAK,CAAC;gCAAA,IAAI,MAAM,GAAG,IAAI,CAAC;4BAAA,CAAC;4BAAA,IAAG,MAAM,EAAC,CAAC;gCAAA,IAAG,KAAK,CAAC,YAAY,KAAK,SAAS,EAAC,CAAC;oCAAA,IAAI,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC;oCAAA,MAAM,MAAM,GAAG,MAAM,CAAC;oCAAA,IAAG,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,IAAI,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAC,CAAC;wCAAA,UAAU,CAAC,MAAM,GAAG,CAAC,EAAC,YAAY,EAAC,YAAY,GAAC,sBAAsB,EAAC,UAAU,EAAC,kDAAkD,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAC,OAAO,EAAC,gBAAgB,EAAC,CAAC,CAAC;wCAAA,OAAO,KAAK,CAAC;oCAAA,CAAC;oCAAA,IAAI,MAAM,GAAG,MAAM,KAAK,MAAM,CAAC;gCAAA,CAAC;qCAAK,CAAC;oCAAA,IAAI,MAAM,GAAG,IAAI,CAAC;gCAAA,CAAC;gCAAA,IAAG,MAAM,EAAC,CAAC;oCAAA,IAAG,KAAK,CAAC,UAAU,KAAK,SAAS,EAAC,CAAC;wCAAA,MAAM,MAAM,GAAG,MAAM,CAAC;wCAAA,IAAG,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,EAAC,CAAC;4CAAA,UAAU,CAAC,MAAM,GAAG,CAAC,EAAC,YAAY,EAAC,YAAY,GAAC,oBAAoB,EAAC,UAAU,EAAC,gDAAgD,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAC,OAAO,EAAC,gBAAgB,EAAC,CAAC,CAAC;4CAAA,OAAO,KAAK,CAAC;wCAAA,CAAC;wCAAA,IAAI,MAAM,GAAG,MAAM,KAAK,MAAM,CAAC;oCAAA,CAAC;yCAAK,CAAC;wCAAA,IAAI,MAAM,GAAG,IAAI,CAAC;oCAAA,CAAC;oCAAA,IAAG,MAAM,EAAC,CAAC;wCAAA,IAAG,KAAK,CAAC,GAAG,KAAK,SAAS,EAAC,CAAC;4CAAA,MAAM,MAAM,GAAG,MAAM,CAAC;4CAAA,IAAG,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,EAAC,CAAC;gDAAA,UAAU,CAAC,MAAM,GAAG,CAAC,EAAC,YAAY,EAAC,YAAY,GAAC,aAAa,EAAC,UAAU,EAAC,yCAAyC,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAC,OAAO,EAAC,gBAAgB,EAAC,CAAC,CAAC;gDAAA,OAAO,KAAK,CAAC;4CAAA,CAAC;4CAAA,IAAI,MAAM,GAAG,MAAM,KAAK,MAAM,CAAC;wCAAA,CAAC;6CAAK,CAAC;4CAAA,IAAI,MAAM,GAAG,IAAI,CAAC;wCAAA,CAAC;wCAAA,IAAG,MAAM,EAAC,CAAC;4CAAA,IAAG,KAAK,CAAC,SAAS,KAAK,SAAS,EAAC,CAAC;gDAAA,IAAI,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC;gDAAA,MAAM,OAAO,GAAG,MAAM,CAAC;gDAAA,IAAG,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,IAAI,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAC,CAAC;oDAAA,UAAU,CAAC,MAAM,GAAG,CAAC,EAAC,YAAY,EAAC,YAAY,GAAC,mBAAmB,EAAC,UAAU,EAAC,+CAA+C,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAC,OAAO,EAAC,gBAAgB,EAAC,CAAC,CAAC;oDAAA,OAAO,KAAK,CAAC;gDAAA,CAAC;gDAAA,IAAI,MAAM,GAAG,OAAO,KAAK,MAAM,CAAC;4CAAA,CAAC;iDAAK,CAAC;gDAAA,IAAI,MAAM,GAAG,IAAI,CAAC;4CAAA,CAAC;4CAAA,IAAG,MAAM,EAAC,CAAC;gDAAA,IAAG,KAAK,CAAC,GAAG,KAAK,SAAS,EAAC,CAAC;oDAAA,MAAM,OAAO,GAAG,MAAM,CAAC;oDAAA,IAAG,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,EAAC,CAAC;wDAAA,UAAU,CAAC,MAAM,GAAG,CAAC,EAAC,YAAY,EAAC,YAAY,GAAC,aAAa,EAAC,UAAU,EAAC,yCAAyC,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAC,OAAO,EAAC,gBAAgB,EAAC,CAAC,CAAC;wDAAA,OAAO,KAAK,CAAC;oDAAA,CAAC;oDAAA,IAAI,MAAM,GAAG,OAAO,KAAK,MAAM,CAAC;gDAAA,CAAC;qDAAK,CAAC;oDAAA,IAAI,MAAM,GAAG,IAAI,CAAC;gDAAA,CAAC;4CAAA,CAAC;wCAAA,CAAC;oCAAA,CAAC;gCAAA,CAAC;4BAAA,CAAC;wBAAA,CAAC;oBAAA,CAAC;yBAAK,CAAC;wBAAA,UAAU,CAAC,MAAM,GAAG,CAAC,EAAC,YAAY,EAAC,YAAY,GAAC,SAAS,EAAC,UAAU,EAAC,0BAA0B,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAC,OAAO,EAAC,gBAAgB,EAAC,CAAC,CAAC;wBAAA,OAAO,KAAK,CAAC;oBAAA,CAAC;gBAAA,CAAC;YAAA,CAAC;QAAA,CAAC;IAAA,CAAC;SAAK,CAAC;QAAA,UAAU,CAAC,MAAM,GAAG,CAAC,EAAC,YAAY,EAAC,UAAU,EAAC,QAAQ,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAC,OAAO,EAAC,gBAAgB,EAAC,CAAC,CAAC;QAAA,OAAO,KAAK,CAAC;IAAA,CAAC;AAAA,CAAC,CAAA,UAAU,CAAC,MAAM,GAAG,OAAO,CAAC,CAAA,OAAO,MAAM,KAAK,CAAC,CAAC,CAAA,CAAC"}

package/dist/keystore/index.d.ts

@@ -1,2 +1,4 @@
 import { Keystore } from "./keystore.js";
+import type { DecryptedCredentials, EncryptedCredentials } from "./types.js";
 export { Keystore };
+export type { EncryptedCredentials, DecryptedCredentials };

package/dist/keystore/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/keystore/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/keystore/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAE,QAAQ,EAAE,CAAC"}

package/dist/keystore/keystore.d.ts

@@ -1,7 +1,6 @@
 import type { ICipherModule, IPbkdf2KdfModule } from "@chainsafe/bls-keystore";
-import type { IdentityCredential } from "../rln.js";
-import type { MembershipHash, MembershipInfo, Password, Sha256Hash } from "./types.js";
-declare type NwakuCredential = {
+import type { KeystoreEntity, MembershipHash, Password, Sha256Hash } from "./types.js";
+type NwakuCredential = {
     crypto: {
         cipher: ICipherModule["function"];
         cipherparams: ICipherModule["params"];
@@ -19,26 +18,27 @@ interface NwakuKeystore {
         [key: MembershipHash]: NwakuCredential;
     };
 }
-declare type KeystoreCreateOptions = {
+type KeystoreCreateOptions = {
     application?: string;
     version?: string;
     appIdentifier?: string;
 };
-declare type IdentityOptions = {
-    identity: IdentityCredential;
-    membership: MembershipInfo;
-};
 export declare class Keystore {
     private data;
     private constructor();
     static create(options?: KeystoreCreateOptions): Keystore;
-    static fromString(str: string): Keystore | null;
+    static fromString(str: string): undefined | Keystore;
     static fromObject(obj: NwakuKeystore): Keystore;
-    addCredential(options: IdentityOptions, password: Password): Promise<MembershipHash>;
-    readCredential(membershipHash: MembershipHash, password: Password): Promise<null | IdentityOptions>;
+    addCredential(options: KeystoreEntity, password: Password): Promise<MembershipHash>;
+    readCredential(membershipHash: MembershipHash, password: Password): Promise<undefined | KeystoreEntity>;
     removeCredential(hash: MembershipHash): void;
     toString(): string;
     toObject(): NwakuKeystore;
+    /**
+     * Read array of hashes of current credentials
+     * @returns array of keys of credentials in current Keystore
+     */
+    keys(): string[];
     private static isValidNwakuStore;
     private static fromCredentialToEip;
     private static fromEipToCredential;