diff --git a/packages/rln/src/credentials_manager.ts b/packages/rln/src/credentials_manager.ts index 498f298830..c842fc8fd4 100644 --- a/packages/rln/src/credentials_manager.ts +++ b/packages/rln/src/credentials_manager.ts @@ -30,11 +30,11 @@ export class RLNCredentialsManager { protected started = false; protected starting = false; - private _contract: undefined | RLNBaseContract; - private _signer: undefined | ethers.Signer; + public contract: undefined | RLNBaseContract; + public signer: undefined | ethers.Signer; protected keystore = Keystore.create(); - private _credentials: undefined | DecryptedCredentials; + public credentials: undefined | DecryptedCredentials; public zerokit: undefined | Zerokit; @@ -43,30 +43,6 @@ export class RLNCredentialsManager { this.zerokit = zerokit; } - public get contract(): undefined | RLNBaseContract { - return this._contract; - } - - public set contract(contract: RLNBaseContract | undefined) { - this._contract = contract; - } - - public get signer(): undefined | ethers.Signer { - return this._signer; - } - - public set signer(signer: ethers.Signer | undefined) { - this._signer = signer; - } - - public get credentials(): undefined | DecryptedCredentials { - return this._credentials; - } - - public set credentials(credentials: DecryptedCredentials | undefined) { - this._credentials = credentials; - } - public get provider(): undefined | ethers.providers.Provider { return this.contract?.provider; } @@ -102,12 +78,12 @@ export class RLNCredentialsManager { log.info("Using provided keystore"); } - this._credentials = credentials; - this._signer = signer!; - this._contract = new RLNBaseContract({ + this.credentials = credentials; + this.signer = signer!; + this.contract = new RLNBaseContract({ address: address!, signer: signer!, - rateLimit: rateLimit ?? this.zerokit?.getRateLimit + rateLimit: rateLimit ?? this.zerokit?.rateLimit }); log.info("RLNCredentialsManager successfully started"); @@ -160,8 +136,8 @@ export class RLNCredentialsManager { */ public async useCredentials(id: string, password: Password): Promise { log.info(`Attempting to use credentials with ID: ${id}`); - this._credentials = await this.keystore?.readCredential(id, password); - if (this._credentials) { + this.credentials = await this.keystore?.readCredential(id, password); + if (this.credentials) { log.info("Successfully loaded credentials"); } else { log.warn("Failed to load credentials"); diff --git a/packages/rln/src/rln.ts b/packages/rln/src/rln.ts index 98878756aa..ba709ed57c 100644 --- a/packages/rln/src/rln.ts +++ b/packages/rln/src/rln.ts @@ -58,6 +58,7 @@ export class RLNInstance extends RLNCredentialsManager { throw error; } } + private constructor(public zerokit: Zerokit) { super(zerokit); } diff --git a/packages/rln/src/zerokit.ts b/packages/rln/src/zerokit.ts index afcb6d4862..6fd9bd45f1 100644 --- a/packages/rln/src/zerokit.ts +++ b/packages/rln/src/zerokit.ts @@ -16,7 +16,7 @@ export class Zerokit { public constructor( private readonly zkRLN: number, private readonly witnessCalculator: WitnessCalculator, - private readonly rateLimit: number = DEFAULT_RATE_LIMIT + private readonly _rateLimit: number = DEFAULT_RATE_LIMIT ) {} public get getZkRLN(): number { @@ -27,8 +27,8 @@ export class Zerokit { return this.witnessCalculator; } - public get getRateLimit(): number { - return this.rateLimit; + public get rateLimit(): number { + return this._rateLimit; } public generateIdentityCredentials(): IdentityCredential {