@waku/rln 0.1.1-b429b05 → 0.1.1-fa49e29

package/src/rln_contract.ts

@@ -1,19 +1,27 @@
 import { ethers } from "ethers";
 
-import { RLN_ABI } from "./constants.js";
+import { RLN_REGISTRY_ABI, RLN_STORAGE_ABI } from "./constants.js";
 import { IdentityCredential, RLNInstance } from "./rln.js";
 import { MerkleRootTracker } from "./root_tracker.js";
 
 type Member = {
-  pubkey: string;
-  index: number;
+  idCommitment: string;
+  index: ethers.BigNumber;
 };
 
-type ContractOptions = {
-  address: string;
-  provider: ethers.Signer | ethers.providers.Provider;
+type Provider = ethers.Signer | ethers.providers.Provider;
+
+type RLNContractOptions = {
+  provider: Provider;
+  registryAddress: string;
+};
+
+type RLNStorageOptions = {
+  storageIndex?: number;
 };
 
+type RLNContractInitOptions = RLNContractOptions & RLNStorageOptions;
+
 type FetchMembersOptions = {
   fromBlock?: number;
   fetchRange?: number;
@@ -21,18 +29,23 @@ type FetchMembersOptions = {
 };
 
 export class RLNContract {
-  private _contract: ethers.Contract;
-  private membersFilter: ethers.EventFilter;
+  private registryContract: ethers.Contract;
   private merkleRootTracker: MerkleRootTracker;
 
-  private _members: Member[] = [];
+  private deployBlock: undefined | number;
+  private storageIndex: undefined | number;
+  private storageContract: undefined | ethers.Contract;
+  private _membersFilter: undefined | ethers.EventFilter;
+
+  private _members: Map<number, Member> = new Map();
 
   public static async init(
     rlnInstance: RLNInstance,
-    options: ContractOptions
+    options: RLNContractInitOptions
   ): Promise<RLNContract> {
     const rlnContract = new RLNContract(rlnInstance, options);
 
+    await rlnContract.initStorageContract(options.provider);
     await rlnContract.fetchMembers(rlnInstance);
     rlnContract.subscribeToMembers(rlnInstance);
 
@@ -41,21 +54,61 @@ export class RLNContract {
 
   constructor(
     rlnInstance: RLNInstance,
-    { address, provider }: ContractOptions
+    { registryAddress, provider }: RLNContractOptions
   ) {
     const initialRoot = rlnInstance.getMerkleRoot();
 
-    this._contract = new ethers.Contract(address, RLN_ABI, provider);
+    this.registryContract = new ethers.Contract(
+      registryAddress,
+      RLN_REGISTRY_ABI,
+      provider
+    );
     this.merkleRootTracker = new MerkleRootTracker(5, initialRoot);
-    this.membersFilter = this.contract.filters.MemberRegistered();
+  }
+
+  private async initStorageContract(
+    provider: Provider,
+    options: RLNStorageOptions = {}
+  ): Promise<void> {
+    const storageIndex = options?.storageIndex
+      ? options.storageIndex
+      : await this.registryContract.usingStorageIndex();
+    const storageAddress = await this.registryContract.storages(storageIndex);
+
+    if (!storageAddress || storageAddress === ethers.constants.AddressZero) {
+      throw Error("No RLN Storage initialized on registry contract.");
+    }
+
+    this.storageIndex = storageIndex;
+    this.storageContract = new ethers.Contract(
+      storageAddress,
+      RLN_STORAGE_ABI,
+      provider
+    );
+    this._membersFilter = this.storageContract.filters.MemberRegistered();
+
+    this.deployBlock = await this.storageContract.deployedBlockNumber();
   }
 
   public get contract(): ethers.Contract {
-    return this._contract;
+    if (!this.storageContract) {
+      throw Error("Storage contract was not initialized");
+    }
+    return this.storageContract as ethers.Contract;
   }
 
   public get members(): Member[] {
-    return this._members;
+    const sortedMembers = Array.from(this._members.values()).sort(
+      (left, right) => left.index.toNumber() - right.index.toNumber()
+    );
+    return sortedMembers;
+  }
+
+  private get membersFilter(): ethers.EventFilter {
+    if (!this._membersFilter) {
+      throw Error("Members filter was not initialized.");
+    }
+    return this._membersFilter as ethers.EventFilter;
   }
 
   public async fetchMembers(
@@ -63,6 +116,7 @@ export class RLNContract {
     options: FetchMembersOptions = {}
   ): Promise<void> {
     const registeredMemberEvents = await queryFilter(this.contract, {
+      fromBlock: this.deployBlock,
       ...options,
       membersFilter: this.membersFilter,
     });
@@ -79,13 +133,13 @@ export class RLNContract {
       }
 
       if (evt.removed) {
-        const index: number = evt.args.index;
+        const index: ethers.BigNumber = evt.args.index;
         const toRemoveVal = toRemoveTable.get(evt.blockNumber);
         if (toRemoveVal != undefined) {
-          toRemoveVal.push(index);
+          toRemoveVal.push(index.toNumber());
           toRemoveTable.set(evt.blockNumber, toRemoveVal);
         } else {
-          toRemoveTable.set(evt.blockNumber, [index]);
+          toRemoveTable.set(evt.blockNumber, [index.toNumber()]);
         }
       } else {
         let eventsPerBlock = toInsertTable.get(evt.blockNumber);
@@ -108,18 +162,23 @@ export class RLNContract {
   ): void {
     toInsert.forEach((events: ethers.Event[], blockNumber: number) => {
       events.forEach((evt) => {
-        if (!evt.args) {
+        const _idCommitment = evt?.args?.idCommitment;
+        const index: ethers.BigNumber = evt?.args?.index;
+
+        if (!_idCommitment || !index) {
           return;
         }
 
-        const pubkey = evt.args.pubkey;
-        const index = evt.args.index;
         const idCommitment = ethers.utils.zeroPad(
-          ethers.utils.arrayify(pubkey),
+          ethers.utils.arrayify(_idCommitment),
           32
         );
         rlnInstance.insertMember(idCommitment);
-        this.members.push({ index, pubkey });
+        this._members.set(index.toNumber(), {
+          index,
+          idCommitment:
+            _idCommitment?._hex || ethers.utils.hexlify(idCommitment),
+        });
       });
 
       const currentRoot = rlnInstance.getMerkleRoot();
@@ -134,9 +193,8 @@ export class RLNContract {
     const removeDescending = new Map([...toRemove].sort().reverse());
     removeDescending.forEach((indexes: number[], blockNumber: number) => {
       indexes.forEach((index) => {
-        const idx = this.members.findIndex((m) => m.index === index);
-        if (idx > -1) {
-          this.members.splice(idx, 1);
+        if (this._members.has(index)) {
+          this._members.delete(index);
         }
         rlnInstance.deleteMember(index);
       });
@@ -147,14 +205,14 @@ export class RLNContract {
 
   public subscribeToMembers(rlnInstance: RLNInstance): void {
     this.contract.on(this.membersFilter, (_pubkey, _index, event) =>
-      this.processEvents(rlnInstance, event)
+      this.processEvents(rlnInstance, [event])
     );
   }
 
   public async registerWithSignature(
     rlnInstance: RLNInstance,
     signature: string
-  ): Promise<ethers.Event | undefined> {
+  ): Promise<Member | undefined> {
     const identityCredential =
       await rlnInstance.generateSeededIdentityCredential(signature);
 
@@ -163,16 +221,36 @@ export class RLNContract {
 
   public async registerWithKey(
     credential: IdentityCredential
-  ): Promise<ethers.Event | undefined> {
-    const depositValue = await this.contract.MEMBERSHIP_DEPOSIT();
-
+  ): Promise<Member | undefined> {
+    if (this.storageIndex === undefined) {
+      throw Error(
+        "Cannot register credential, no storage contract index found."
+      );
+    }
     const txRegisterResponse: ethers.ContractTransaction =
-      await this.contract.register(credential.IDCommitmentBigInt, {
-        value: depositValue,
-      });
+      await this.registryContract["register(uint16,uint256)"](
+        this.storageIndex,
+        credential.IDCommitmentBigInt,
+        { gasLimit: 100000 }
+      );
     const txRegisterReceipt = await txRegisterResponse.wait();
 
-    return txRegisterReceipt?.events?.[0];
+    // assumption: register(uint16,uint256) emits one event
+    const memberRegistered = txRegisterReceipt?.events?.[0];
+
+    if (!memberRegistered) {
+      return undefined;
+    }
+
+    const decodedData = this.contract.interface.decodeEventLog(
+      "MemberRegistered",
+      memberRegistered.data
+    );
+
+    return {
+      idCommitment: decodedData.idCommitment,
+      index: decodedData.index,
+    };
   }
 
   public roots(): Uint8Array[] {