@waku/rln 0.0.2-3670e82.0 → 0.0.2-6cb9c9c.0

package/dist/rln_light.js

@@ -0,0 +1,206 @@
+import { Logger } from "@waku/utils";
+import { RLNContract } from "./contract/index.js";
+import { IdentityGenerator } from "./identity_generator.js";
+import { Keystore } from "./keystore/index.js";
+import { extractMetaMaskSigner } from "./utils/index.js";
+const log = new Logger("waku:rln-light");
+/**
+ * Lightweight RLN implementation without Zerokit
+ * Only supports Keystore and membership registration
+ */
+export class RLNLight {
+    started = false;
+    starting = false;
+    _contract;
+    _signer;
+    keystore = Keystore.create();
+    _credentials;
+    identityGenerator = new IdentityGenerator();
+    get contract() {
+        return this._contract;
+    }
+    get signer() {
+        return this._signer;
+    }
+    /**
+     * Get the current credentials
+     */
+    get credentials() {
+        return this._credentials;
+    }
+    /**
+     * Start the RLNLight instance
+     * @param options Configuration options
+     */
+    async start(options = {}) {
+        if (this.started || this.starting) {
+            log.warn("RLNLight already started or starting");
+            return;
+        }
+        this.starting = true;
+        try {
+            // Determine correct options based on credentials, if any
+            const keystoreCredentials = options.address
+                ? await this.findCredentialsByAddress(options.address)
+                : undefined;
+            const { address, signer, rateLimit } = await this.determineStartOptions(options, keystoreCredentials);
+            // Set the signer
+            if (signer) {
+                this._signer = signer;
+            }
+            else {
+                this._signer = await extractMetaMaskSigner();
+            }
+            const contractOptions = {
+                signer: this._signer,
+                address: address,
+                rateLimit: rateLimit
+            };
+            // We need to create a minimal compatible object with RLNInstance interface
+            // but we only need it for contract initialization
+            const compatibleRLN = {
+                zerokit: {
+                    getMerkleRoot: () => new Uint8Array(32),
+                    insertMember: (_idCommitment) => { },
+                    insertMembers: (_index, ..._idCommitments) => { },
+                    deleteMember: (_index) => { }
+                }
+            };
+            this._contract = await RLNContract.init(
+            // Type assertion needed for compatibility with RLNInstance interface
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            compatibleRLN, contractOptions);
+            this.started = true;
+        }
+        catch (error) {
+            log.error("Failed to start RLNLight:", error);
+            throw error;
+        }
+        finally {
+            this.starting = false;
+        }
+    }
+    /**
+     * Find credentials in the keystore by contract address
+     */
+    async findCredentialsByAddress(address) {
+        // Since Keystore doesn't have a direct method to find by address,
+        // we need to iterate through all credentials
+        const hashes = this.keystore.keys();
+        for (const hash of hashes) {
+            try {
+                // Try with an empty password - this won't work but lets us check schema
+                const credential = await this.keystore.readCredential(hash, new Uint8Array(0));
+                if (credential?.membership.address === address) {
+                    return credential;
+                }
+            }
+            catch (e) {
+                // Ignore errors, just means we couldn't read this credential
+            }
+        }
+        return undefined;
+    }
+    /**
+     * Determine the correct options for starting RLNLight
+     */
+    async determineStartOptions(options, credentials) {
+        if (options.credentials) {
+            const { credentials: decrypted } = await RLNLight.decryptCredentialsIfNeeded(options.credentials);
+            if (decrypted?.membership) {
+                this._credentials = decrypted;
+                return {
+                    ...options,
+                    address: decrypted.membership.address
+                };
+            }
+        }
+        else if (credentials) {
+            return {
+                ...options,
+                address: credentials.membership.address
+            };
+        }
+        return options;
+    }
+    /**
+     * Decrypt credentials if they are encrypted
+     */
+    static async decryptCredentialsIfNeeded(credentials) {
+        if (!credentials) {
+            return {};
+        }
+        if ("identity" in credentials) {
+            return { credentials };
+        }
+        else {
+            const keystore = Keystore.create();
+            try {
+                const decrypted = await keystore.readCredential(credentials.id, credentials.password);
+                if (!decrypted) {
+                    return {};
+                }
+                return {
+                    credentials: {
+                        identity: decrypted.identity,
+                        membership: decrypted.membership
+                    },
+                    keystore
+                };
+            }
+            catch (e) {
+                log.error("Failed to decrypt credentials", e);
+                return {};
+            }
+        }
+    }
+    /**
+     * Register a membership using an identity or signature
+     * @param options Options including identity or signature
+     * @returns Decrypted credentials if successful
+     */
+    async registerMembership(options) {
+        if (!this.contract) {
+            throw Error("RLN Contract is not initialized.");
+        }
+        let identity = "identity" in options && options.identity;
+        if ("signature" in options) {
+            identity = this.identityGenerator.generateSeededIdentityCredential(options.signature);
+        }
+        if (!identity) {
+            throw Error("Missing signature or identity to register membership.");
+        }
+        return this.contract.registerWithIdentity(identity);
+    }
+    /**
+     * Changes credentials in use by relying on provided Keystore
+     * @param id Hash of credentials to select from Keystore
+     * @param password Password to decrypt credentials from Keystore
+     */
+    async useCredentials(id, password) {
+        const decrypted = await this.keystore.readCredential(id, password);
+        if (!decrypted) {
+            throw new Error("Credentials not found or incorrect password");
+        }
+        this._credentials = {
+            identity: decrypted.identity,
+            membership: decrypted.membership
+        };
+    }
+    /**
+     * Generate a new identity credential
+     * @returns New identity credential
+     */
+    generateIdentityCredential() {
+        return this.identityGenerator.generateIdentityCredentials();
+    }
+    /**
+     * Generate a seeded identity credential
+     * @param seed Seed string to generate deterministic identity
+     * @returns Seeded identity credential
+     */
+    generateSeededIdentityCredential(seed) {
+        return this.identityGenerator.generateSeededIdentityCredential(seed);
+    }
+}
+//# sourceMappingURL=rln_light.js.map

package/dist/rln_light.js.map

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

package/package.json

@@ -1 +1 @@
-{"name":"@waku/rln","version":"0.0.2-3670e82.0","description":"RLN (Rate Limiting Nullifier) implementation for Waku","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"}},"type":"module","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/rln#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","rln","rate-limiting","privacy","web3"],"scripts":{"build":"run-s build:**","build:copy":"mkdir -p dist/resources && cp -r src/resources/* dist/resources/","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:tsc":"tsc -p tsconfig.dev.json","check:lint":"eslint \"src/!(resources)/**/*.{ts,js}\" *.js","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","test":"NODE_ENV=test run-s test:*","test:browser":"karma start karma.conf.cjs","watch:build":"tsc -p tsconfig.json -w","watch:test":"mocha --watch","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build"},"engines":{"node":">=20"},"devDependencies":{"@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^5.0.1","@types/chai-spies":"^1.0.6","@types/deep-equal-in-any-order":"^1.0.4","@types/lodash":"^4.17.15","@types/sinon":"^17.0.3","@waku/build-utils":"^1.0.0","@waku/message-encryption":"0.0.32-3670e82.0","chai":"^5.1.2","chai-as-promised":"^8.0.1","chai-spies":"^1.1.0","chai-subset":"^1.6.0","deep-equal-in-any-order":"^2.0.6","fast-check":"^3.23.2","rollup-plugin-copy":"^3.5.0","sinon":"^19.0.2"},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"],"dependencies":{"@chainsafe/bls-keystore":"3.0.0","@waku/core":"0.0.34-3670e82.0","@waku/utils":"0.0.22-3670e82.0","@waku/zerokit-rln-wasm":"^0.0.13","ethereum-cryptography":"^3.1.0","ethers":"^5.7.2","lodash":"^4.17.21","uuid":"^11.0.5"}}
+{"name":"@waku/rln","version":"0.0.2-6cb9c9c.0","description":"RLN (Rate Limiting Nullifier) implementation for Waku","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"}},"type":"module","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/rln#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","rln","rate-limiting","privacy","web3"],"scripts":{"build":"run-s build:**","build:copy":"mkdir -p dist/resources && cp -r src/resources/* dist/resources/","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:tsc":"tsc -p tsconfig.dev.json","check:lint":"eslint \"src/!(resources)/**/*.{ts,js}\" *.js","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","test":"NODE_ENV=test run-s test:*","test:browser":"karma start karma.conf.cjs","watch:build":"tsc -p tsconfig.json -w","watch:test":"mocha --watch","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build"},"engines":{"node":">=20"},"devDependencies":{"@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^5.0.1","@types/chai-spies":"^1.0.6","@types/deep-equal-in-any-order":"^1.0.4","@types/lodash":"^4.17.15","@types/sinon":"^17.0.3","@waku/build-utils":"^1.0.0","@waku/message-encryption":"0.0.32-6cb9c9c.0","chai":"^5.1.2","chai-as-promised":"^8.0.1","chai-spies":"^1.1.0","chai-subset":"^1.6.0","deep-equal-in-any-order":"^2.0.6","fast-check":"^3.23.2","rollup-plugin-copy":"^3.5.0","sinon":"^19.0.2"},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"],"dependencies":{"@chainsafe/bls-keystore":"3.0.0","@ethersproject/keccak256":"^5.7.0","@ethersproject/strings":"^5.7.0","@waku/core":"0.0.34-6cb9c9c.0","@waku/utils":"0.0.22-6cb9c9c.0","@waku/zerokit-rln-wasm":"^0.0.13","ethereum-cryptography":"^3.1.0","ethers":"^5.7.2","lodash":"^4.17.21","uuid":"^11.0.5"}}

package/src/contract/rln_contract.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import { Logger } from "@waku/utils";
 import { hexToBytes } from "@waku/utils/bytes";
 import { ethers } from "ethers";
@@ -66,7 +65,7 @@ export class RLNContract {
 
   private _members: Map<number, Member> = new Map();
   private _membersFilter: ethers.EventFilter;
-  private _membersRemovedFilter: ethers.EventFilter;
+  private _membershipErasedFilter: ethers.EventFilter;
   private _membersExpiredFilter: ethers.EventFilter;
 
   /**
@@ -115,7 +114,7 @@ export class RLNContract {
 
     // Initialize event filters
     this._membersFilter = this.contract.filters.MembershipRegistered();
-    this._membersRemovedFilter = this.contract.filters.MembershipErased();
+    this._membershipErasedFilter = this.contract.filters.MembershipErased();
     this._membersExpiredFilter = this.contract.filters.MembershipExpired();
   }
 
@@ -185,7 +184,7 @@ export class RLNContract {
       this.contract.maxTotalRateLimit(),
       this.contract.currentTotalRateLimit()
     ]);
-    return maxTotal.sub(currentTotal).toNumber();
+    return Number(maxTotal) - Number(currentTotal);
   }
 
   /**
@@ -210,11 +209,11 @@ export class RLNContract {
     return this._membersFilter;
   }
 
-  private get membersRemovedFilter(): ethers.EventFilter {
-    if (!this._membersRemovedFilter) {
-      throw Error("MembersErased filter was not initialized.");
+  private get membershipErasedFilter(): ethers.EventFilter {
+    if (!this._membershipErasedFilter) {
+      throw Error("MembershipErased filter was not initialized.");
     }
-    return this._membersRemovedFilter;
+    return this._membershipErasedFilter;
   }
 
   private get membersExpiredFilter(): ethers.EventFilter {
@@ -236,7 +235,7 @@ export class RLNContract {
     const removedMemberEvents = await queryFilter(this.contract, {
       fromBlock: this.deployBlock,
       ...options,
-      membersFilter: this.membersRemovedFilter
+      membersFilter: this.membershipErasedFilter
     });
     const expiredMemberEvents = await queryFilter(this.contract, {
       fromBlock: this.deployBlock,
@@ -265,14 +264,12 @@ export class RLNContract {
         evt.event === "MembershipErased" ||
         evt.event === "MembershipExpired"
       ) {
-        // Both MembershipErased and MembershipExpired events should remove members
         let index = evt.args.index;
 
         if (!index) {
           return;
         }
 
-        // Convert index to ethers.BigNumber if it's not already
         if (typeof index === "number" || typeof index === "string") {
           index = ethers.BigNumber.from(index);
         }
@@ -310,12 +307,10 @@ export class RLNContract {
         const _idCommitment = evt.args.idCommitment as string;
         let index = evt.args.index;
 
-        // Ensure index is an ethers.BigNumber
         if (!_idCommitment || !index) {
           return;
         }
 
-        // Convert index to ethers.BigNumber if it's not already
         if (typeof index === "number" || typeof index === "string") {
           index = ethers.BigNumber.from(index);
         }
@@ -323,10 +318,9 @@ export class RLNContract {
         const idCommitment = zeroPadLE(hexToBytes(_idCommitment), 32);
         rlnInstance.zerokit.insertMember(idCommitment);
 
-        // Always store the numeric index as the key, but the BigNumber as the value
         const numericIndex = index.toNumber();
         this._members.set(numericIndex, {
-          index, // This is always a BigNumber
+          index,
           idCommitment: _idCommitment
         });
       });
@@ -367,7 +361,7 @@ export class RLNContract {
     );
 
     this.contract.on(
-      this.membersRemovedFilter,
+      this.membershipErasedFilter,
       (
         _idCommitment: string,
         _membershipRateLimit: ethers.BigNumber,
@@ -395,111 +389,76 @@ export class RLNContract {
     identity: IdentityCredential
   ): Promise<DecryptedCredentials | undefined> {
     try {
-      console.log("registerWithIdentity - starting registration process");
-      console.log("registerWithIdentity - identity:", identity);
-      console.log(
-        "registerWithIdentity - IDCommitmentBigInt:",
+      log.info(
+        `Registering identity with rate limit: ${this.rateLimit} messages/epoch`
+      );
+
+      // Check if the ID commitment is already registered
+      const existingIndex = await this.getMemberIndex(
         identity.IDCommitmentBigInt.toString()
       );
-      console.log("registerWithIdentity - rate limit:", this.rateLimit);
+      if (existingIndex) {
+        throw new Error(
+          `ID commitment is already registered with index ${existingIndex}`
+        );
+      }
 
-      log.info(
-        `Registering identity with rate limit: ${this.rateLimit} messages/epoch`
+      // Check if there's enough remaining rate limit
+      const remainingRateLimit = await this.getRemainingTotalRateLimit();
+      if (remainingRateLimit < this.rateLimit) {
+        throw new Error(
+          `Not enough remaining rate limit. Requested: ${this.rateLimit}, Available: ${remainingRateLimit}`
+        );
+      }
+
+      const estimatedGas = await this.contract.estimateGas.register(
+        identity.IDCommitmentBigInt,
+        this.rateLimit,
+        []
       );
+      const gasLimit = estimatedGas.add(10000);
 
-      console.log("registerWithIdentity - calling contract.register");
       const txRegisterResponse: ethers.ContractTransaction =
         await this.contract.register(
           identity.IDCommitmentBigInt,
           this.rateLimit,
           [],
-          { gasLimit: 300000 }
+          { gasLimit }
         );
-      console.log(
-        "registerWithIdentity - txRegisterResponse:",
-        txRegisterResponse
-      );
-      console.log("registerWithIdentity - hash:", txRegisterResponse.hash);
-      console.log(
-        "registerWithIdentity - waiting for transaction confirmation..."
-      );
 
       const txRegisterReceipt = await txRegisterResponse.wait();
-      console.log(
-        "registerWithIdentity - txRegisterReceipt:",
-        txRegisterReceipt
-      );
-      console.log(
-        "registerWithIdentity - transaction status:",
-        txRegisterReceipt.status
-      );
-      console.log(
-        "registerWithIdentity - block number:",
-        txRegisterReceipt.blockNumber
-      );
-      console.log(
-        "registerWithIdentity - gas used:",
-        txRegisterReceipt.gasUsed.toString()
-      );
+
+      if (txRegisterReceipt.status === 0) {
+        throw new Error("Transaction failed on-chain");
+      }
 
       const memberRegistered = txRegisterReceipt.events?.find(
         (event) => event.event === "MembershipRegistered"
       );
-      console.log(
-        "registerWithIdentity - memberRegistered event:",
-        memberRegistered
-      );
 
       if (!memberRegistered || !memberRegistered.args) {
-        console.log(
-          "registerWithIdentity - ERROR: no memberRegistered event found"
-        );
-        console.log(
-          "registerWithIdentity - all events:",
-          txRegisterReceipt.events
-        );
         log.error(
           "Failed to register membership: No MembershipRegistered event found"
         );
         return undefined;
       }
 
-      console.log(
-        "registerWithIdentity - memberRegistered args:",
-        memberRegistered.args
-      );
       const decodedData: MembershipRegisteredEvent = {
         idCommitment: memberRegistered.args.idCommitment,
         membershipRateLimit: memberRegistered.args.membershipRateLimit,
         index: memberRegistered.args.index
       };
-      console.log("registerWithIdentity - decodedData:", decodedData);
-      console.log(
-        "registerWithIdentity - index:",
-        decodedData.index.toString()
-      );
-      console.log(
-        "registerWithIdentity - membershipRateLimit:",
-        decodedData.membershipRateLimit.toString()
-      );
 
       log.info(
         `Successfully registered membership with index ${decodedData.index} ` +
           `and rate limit ${decodedData.membershipRateLimit}`
       );
 
-      console.log("registerWithIdentity - getting network information");
       const network = await this.contract.provider.getNetwork();
-      console.log("registerWithIdentity - network:", network);
-      console.log("registerWithIdentity - chainId:", network.chainId);
-
       const address = this.contract.address;
-      console.log("registerWithIdentity - contract address:", address);
-
-      const membershipId = decodedData.index.toNumber();
-      console.log("registerWithIdentity - membershipId:", membershipId);
+      const membershipId = Number(decodedData.index);
 
-      const result = {
+      return {
         identity,
         membership: {
           address,
@@ -507,21 +466,33 @@ export class RLNContract {
           chainId: network.chainId
         }
       };
-      console.log("registerWithIdentity - returning result:", result);
-
-      return result;
     } catch (error) {
-      console.log("registerWithIdentity - ERROR:", error);
-      console.log(
-        "registerWithIdentity - error message:",
-        (error as Error).message
-      );
-      console.log(
-        "registerWithIdentity - error stack:",
-        (error as Error).stack
-      );
-      log.error(`Error in registerWithIdentity: ${(error as Error).message}`);
-      return undefined;
+      if (error instanceof Error) {
+        const errorMessage = error.message;
+        log.error("registerWithIdentity - error message:", errorMessage);
+        log.error("registerWithIdentity - error stack:", error.stack);
+
+        // Try to extract more specific error information
+        if (errorMessage.includes("CannotExceedMaxTotalRateLimit")) {
+          throw new Error(
+            "Registration failed: Cannot exceed maximum total rate limit"
+          );
+        } else if (errorMessage.includes("InvalidIdCommitment")) {
+          throw new Error("Registration failed: Invalid ID commitment");
+        } else if (errorMessage.includes("InvalidMembershipRateLimit")) {
+          throw new Error("Registration failed: Invalid membership rate limit");
+        } else if (errorMessage.includes("execution reverted")) {
+          throw new Error(
+            "Contract execution reverted. Check contract requirements."
+          );
+        } else {
+          throw new Error(`Error in registerWithIdentity: ${errorMessage}`);
+        }
+      } else {
+        throw new Error("Unknown error in registerWithIdentity", {
+          cause: error
+        });
+      }
     }
   }
 
@@ -610,7 +581,7 @@ export class RLNContract {
 
       const network = await this.contract.provider.getNetwork();
       const address = this.contract.address;
-      const membershipId = decodedData.index.toNumber();
+      const membershipId = Number(decodedData.index);
 
       return {
         identity,
@@ -676,20 +647,18 @@ export class RLNContract {
 
   public async extendMembership(
     idCommitment: string
-  ): Promise<ethers.ContractReceipt> {
-    const tx = await this.contract.extendMemberships([idCommitment]);
-    return await tx.wait();
+  ): Promise<ethers.ContractTransaction> {
+    return this.contract.extendMemberships([idCommitment]);
   }
 
   public async eraseMembership(
     idCommitment: string,
     eraseFromMembershipSet: boolean = true
-  ): Promise<ethers.ContractReceipt> {
-    const tx = await this.contract.eraseMemberships(
+  ): Promise<ethers.ContractTransaction> {
+    return this.contract.eraseMemberships(
       [idCommitment],
       eraseFromMembershipSet
     );
-    return await tx.wait();
   }
 
   public async registerMembership(
@@ -704,10 +673,7 @@ export class RLNContract {
         `Rate limit must be between ${RATE_LIMIT_PARAMS.MIN_RATE} and ${RATE_LIMIT_PARAMS.MAX_RATE}`
       );
     }
-    console.log("registering membership", idCommitment, rateLimit);
-    const txn = this.contract.register(idCommitment, rateLimit, []);
-    console.log("txn", txn);
-    return txn;
+    return this.contract.register(idCommitment, rateLimit, []);
   }
 
   private async getMemberIndex(

package/src/identity_generator.ts

@@ -0,0 +1,108 @@
+import { keccak256 } from "@ethersproject/keccak256";
+import { toUtf8Bytes } from "@ethersproject/strings";
+
+import { IdentityCredential } from "./identity.js";
+import { buildBigIntFromUint8Array } from "./utils/index.js";
+
+/**
+ * A standalone implementation of identity generation for RLN memberships
+ * without Zerokit dependency. Only supports identity creation and membership
+ * registration.
+ */
+export class IdentityGenerator {
+  /**
+   * Generate a new random identity credential
+   * @returns An IdentityCredential object
+   */
+  public generateIdentityCredentials(): IdentityCredential {
+    // Generate random values for IDTrapdoor and IDNullifier
+    const idTrapdoor = crypto.getRandomValues(new Uint8Array(32));
+    const idNullifier = crypto.getRandomValues(new Uint8Array(32));
+
+    // Generate IDSecretHash by concatenating and hashing
+    const combined = new Uint8Array(64);
+    combined.set(idTrapdoor, 0);
+    combined.set(idNullifier, 32);
+    const idSecretHash = new Uint8Array(
+      keccak256(combined)
+        .substring(2)
+        .match(/.{1,2}/g)!
+        .map((byte) => parseInt(byte, 16))
+    );
+
+    // Generate IDCommitment by hashing IDSecretHash
+    const idCommitment = new Uint8Array(
+      keccak256(idSecretHash)
+        .substring(2)
+        .match(/.{1,2}/g)!
+        .map((byte) => parseInt(byte, 16))
+    );
+
+    // Generate BigInt from IDCommitment
+    const idCommitmentBigInt = buildBigIntFromUint8Array(idCommitment, 32);
+
+    return new IdentityCredential(
+      idTrapdoor,
+      idNullifier,
+      idSecretHash,
+      idCommitment,
+      idCommitmentBigInt
+    );
+  }
+
+  /**
+   * Generate an identity credential from a seed
+   * @param seed A string seed to generate a deterministic identity
+   * @returns An IdentityCredential object
+   */
+  public generateSeededIdentityCredential(seed: string): IdentityCredential {
+    // Convert seed to bytes
+    const seedBytes = toUtf8Bytes(seed);
+
+    // Use the seed to derive IDTrapdoor and IDNullifier deterministically
+    const seedHash = keccak256(seedBytes);
+    const seedHashBytes = new Uint8Array(
+      seedHash
+        .substring(2)
+        .match(/.{1,2}/g)!
+        .map((byte) => parseInt(byte, 16))
+    );
+
+    // Use first half for IDTrapdoor, second half for IDNullifier
+    const idTrapdoor = seedHashBytes.slice(0, 32);
+    const idNullifier = keccak256(seedHashBytes).substring(2);
+    const idNullifierBytes = new Uint8Array(
+      idNullifier.match(/.{1,2}/g)!.map((byte) => parseInt(byte, 16))
+    ).slice(0, 32);
+
+    // Generate IDSecretHash by concatenating and hashing
+    const combined = new Uint8Array(64);
+    combined.set(idTrapdoor, 0);
+    combined.set(idNullifierBytes, 32);
+    const idSecretHash = new Uint8Array(
+      keccak256(combined)
+        .substring(2)
+        .match(/.{1,2}/g)!
+        .map((byte) => parseInt(byte, 16))
+    );
+
+    // Generate IDCommitment by hashing IDSecretHash
+    const idCommitment = new Uint8Array(
+      keccak256(idSecretHash)
+        .substring(2)
+        .match(/.{1,2}/g)!
+        .map((byte) => parseInt(byte, 16))
+    );
+
+    // Generate BigInt from IDCommitment
+    const idCommitmentBigInt = buildBigIntFromUint8Array(idCommitment, 32);
+
+    return new IdentityCredential(
+      idTrapdoor,
+      idNullifierBytes,
+      idSecretHash,
+      idCommitment,
+      idCommitmentBigInt
+    );
+  }
+}