@waku/rln 0.1.5-ea6daae.0 → 0.1.5-ec5db88.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -0
- package/bundle/_virtual/index2.js +1 -1
- package/bundle/_virtual/utils.js +2 -2
- package/bundle/_virtual/utils2.js +2 -2
- package/bundle/index.js +3 -1
- package/bundle/node_modules/@ethersproject/abi/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/abstract-provider/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/abstract-signer/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/address/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/bignumber/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/contracts/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/contracts/lib.esm/index.js +1 -1
- package/bundle/node_modules/@ethersproject/hash/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/keccak256/lib.esm/index.js +1 -1
- package/bundle/node_modules/{js-sha3 → @ethersproject/keccak256/node_modules/js-sha3}/src/sha3.js +2 -2
- package/bundle/node_modules/@ethersproject/networks/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/networks/lib.esm/index.js +1 -19
- package/bundle/node_modules/@ethersproject/properties/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/providers/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/signing-key/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/signing-key/lib.esm/elliptic.js +10 -58
- package/bundle/node_modules/@ethersproject/strings/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/transactions/lib.esm/_version.js +1 -1
- package/bundle/node_modules/@ethersproject/web/lib.esm/_version.js +1 -1
- package/bundle/packages/rln/dist/contract/abi.js +502 -248
- package/bundle/packages/rln/dist/contract/constants.js +5 -8
- package/bundle/packages/rln/dist/contract/rln_base_contract.js +465 -0
- package/bundle/packages/rln/dist/contract/rln_contract.js +31 -357
- package/bundle/packages/rln/dist/contract/types.js +9 -0
- package/bundle/packages/rln/dist/create.js +1 -1
- package/bundle/packages/rln/dist/credentials_manager.js +215 -0
- package/bundle/packages/rln/dist/keystore/cipher.js +3 -3
- package/bundle/packages/rln/dist/keystore/keystore.js +12 -7
- package/bundle/packages/rln/dist/rln.js +56 -166
- package/bundle/packages/rln/dist/zerokit.js +5 -5
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/lib/checksum.js +3 -3
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/lib/cipher.js +4 -4
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/lib/class.js +7 -7
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/lib/functional.js +7 -7
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/lib/index.js +6 -6
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/lib/kdf.js +5 -5
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/lib/password.js +1 -1
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/lib/schema-validation-generated.js +1 -1
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/lib/schema-validation.js +2 -2
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/lib/types.js +1 -1
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/ethereum-cryptography/aes.js +3 -3
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/ethereum-cryptography/pbkdf2.js +7 -7
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/ethereum-cryptography/random.js +3 -3
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/ethereum-cryptography/scrypt.js +3 -3
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/ethereum-cryptography/sha256.js +3 -3
- package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/ethereum-cryptography/utils.js +7 -7
- package/bundle/{node_modules/@chainsafe/bls-keystore → packages/rln}/node_modules/@noble/hashes/_assert.js +1 -1
- package/bundle/{node_modules/@chainsafe/bls-keystore → packages/rln}/node_modules/@noble/hashes/_sha2.js +3 -3
- package/bundle/{node_modules/@chainsafe/bls-keystore → packages/rln}/node_modules/@noble/hashes/_u64.js +1 -1
- package/bundle/{node_modules/@chainsafe/bls-keystore → packages/rln}/node_modules/@noble/hashes/cryptoBrowser.js +1 -1
- package/bundle/packages/rln/node_modules/@noble/hashes/esm/_assert.js +43 -0
- package/bundle/packages/rln/node_modules/@noble/hashes/esm/_sha2.js +116 -0
- package/bundle/packages/rln/node_modules/@noble/hashes/esm/hmac.js +79 -0
- package/bundle/packages/rln/node_modules/@noble/hashes/esm/sha256.js +126 -0
- package/bundle/packages/rln/node_modules/@noble/hashes/esm/utils.js +43 -0
- package/bundle/{node_modules/@chainsafe/bls-keystore → packages/rln}/node_modules/@noble/hashes/hmac.js +3 -3
- package/bundle/{node_modules/@chainsafe/bls-keystore → packages/rln}/node_modules/@noble/hashes/pbkdf2.js +4 -4
- package/bundle/{node_modules/@chainsafe/bls-keystore → packages/rln}/node_modules/@noble/hashes/scrypt.js +5 -5
- package/bundle/{node_modules/@chainsafe/bls-keystore → packages/rln}/node_modules/@noble/hashes/sha256.js +3 -3
- package/bundle/{node_modules/@chainsafe/bls-keystore → packages/rln}/node_modules/@noble/hashes/sha512.js +4 -4
- package/bundle/{node_modules/@chainsafe/bls-keystore → packages/rln}/node_modules/@noble/hashes/utils.js +2 -2
- package/dist/.tsbuildinfo +1 -1
- package/dist/codec.test-utils.d.ts +36 -0
- package/dist/codec.test-utils.js +56 -0
- package/dist/codec.test-utils.js.map +1 -0
- package/dist/contract/abi.d.ts +21 -17
- package/dist/contract/abi.js +502 -248
- package/dist/contract/abi.js.map +1 -1
- package/dist/contract/constants.d.ts +22 -18
- package/dist/contract/constants.js +3 -3
- package/dist/contract/constants.js.map +1 -1
- package/dist/contract/rln_base_contract.d.ts +90 -0
- package/dist/contract/rln_base_contract.js +448 -0
- package/dist/contract/rln_base_contract.js.map +1 -0
- package/dist/contract/rln_contract.d.ts +5 -115
- package/dist/contract/rln_contract.js +30 -355
- package/dist/contract/rln_contract.js.map +1 -1
- package/dist/contract/test-setup.d.ts +26 -0
- package/dist/contract/test-setup.js +56 -0
- package/dist/contract/test-setup.js.map +1 -0
- package/dist/contract/test-utils.d.ts +39 -0
- package/dist/contract/test-utils.js +118 -0
- package/dist/contract/test-utils.js.map +1 -0
- package/dist/contract/types.d.ts +45 -0
- package/dist/contract/types.js +8 -0
- package/dist/contract/types.js.map +1 -0
- package/dist/create.js +1 -1
- package/dist/create.js.map +1 -1
- package/dist/credentials_manager.d.ts +44 -0
- package/dist/credentials_manager.js +197 -0
- package/dist/credentials_manager.js.map +1 -0
- package/dist/index.d.ts +5 -2
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/keystore/keystore.js +11 -6
- package/dist/keystore/keystore.js.map +1 -1
- package/dist/keystore/types.d.ts +2 -1
- package/dist/rln.d.ts +9 -52
- package/dist/rln.js +54 -163
- package/dist/rln.js.map +1 -1
- package/dist/types.d.ts +27 -0
- package/dist/types.js +2 -0
- package/dist/types.js.map +1 -0
- package/dist/zerokit.d.ts +3 -3
- package/dist/zerokit.js +5 -5
- package/dist/zerokit.js.map +1 -1
- package/package.json +1 -1
- package/src/codec.test-utils.ts +80 -0
- package/src/contract/abi.ts +502 -248
- package/src/contract/constants.ts +3 -3
- package/src/contract/rln_base_contract.ts +684 -0
- package/src/contract/rln_contract.ts +37 -579
- package/src/contract/test-setup.ts +86 -0
- package/src/contract/test-utils.ts +179 -0
- package/src/contract/types.ts +53 -0
- package/src/create.ts +1 -1
- package/src/credentials_manager.ts +282 -0
- package/src/index.ts +17 -2
- package/src/keystore/keystore.ts +19 -10
- package/src/keystore/types.ts +2 -1
- package/src/rln.ts +67 -258
- package/src/types.ts +31 -0
- package/src/zerokit.ts +3 -3
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/index.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/md5.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/nil.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/parse.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/regex.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/rng.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/sha1.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/stringify.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/v1.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/v3.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/v35.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/v4.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/v5.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/validate.js +0 -0
- /package/bundle/{node_modules → packages/rln/node_modules}/@chainsafe/bls-keystore/node_modules/uuid/dist/esm-browser/version.js +0 -0
@@ -1,8 +1,8 @@
|
|
1
1
|
import { RLN_ABI } from "./abi.js";
|
2
2
|
|
3
|
-
export const
|
4
|
-
chainId:
|
5
|
-
address: "
|
3
|
+
export const LINEA_CONTRACT = {
|
4
|
+
chainId: 59141,
|
5
|
+
address: "0xb9cd878c90e49f797b4431fbf4fb333108cb90e6",
|
6
6
|
abi: RLN_ABI
|
7
7
|
};
|
8
8
|
|
@@ -0,0 +1,684 @@
|
|
1
|
+
import { Logger } from "@waku/utils";
|
2
|
+
import { ethers } from "ethers";
|
3
|
+
|
4
|
+
import { IdentityCredential } from "../identity.js";
|
5
|
+
import { DecryptedCredentials } from "../keystore/types.js";
|
6
|
+
|
7
|
+
import { RLN_ABI } from "./abi.js";
|
8
|
+
import { DEFAULT_RATE_LIMIT, RATE_LIMIT_PARAMS } from "./constants.js";
|
9
|
+
import {
|
10
|
+
CustomQueryOptions,
|
11
|
+
FetchMembersOptions,
|
12
|
+
Member,
|
13
|
+
MembershipInfo,
|
14
|
+
MembershipRegisteredEvent,
|
15
|
+
MembershipState,
|
16
|
+
RLNContractInitOptions
|
17
|
+
} from "./types.js";
|
18
|
+
|
19
|
+
const log = new Logger("waku:rln:contract:base");
|
20
|
+
|
21
|
+
export class RLNBaseContract {
|
22
|
+
public contract: ethers.Contract;
|
23
|
+
private deployBlock: undefined | number;
|
24
|
+
private rateLimit: number;
|
25
|
+
|
26
|
+
protected _members: Map<number, Member> = new Map();
|
27
|
+
private _membersFilter: ethers.EventFilter;
|
28
|
+
private _membershipErasedFilter: ethers.EventFilter;
|
29
|
+
private _membersExpiredFilter: ethers.EventFilter;
|
30
|
+
|
31
|
+
/**
|
32
|
+
* Constructor for RLNBaseContract.
|
33
|
+
* Allows injecting a mocked contract for testing purposes.
|
34
|
+
*/
|
35
|
+
public constructor(options: RLNContractInitOptions) {
|
36
|
+
const {
|
37
|
+
address,
|
38
|
+
signer,
|
39
|
+
rateLimit = DEFAULT_RATE_LIMIT,
|
40
|
+
contract
|
41
|
+
} = options;
|
42
|
+
|
43
|
+
this.contract = contract || new ethers.Contract(address, RLN_ABI, signer);
|
44
|
+
this.rateLimit = rateLimit;
|
45
|
+
|
46
|
+
// Initialize event filters
|
47
|
+
this._membersFilter = this.contract.filters.MembershipRegistered();
|
48
|
+
this._membershipErasedFilter = this.contract.filters.MembershipErased();
|
49
|
+
this._membersExpiredFilter = this.contract.filters.MembershipExpired();
|
50
|
+
|
51
|
+
// Initialize members and subscriptions
|
52
|
+
this.fetchMembers()
|
53
|
+
.then(() => {
|
54
|
+
this.subscribeToMembers();
|
55
|
+
})
|
56
|
+
.catch((error) => {
|
57
|
+
log.error("Failed to initialize members", { error });
|
58
|
+
});
|
59
|
+
|
60
|
+
// Validate rate limit asynchronously
|
61
|
+
this.validateRateLimit(rateLimit).catch((error) => {
|
62
|
+
log.error("Failed to validate initial rate limit", { error });
|
63
|
+
});
|
64
|
+
}
|
65
|
+
|
66
|
+
/**
|
67
|
+
* Gets the current rate limit for this contract instance
|
68
|
+
*/
|
69
|
+
public getRateLimit(): number {
|
70
|
+
return this.rateLimit;
|
71
|
+
}
|
72
|
+
|
73
|
+
/**
|
74
|
+
* Gets the contract address
|
75
|
+
*/
|
76
|
+
public get address(): string {
|
77
|
+
return this.contract.address;
|
78
|
+
}
|
79
|
+
|
80
|
+
/**
|
81
|
+
* Gets the contract provider
|
82
|
+
*/
|
83
|
+
public get provider(): ethers.providers.Provider {
|
84
|
+
return this.contract.provider;
|
85
|
+
}
|
86
|
+
|
87
|
+
/**
|
88
|
+
* Gets the minimum allowed rate limit from the contract
|
89
|
+
* @returns Promise<number> The minimum rate limit in messages per epoch
|
90
|
+
*/
|
91
|
+
public async getMinRateLimit(): Promise<number> {
|
92
|
+
const minRate = await this.contract.minMembershipRateLimit();
|
93
|
+
return ethers.BigNumber.from(minRate).toNumber();
|
94
|
+
}
|
95
|
+
|
96
|
+
/**
|
97
|
+
* Gets the maximum allowed rate limit from the contract
|
98
|
+
* @returns Promise<number> The maximum rate limit in messages per epoch
|
99
|
+
*/
|
100
|
+
public async getMaxRateLimit(): Promise<number> {
|
101
|
+
const maxRate = await this.contract.maxMembershipRateLimit();
|
102
|
+
return ethers.BigNumber.from(maxRate).toNumber();
|
103
|
+
}
|
104
|
+
|
105
|
+
/**
|
106
|
+
* Gets the maximum total rate limit across all memberships
|
107
|
+
* @returns Promise<number> The maximum total rate limit in messages per epoch
|
108
|
+
*/
|
109
|
+
public async getMaxTotalRateLimit(): Promise<number> {
|
110
|
+
const maxTotalRate = await this.contract.maxTotalRateLimit();
|
111
|
+
return maxTotalRate.toNumber();
|
112
|
+
}
|
113
|
+
|
114
|
+
/**
|
115
|
+
* Gets the current total rate limit usage across all memberships
|
116
|
+
* @returns Promise<number> The current total rate limit usage in messages per epoch
|
117
|
+
*/
|
118
|
+
public async getCurrentTotalRateLimit(): Promise<number> {
|
119
|
+
const currentTotal = await this.contract.currentTotalRateLimit();
|
120
|
+
return currentTotal.toNumber();
|
121
|
+
}
|
122
|
+
|
123
|
+
/**
|
124
|
+
* Gets the remaining available total rate limit that can be allocated
|
125
|
+
* @returns Promise<number> The remaining rate limit that can be allocated
|
126
|
+
*/
|
127
|
+
public async getRemainingTotalRateLimit(): Promise<number> {
|
128
|
+
const [maxTotal, currentTotal] = await Promise.all([
|
129
|
+
this.contract.maxTotalRateLimit(),
|
130
|
+
this.contract.currentTotalRateLimit()
|
131
|
+
]);
|
132
|
+
return Number(maxTotal) - Number(currentTotal);
|
133
|
+
}
|
134
|
+
|
135
|
+
/**
|
136
|
+
* Updates the rate limit for future registrations
|
137
|
+
* @param newRateLimit The new rate limit to use
|
138
|
+
*/
|
139
|
+
public async setRateLimit(newRateLimit: number): Promise<void> {
|
140
|
+
await this.validateRateLimit(newRateLimit);
|
141
|
+
this.rateLimit = newRateLimit;
|
142
|
+
}
|
143
|
+
|
144
|
+
public get members(): Member[] {
|
145
|
+
const sortedMembers = Array.from(this._members.values()).sort(
|
146
|
+
(left, right) => left.index.toNumber() - right.index.toNumber()
|
147
|
+
);
|
148
|
+
return sortedMembers;
|
149
|
+
}
|
150
|
+
|
151
|
+
public async fetchMembers(options: FetchMembersOptions = {}): Promise<void> {
|
152
|
+
const registeredMemberEvents = await RLNBaseContract.queryFilter(
|
153
|
+
this.contract,
|
154
|
+
{
|
155
|
+
fromBlock: this.deployBlock,
|
156
|
+
...options,
|
157
|
+
membersFilter: this.membersFilter
|
158
|
+
}
|
159
|
+
);
|
160
|
+
const removedMemberEvents = await RLNBaseContract.queryFilter(
|
161
|
+
this.contract,
|
162
|
+
{
|
163
|
+
fromBlock: this.deployBlock,
|
164
|
+
...options,
|
165
|
+
membersFilter: this.membershipErasedFilter
|
166
|
+
}
|
167
|
+
);
|
168
|
+
const expiredMemberEvents = await RLNBaseContract.queryFilter(
|
169
|
+
this.contract,
|
170
|
+
{
|
171
|
+
fromBlock: this.deployBlock,
|
172
|
+
...options,
|
173
|
+
membersFilter: this.membersExpiredFilter
|
174
|
+
}
|
175
|
+
);
|
176
|
+
|
177
|
+
const events = [
|
178
|
+
...registeredMemberEvents,
|
179
|
+
...removedMemberEvents,
|
180
|
+
...expiredMemberEvents
|
181
|
+
];
|
182
|
+
this.processEvents(events);
|
183
|
+
}
|
184
|
+
|
185
|
+
public static async queryFilter(
|
186
|
+
contract: ethers.Contract,
|
187
|
+
options: CustomQueryOptions
|
188
|
+
): Promise<ethers.Event[]> {
|
189
|
+
const FETCH_CHUNK = 5;
|
190
|
+
const BLOCK_RANGE = 3000;
|
191
|
+
|
192
|
+
const {
|
193
|
+
fromBlock,
|
194
|
+
membersFilter,
|
195
|
+
fetchRange = BLOCK_RANGE,
|
196
|
+
fetchChunks = FETCH_CHUNK
|
197
|
+
} = options;
|
198
|
+
|
199
|
+
if (fromBlock === undefined) {
|
200
|
+
return contract.queryFilter(membersFilter);
|
201
|
+
}
|
202
|
+
|
203
|
+
if (!contract.provider) {
|
204
|
+
throw Error("No provider found on the contract.");
|
205
|
+
}
|
206
|
+
|
207
|
+
const toBlock = await contract.provider.getBlockNumber();
|
208
|
+
|
209
|
+
if (toBlock - fromBlock < fetchRange) {
|
210
|
+
return contract.queryFilter(membersFilter, fromBlock, toBlock);
|
211
|
+
}
|
212
|
+
|
213
|
+
const events: ethers.Event[][] = [];
|
214
|
+
const chunks = RLNBaseContract.splitToChunks(
|
215
|
+
fromBlock,
|
216
|
+
toBlock,
|
217
|
+
fetchRange
|
218
|
+
);
|
219
|
+
|
220
|
+
for (const portion of RLNBaseContract.takeN<[number, number]>(
|
221
|
+
chunks,
|
222
|
+
fetchChunks
|
223
|
+
)) {
|
224
|
+
const promises = portion.map(([left, right]) =>
|
225
|
+
RLNBaseContract.ignoreErrors(
|
226
|
+
contract.queryFilter(membersFilter, left, right),
|
227
|
+
[]
|
228
|
+
)
|
229
|
+
);
|
230
|
+
const fetchedEvents = await Promise.all(promises);
|
231
|
+
events.push(fetchedEvents.flatMap((v) => v));
|
232
|
+
}
|
233
|
+
|
234
|
+
return events.flatMap((v) => v);
|
235
|
+
}
|
236
|
+
|
237
|
+
public processEvents(events: ethers.Event[]): void {
|
238
|
+
const toRemoveTable = new Map<number, number[]>();
|
239
|
+
const toInsertTable = new Map<number, ethers.Event[]>();
|
240
|
+
|
241
|
+
events.forEach((evt) => {
|
242
|
+
if (!evt.args) {
|
243
|
+
return;
|
244
|
+
}
|
245
|
+
|
246
|
+
if (
|
247
|
+
evt.event === "MembershipErased" ||
|
248
|
+
evt.event === "MembershipExpired"
|
249
|
+
) {
|
250
|
+
let index = evt.args.index;
|
251
|
+
|
252
|
+
if (!index) {
|
253
|
+
return;
|
254
|
+
}
|
255
|
+
|
256
|
+
if (typeof index === "number" || typeof index === "string") {
|
257
|
+
index = ethers.BigNumber.from(index);
|
258
|
+
}
|
259
|
+
|
260
|
+
const toRemoveVal = toRemoveTable.get(evt.blockNumber);
|
261
|
+
if (toRemoveVal != undefined) {
|
262
|
+
toRemoveVal.push(index.toNumber());
|
263
|
+
toRemoveTable.set(evt.blockNumber, toRemoveVal);
|
264
|
+
} else {
|
265
|
+
toRemoveTable.set(evt.blockNumber, [index.toNumber()]);
|
266
|
+
}
|
267
|
+
} else if (evt.event === "MembershipRegistered") {
|
268
|
+
let eventsPerBlock = toInsertTable.get(evt.blockNumber);
|
269
|
+
if (eventsPerBlock == undefined) {
|
270
|
+
eventsPerBlock = [];
|
271
|
+
}
|
272
|
+
|
273
|
+
eventsPerBlock.push(evt);
|
274
|
+
toInsertTable.set(evt.blockNumber, eventsPerBlock);
|
275
|
+
}
|
276
|
+
});
|
277
|
+
}
|
278
|
+
|
279
|
+
public static splitToChunks(
|
280
|
+
from: number,
|
281
|
+
to: number,
|
282
|
+
step: number
|
283
|
+
): Array<[number, number]> {
|
284
|
+
const chunks: Array<[number, number]> = [];
|
285
|
+
|
286
|
+
let left = from;
|
287
|
+
while (left < to) {
|
288
|
+
const right = left + step < to ? left + step : to;
|
289
|
+
|
290
|
+
chunks.push([left, right] as [number, number]);
|
291
|
+
|
292
|
+
left = right;
|
293
|
+
}
|
294
|
+
|
295
|
+
return chunks;
|
296
|
+
}
|
297
|
+
|
298
|
+
public static *takeN<T>(array: T[], size: number): Iterable<T[]> {
|
299
|
+
let start = 0;
|
300
|
+
|
301
|
+
while (start < array.length) {
|
302
|
+
const portion = array.slice(start, start + size);
|
303
|
+
|
304
|
+
yield portion;
|
305
|
+
|
306
|
+
start += size;
|
307
|
+
}
|
308
|
+
}
|
309
|
+
|
310
|
+
public static async ignoreErrors<T>(
|
311
|
+
promise: Promise<T>,
|
312
|
+
defaultValue: T
|
313
|
+
): Promise<T> {
|
314
|
+
try {
|
315
|
+
return await promise;
|
316
|
+
} catch (err: unknown) {
|
317
|
+
if (err instanceof Error) {
|
318
|
+
log.info(`Ignoring an error during query: ${err.message}`);
|
319
|
+
} else {
|
320
|
+
log.info(`Ignoring an unknown error during query`);
|
321
|
+
}
|
322
|
+
return defaultValue;
|
323
|
+
}
|
324
|
+
}
|
325
|
+
|
326
|
+
public subscribeToMembers(): void {
|
327
|
+
this.contract.on(
|
328
|
+
this.membersFilter,
|
329
|
+
(
|
330
|
+
_idCommitment: string,
|
331
|
+
_membershipRateLimit: ethers.BigNumber,
|
332
|
+
_index: ethers.BigNumber,
|
333
|
+
event: ethers.Event
|
334
|
+
) => {
|
335
|
+
this.processEvents([event]);
|
336
|
+
}
|
337
|
+
);
|
338
|
+
|
339
|
+
this.contract.on(
|
340
|
+
this.membershipErasedFilter,
|
341
|
+
(
|
342
|
+
_idCommitment: string,
|
343
|
+
_membershipRateLimit: ethers.BigNumber,
|
344
|
+
_index: ethers.BigNumber,
|
345
|
+
event: ethers.Event
|
346
|
+
) => {
|
347
|
+
this.processEvents([event]);
|
348
|
+
}
|
349
|
+
);
|
350
|
+
|
351
|
+
this.contract.on(
|
352
|
+
this.membersExpiredFilter,
|
353
|
+
(
|
354
|
+
_idCommitment: string,
|
355
|
+
_membershipRateLimit: ethers.BigNumber,
|
356
|
+
_index: ethers.BigNumber,
|
357
|
+
event: ethers.Event
|
358
|
+
) => {
|
359
|
+
this.processEvents([event]);
|
360
|
+
}
|
361
|
+
);
|
362
|
+
}
|
363
|
+
|
364
|
+
public async getMembershipInfo(
|
365
|
+
idCommitmentBigInt: bigint
|
366
|
+
): Promise<MembershipInfo | undefined> {
|
367
|
+
try {
|
368
|
+
const membershipData =
|
369
|
+
await this.contract.memberships(idCommitmentBigInt);
|
370
|
+
const currentBlock = await this.contract.provider.getBlockNumber();
|
371
|
+
|
372
|
+
let state: MembershipState;
|
373
|
+
const gracePeriodEnd = membershipData.gracePeriodStartTimestamp.add(
|
374
|
+
membershipData.gracePeriodDuration
|
375
|
+
);
|
376
|
+
|
377
|
+
if (currentBlock < membershipData.gracePeriodStartTimestamp) {
|
378
|
+
state = MembershipState.Active;
|
379
|
+
} else if (currentBlock < gracePeriodEnd) {
|
380
|
+
state = MembershipState.GracePeriod;
|
381
|
+
} else {
|
382
|
+
state = MembershipState.Expired;
|
383
|
+
}
|
384
|
+
|
385
|
+
return {
|
386
|
+
index: membershipData.index,
|
387
|
+
idCommitment: membershipData.idCommitment,
|
388
|
+
rateLimit: membershipData.rateLimit.toNumber(),
|
389
|
+
startBlock: membershipData.gracePeriodStartTimestamp.toNumber(),
|
390
|
+
endBlock: gracePeriodEnd.toNumber(),
|
391
|
+
state,
|
392
|
+
depositAmount: membershipData.depositAmount,
|
393
|
+
activeDuration: membershipData.activeDuration,
|
394
|
+
gracePeriodDuration: membershipData.gracePeriodDuration,
|
395
|
+
holder: membershipData.holder,
|
396
|
+
token: membershipData.token
|
397
|
+
};
|
398
|
+
} catch (error) {
|
399
|
+
return undefined;
|
400
|
+
}
|
401
|
+
}
|
402
|
+
|
403
|
+
public async extendMembership(
|
404
|
+
idCommitment: string
|
405
|
+
): Promise<ethers.ContractTransaction> {
|
406
|
+
return this.contract.extendMemberships([idCommitment]);
|
407
|
+
}
|
408
|
+
|
409
|
+
public async eraseMembership(
|
410
|
+
idCommitment: string,
|
411
|
+
eraseFromMembershipSet: boolean = true
|
412
|
+
): Promise<ethers.ContractTransaction> {
|
413
|
+
return this.contract.eraseMemberships(
|
414
|
+
[idCommitment],
|
415
|
+
eraseFromMembershipSet
|
416
|
+
);
|
417
|
+
}
|
418
|
+
|
419
|
+
public async registerMembership(
|
420
|
+
idCommitment: string,
|
421
|
+
rateLimit: number = DEFAULT_RATE_LIMIT
|
422
|
+
): Promise<ethers.ContractTransaction> {
|
423
|
+
if (
|
424
|
+
rateLimit < RATE_LIMIT_PARAMS.MIN_RATE ||
|
425
|
+
rateLimit > RATE_LIMIT_PARAMS.MAX_RATE
|
426
|
+
) {
|
427
|
+
throw new Error(
|
428
|
+
`Rate limit must be between ${RATE_LIMIT_PARAMS.MIN_RATE} and ${RATE_LIMIT_PARAMS.MAX_RATE}`
|
429
|
+
);
|
430
|
+
}
|
431
|
+
return this.contract.register(idCommitment, rateLimit, []);
|
432
|
+
}
|
433
|
+
|
434
|
+
public async withdraw(token: string): Promise<void> {
|
435
|
+
try {
|
436
|
+
const tx = await this.contract.withdraw(token);
|
437
|
+
await tx.wait();
|
438
|
+
} catch (error) {
|
439
|
+
log.error(`Error in withdraw: ${(error as Error).message}`);
|
440
|
+
}
|
441
|
+
}
|
442
|
+
|
443
|
+
public async registerWithIdentity(
|
444
|
+
identity: IdentityCredential
|
445
|
+
): Promise<DecryptedCredentials | undefined> {
|
446
|
+
try {
|
447
|
+
log.info(
|
448
|
+
`Registering identity with rate limit: ${this.rateLimit} messages/epoch`
|
449
|
+
);
|
450
|
+
|
451
|
+
// Check if the ID commitment is already registered
|
452
|
+
const existingIndex = await this.getMemberIndex(
|
453
|
+
identity.IDCommitmentBigInt.toString()
|
454
|
+
);
|
455
|
+
if (existingIndex) {
|
456
|
+
throw new Error(
|
457
|
+
`ID commitment is already registered with index ${existingIndex}`
|
458
|
+
);
|
459
|
+
}
|
460
|
+
|
461
|
+
// Check if there's enough remaining rate limit
|
462
|
+
const remainingRateLimit = await this.getRemainingTotalRateLimit();
|
463
|
+
if (remainingRateLimit < this.rateLimit) {
|
464
|
+
throw new Error(
|
465
|
+
`Not enough remaining rate limit. Requested: ${this.rateLimit}, Available: ${remainingRateLimit}`
|
466
|
+
);
|
467
|
+
}
|
468
|
+
|
469
|
+
const estimatedGas = await this.contract.estimateGas.register(
|
470
|
+
identity.IDCommitmentBigInt,
|
471
|
+
this.rateLimit,
|
472
|
+
[]
|
473
|
+
);
|
474
|
+
const gasLimit = estimatedGas.add(10000);
|
475
|
+
|
476
|
+
const txRegisterResponse: ethers.ContractTransaction =
|
477
|
+
await this.contract.register(
|
478
|
+
identity.IDCommitmentBigInt,
|
479
|
+
this.rateLimit,
|
480
|
+
[],
|
481
|
+
{ gasLimit }
|
482
|
+
);
|
483
|
+
|
484
|
+
const txRegisterReceipt = await txRegisterResponse.wait();
|
485
|
+
|
486
|
+
if (txRegisterReceipt.status === 0) {
|
487
|
+
throw new Error("Transaction failed on-chain");
|
488
|
+
}
|
489
|
+
|
490
|
+
const memberRegistered = txRegisterReceipt.events?.find(
|
491
|
+
(event) => event.event === "MembershipRegistered"
|
492
|
+
);
|
493
|
+
|
494
|
+
if (!memberRegistered || !memberRegistered.args) {
|
495
|
+
log.error(
|
496
|
+
"Failed to register membership: No MembershipRegistered event found"
|
497
|
+
);
|
498
|
+
return undefined;
|
499
|
+
}
|
500
|
+
|
501
|
+
const decodedData: MembershipRegisteredEvent = {
|
502
|
+
idCommitment: memberRegistered.args.idCommitment,
|
503
|
+
membershipRateLimit: memberRegistered.args.membershipRateLimit,
|
504
|
+
index: memberRegistered.args.index
|
505
|
+
};
|
506
|
+
|
507
|
+
log.info(
|
508
|
+
`Successfully registered membership with index ${decodedData.index} ` +
|
509
|
+
`and rate limit ${decodedData.membershipRateLimit}`
|
510
|
+
);
|
511
|
+
|
512
|
+
const network = await this.contract.provider.getNetwork();
|
513
|
+
const address = this.contract.address;
|
514
|
+
const membershipId = Number(decodedData.index);
|
515
|
+
|
516
|
+
return {
|
517
|
+
identity,
|
518
|
+
membership: {
|
519
|
+
address,
|
520
|
+
treeIndex: membershipId,
|
521
|
+
chainId: network.chainId.toString(),
|
522
|
+
rateLimit: decodedData.membershipRateLimit.toNumber()
|
523
|
+
}
|
524
|
+
};
|
525
|
+
} catch (error) {
|
526
|
+
if (error instanceof Error) {
|
527
|
+
const errorMessage = error.message;
|
528
|
+
log.error("registerWithIdentity - error message:", errorMessage);
|
529
|
+
log.error("registerWithIdentity - error stack:", error.stack);
|
530
|
+
|
531
|
+
// Try to extract more specific error information
|
532
|
+
if (errorMessage.includes("CannotExceedMaxTotalRateLimit")) {
|
533
|
+
throw new Error(
|
534
|
+
"Registration failed: Cannot exceed maximum total rate limit"
|
535
|
+
);
|
536
|
+
} else if (errorMessage.includes("InvalidIdCommitment")) {
|
537
|
+
throw new Error("Registration failed: Invalid ID commitment");
|
538
|
+
} else if (errorMessage.includes("InvalidMembershipRateLimit")) {
|
539
|
+
throw new Error("Registration failed: Invalid membership rate limit");
|
540
|
+
} else if (errorMessage.includes("execution reverted")) {
|
541
|
+
throw new Error(
|
542
|
+
"Contract execution reverted. Check contract requirements."
|
543
|
+
);
|
544
|
+
} else {
|
545
|
+
throw new Error(`Error in registerWithIdentity: ${errorMessage}`);
|
546
|
+
}
|
547
|
+
} else {
|
548
|
+
throw new Error("Unknown error in registerWithIdentity", {
|
549
|
+
cause: error
|
550
|
+
});
|
551
|
+
}
|
552
|
+
}
|
553
|
+
}
|
554
|
+
|
555
|
+
public async registerWithPermitAndErase(
|
556
|
+
identity: IdentityCredential,
|
557
|
+
permit: {
|
558
|
+
owner: string;
|
559
|
+
deadline: number;
|
560
|
+
v: number;
|
561
|
+
r: string;
|
562
|
+
s: string;
|
563
|
+
},
|
564
|
+
idCommitmentsToErase: string[]
|
565
|
+
): Promise<DecryptedCredentials | undefined> {
|
566
|
+
try {
|
567
|
+
log.info(
|
568
|
+
`Registering identity with permit and rate limit: ${this.rateLimit} messages/epoch`
|
569
|
+
);
|
570
|
+
|
571
|
+
const txRegisterResponse: ethers.ContractTransaction =
|
572
|
+
await this.contract.registerWithPermit(
|
573
|
+
permit.owner,
|
574
|
+
permit.deadline,
|
575
|
+
permit.v,
|
576
|
+
permit.r,
|
577
|
+
permit.s,
|
578
|
+
identity.IDCommitmentBigInt,
|
579
|
+
this.rateLimit,
|
580
|
+
idCommitmentsToErase.map((id) => ethers.BigNumber.from(id))
|
581
|
+
);
|
582
|
+
const txRegisterReceipt = await txRegisterResponse.wait();
|
583
|
+
|
584
|
+
const memberRegistered = txRegisterReceipt.events?.find(
|
585
|
+
(event) => event.event === "MembershipRegistered"
|
586
|
+
);
|
587
|
+
|
588
|
+
if (!memberRegistered || !memberRegistered.args) {
|
589
|
+
log.error(
|
590
|
+
"Failed to register membership with permit: No MembershipRegistered event found"
|
591
|
+
);
|
592
|
+
return undefined;
|
593
|
+
}
|
594
|
+
|
595
|
+
const decodedData: MembershipRegisteredEvent = {
|
596
|
+
idCommitment: memberRegistered.args.idCommitment,
|
597
|
+
membershipRateLimit: memberRegistered.args.membershipRateLimit,
|
598
|
+
index: memberRegistered.args.index
|
599
|
+
};
|
600
|
+
|
601
|
+
log.info(
|
602
|
+
`Successfully registered membership with permit. Index: ${decodedData.index}, ` +
|
603
|
+
`Rate limit: ${decodedData.membershipRateLimit}, Erased ${idCommitmentsToErase.length} commitments`
|
604
|
+
);
|
605
|
+
|
606
|
+
const network = await this.contract.provider.getNetwork();
|
607
|
+
const address = this.contract.address;
|
608
|
+
const membershipId = Number(decodedData.index);
|
609
|
+
|
610
|
+
return {
|
611
|
+
identity,
|
612
|
+
membership: {
|
613
|
+
address,
|
614
|
+
treeIndex: membershipId,
|
615
|
+
chainId: network.chainId.toString(),
|
616
|
+
rateLimit: decodedData.membershipRateLimit.toNumber()
|
617
|
+
}
|
618
|
+
};
|
619
|
+
} catch (error) {
|
620
|
+
log.error(
|
621
|
+
`Error in registerWithPermitAndErase: ${(error as Error).message}`
|
622
|
+
);
|
623
|
+
return undefined;
|
624
|
+
}
|
625
|
+
}
|
626
|
+
|
627
|
+
/**
|
628
|
+
* Validates that the rate limit is within the allowed range
|
629
|
+
* @throws Error if the rate limit is outside the allowed range
|
630
|
+
*/
|
631
|
+
private async validateRateLimit(rateLimit: number): Promise<void> {
|
632
|
+
const [minRate, maxRate] = await Promise.all([
|
633
|
+
this.contract.minMembershipRateLimit(),
|
634
|
+
this.contract.maxMembershipRateLimit()
|
635
|
+
]);
|
636
|
+
|
637
|
+
const minRateNum = ethers.BigNumber.from(minRate).toNumber();
|
638
|
+
const maxRateNum = ethers.BigNumber.from(maxRate).toNumber();
|
639
|
+
|
640
|
+
if (rateLimit < minRateNum || rateLimit > maxRateNum) {
|
641
|
+
throw new Error(
|
642
|
+
`Rate limit must be between ${minRateNum} and ${maxRateNum} messages per epoch`
|
643
|
+
);
|
644
|
+
}
|
645
|
+
}
|
646
|
+
|
647
|
+
private get membersFilter(): ethers.EventFilter {
|
648
|
+
if (!this._membersFilter) {
|
649
|
+
throw Error("Members filter was not initialized.");
|
650
|
+
}
|
651
|
+
return this._membersFilter;
|
652
|
+
}
|
653
|
+
|
654
|
+
private get membershipErasedFilter(): ethers.EventFilter {
|
655
|
+
if (!this._membershipErasedFilter) {
|
656
|
+
throw Error("MembershipErased filter was not initialized.");
|
657
|
+
}
|
658
|
+
return this._membershipErasedFilter;
|
659
|
+
}
|
660
|
+
|
661
|
+
private get membersExpiredFilter(): ethers.EventFilter {
|
662
|
+
if (!this._membersExpiredFilter) {
|
663
|
+
throw Error("MembersExpired filter was not initialized.");
|
664
|
+
}
|
665
|
+
return this._membersExpiredFilter;
|
666
|
+
}
|
667
|
+
|
668
|
+
private async getMemberIndex(
|
669
|
+
idCommitment: string
|
670
|
+
): Promise<ethers.BigNumber | undefined> {
|
671
|
+
try {
|
672
|
+
const events = await this.contract.queryFilter(
|
673
|
+
this.contract.filters.MembershipRegistered(idCommitment)
|
674
|
+
);
|
675
|
+
if (events.length === 0) return undefined;
|
676
|
+
|
677
|
+
// Get the most recent registration event
|
678
|
+
const event = events[events.length - 1];
|
679
|
+
return event.args?.index;
|
680
|
+
} catch (error) {
|
681
|
+
return undefined;
|
682
|
+
}
|
683
|
+
}
|
684
|
+
}
|