@waku/rln 0.1.4 → 0.1.5-5e19700.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/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 +4 -4
- package/bundle/packages/rln/dist/contract/rln_contract.js +120 -36
- package/bundle/packages/rln/dist/contract/rln_light_contract.js +473 -0
- package/bundle/packages/rln/dist/keystore/cipher.js +3 -3
- package/bundle/packages/rln/dist/keystore/keystore.js +3 -2
- package/bundle/packages/rln/dist/rln.js +6 -6
- package/bundle/packages/rln/dist/rln_light.js +149 -0
- 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_contract.d.ts +10 -3
- package/dist/contract/rln_contract.js +120 -36
- package/dist/contract/rln_contract.js.map +1 -1
- package/dist/contract/rln_light_contract.d.ts +124 -0
- package/dist/contract/rln_light_contract.js +456 -0
- package/dist/contract/rln_light_contract.js.map +1 -0
- 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/index.d.ts +5 -2
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/keystore/keystore.js +2 -1
- package/dist/keystore/keystore.js.map +1 -1
- package/dist/keystore/types.d.ts +1 -0
- package/dist/rln.d.ts +1 -1
- package/dist/rln.js +6 -6
- package/dist/rln.js.map +1 -1
- package/dist/rln_light.d.ts +64 -0
- package/dist/rln_light.js +144 -0
- package/dist/rln_light.js.map +1 -0
- package/package.json +1 -91
- 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_contract.ts +158 -46
- package/src/contract/rln_light_contract.ts +718 -0
- package/src/contract/test-setup.ts +86 -0
- package/src/contract/test-utils.ts +179 -0
- package/src/index.ts +17 -2
- package/src/keystore/keystore.ts +2 -1
- package/src/keystore/types.ts +1 -0
- package/src/rln.ts +7 -7
- package/src/rln_light.ts +235 -0
- /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
@@ -0,0 +1,473 @@
|
|
1
|
+
import '../../../interfaces/dist/protocols.js';
|
2
|
+
import '../../../interfaces/dist/connection_manager.js';
|
3
|
+
import '../../../interfaces/dist/health_indicator.js';
|
4
|
+
import '../../../../node_modules/multiformats/dist/src/bases/base10.js';
|
5
|
+
import '../../../../node_modules/multiformats/dist/src/bases/base16.js';
|
6
|
+
import '../../../../node_modules/multiformats/dist/src/bases/base2.js';
|
7
|
+
import '../../../../node_modules/multiformats/dist/src/bases/base256emoji.js';
|
8
|
+
import '../../../../node_modules/multiformats/dist/src/bases/base32.js';
|
9
|
+
import '../../../../node_modules/multiformats/dist/src/bases/base36.js';
|
10
|
+
import '../../../../node_modules/multiformats/dist/src/bases/base58.js';
|
11
|
+
import '../../../../node_modules/multiformats/dist/src/bases/base64.js';
|
12
|
+
import '../../../../node_modules/multiformats/dist/src/bases/base8.js';
|
13
|
+
import '../../../../node_modules/multiformats/dist/src/bases/identity.js';
|
14
|
+
import '../../../../node_modules/multiformats/dist/src/codecs/json.js';
|
15
|
+
import { Logger } from '../../../utils/dist/logger/index.js';
|
16
|
+
import { RLN_ABI } from './abi.js';
|
17
|
+
import { DEFAULT_RATE_LIMIT, RATE_LIMIT_PARAMS } from './constants.js';
|
18
|
+
import { Contract } from '../../../../node_modules/@ethersproject/contracts/lib.esm/index.js';
|
19
|
+
import { BigNumber } from '../../../../node_modules/@ethersproject/bignumber/lib.esm/bignumber.js';
|
20
|
+
|
21
|
+
const log = new Logger("waku:rln:contract");
|
22
|
+
var MembershipState;
|
23
|
+
(function (MembershipState) {
|
24
|
+
MembershipState["Active"] = "Active";
|
25
|
+
MembershipState["GracePeriod"] = "GracePeriod";
|
26
|
+
MembershipState["Expired"] = "Expired";
|
27
|
+
MembershipState["ErasedAwaitsWithdrawal"] = "ErasedAwaitsWithdrawal";
|
28
|
+
})(MembershipState || (MembershipState = {}));
|
29
|
+
class RLNLightContract {
|
30
|
+
contract;
|
31
|
+
deployBlock;
|
32
|
+
rateLimit;
|
33
|
+
_members = new Map();
|
34
|
+
_membersFilter;
|
35
|
+
_membershipErasedFilter;
|
36
|
+
_membersExpiredFilter;
|
37
|
+
/**
|
38
|
+
* Asynchronous initializer for RLNContract.
|
39
|
+
* Allows injecting a mocked contract for testing purposes.
|
40
|
+
*/
|
41
|
+
static async init(options) {
|
42
|
+
const rlnContract = new RLNLightContract(options);
|
43
|
+
await rlnContract.fetchMembers();
|
44
|
+
rlnContract.subscribeToMembers();
|
45
|
+
return rlnContract;
|
46
|
+
}
|
47
|
+
constructor(options) {
|
48
|
+
const { address, signer, rateLimit = DEFAULT_RATE_LIMIT, contract } = options;
|
49
|
+
if (rateLimit < RATE_LIMIT_PARAMS.MIN_RATE ||
|
50
|
+
rateLimit > RATE_LIMIT_PARAMS.MAX_RATE) {
|
51
|
+
throw new Error(`Rate limit must be between ${RATE_LIMIT_PARAMS.MIN_RATE} and ${RATE_LIMIT_PARAMS.MAX_RATE} messages per epoch`);
|
52
|
+
}
|
53
|
+
this.rateLimit = rateLimit;
|
54
|
+
// Use the injected contract if provided; otherwise, instantiate a new one.
|
55
|
+
this.contract = contract || new Contract(address, RLN_ABI, signer);
|
56
|
+
// Initialize event filters
|
57
|
+
this._membersFilter = this.contract.filters.MembershipRegistered();
|
58
|
+
this._membershipErasedFilter = this.contract.filters.MembershipErased();
|
59
|
+
this._membersExpiredFilter = this.contract.filters.MembershipExpired();
|
60
|
+
}
|
61
|
+
/**
|
62
|
+
* Gets the current rate limit for this contract instance
|
63
|
+
*/
|
64
|
+
getRateLimit() {
|
65
|
+
return this.rateLimit;
|
66
|
+
}
|
67
|
+
/**
|
68
|
+
* Gets the contract address
|
69
|
+
*/
|
70
|
+
get address() {
|
71
|
+
return this.contract.address;
|
72
|
+
}
|
73
|
+
/**
|
74
|
+
* Gets the contract provider
|
75
|
+
*/
|
76
|
+
get provider() {
|
77
|
+
return this.contract.provider;
|
78
|
+
}
|
79
|
+
/**
|
80
|
+
* Gets the minimum allowed rate limit from the contract
|
81
|
+
* @returns Promise<number> The minimum rate limit in messages per epoch
|
82
|
+
*/
|
83
|
+
async getMinRateLimit() {
|
84
|
+
const minRate = await this.contract.minMembershipRateLimit();
|
85
|
+
return minRate.toNumber();
|
86
|
+
}
|
87
|
+
/**
|
88
|
+
* Gets the maximum allowed rate limit from the contract
|
89
|
+
* @returns Promise<number> The maximum rate limit in messages per epoch
|
90
|
+
*/
|
91
|
+
async getMaxRateLimit() {
|
92
|
+
const maxRate = await this.contract.maxMembershipRateLimit();
|
93
|
+
return maxRate.toNumber();
|
94
|
+
}
|
95
|
+
/**
|
96
|
+
* Gets the maximum total rate limit across all memberships
|
97
|
+
* @returns Promise<number> The maximum total rate limit in messages per epoch
|
98
|
+
*/
|
99
|
+
async getMaxTotalRateLimit() {
|
100
|
+
const maxTotalRate = await this.contract.maxTotalRateLimit();
|
101
|
+
return maxTotalRate.toNumber();
|
102
|
+
}
|
103
|
+
/**
|
104
|
+
* Gets the current total rate limit usage across all memberships
|
105
|
+
* @returns Promise<number> The current total rate limit usage in messages per epoch
|
106
|
+
*/
|
107
|
+
async getCurrentTotalRateLimit() {
|
108
|
+
const currentTotal = await this.contract.currentTotalRateLimit();
|
109
|
+
return currentTotal.toNumber();
|
110
|
+
}
|
111
|
+
/**
|
112
|
+
* Gets the remaining available total rate limit that can be allocated
|
113
|
+
* @returns Promise<number> The remaining rate limit that can be allocated
|
114
|
+
*/
|
115
|
+
async getRemainingTotalRateLimit() {
|
116
|
+
const [maxTotal, currentTotal] = await Promise.all([
|
117
|
+
this.contract.maxTotalRateLimit(),
|
118
|
+
this.contract.currentTotalRateLimit()
|
119
|
+
]);
|
120
|
+
return Number(maxTotal) - Number(currentTotal);
|
121
|
+
}
|
122
|
+
/**
|
123
|
+
* Updates the rate limit for future registrations
|
124
|
+
* @param newRateLimit The new rate limit to use
|
125
|
+
*/
|
126
|
+
async setRateLimit(newRateLimit) {
|
127
|
+
this.rateLimit = newRateLimit;
|
128
|
+
}
|
129
|
+
get members() {
|
130
|
+
const sortedMembers = Array.from(this._members.values()).sort((left, right) => left.index.toNumber() - right.index.toNumber());
|
131
|
+
return sortedMembers;
|
132
|
+
}
|
133
|
+
get membersFilter() {
|
134
|
+
if (!this._membersFilter) {
|
135
|
+
throw Error("Members filter was not initialized.");
|
136
|
+
}
|
137
|
+
return this._membersFilter;
|
138
|
+
}
|
139
|
+
get membershipErasedFilter() {
|
140
|
+
if (!this._membershipErasedFilter) {
|
141
|
+
throw Error("MembershipErased filter was not initialized.");
|
142
|
+
}
|
143
|
+
return this._membershipErasedFilter;
|
144
|
+
}
|
145
|
+
get membersExpiredFilter() {
|
146
|
+
if (!this._membersExpiredFilter) {
|
147
|
+
throw Error("MembersExpired filter was not initialized.");
|
148
|
+
}
|
149
|
+
return this._membersExpiredFilter;
|
150
|
+
}
|
151
|
+
async fetchMembers(options = {}) {
|
152
|
+
const registeredMemberEvents = await queryFilter(this.contract, {
|
153
|
+
fromBlock: this.deployBlock,
|
154
|
+
...options,
|
155
|
+
membersFilter: this.membersFilter
|
156
|
+
});
|
157
|
+
const removedMemberEvents = await queryFilter(this.contract, {
|
158
|
+
fromBlock: this.deployBlock,
|
159
|
+
...options,
|
160
|
+
membersFilter: this.membershipErasedFilter
|
161
|
+
});
|
162
|
+
const expiredMemberEvents = await queryFilter(this.contract, {
|
163
|
+
fromBlock: this.deployBlock,
|
164
|
+
...options,
|
165
|
+
membersFilter: this.membersExpiredFilter
|
166
|
+
});
|
167
|
+
const events = [
|
168
|
+
...registeredMemberEvents,
|
169
|
+
...removedMemberEvents,
|
170
|
+
...expiredMemberEvents
|
171
|
+
];
|
172
|
+
this.processEvents(events);
|
173
|
+
}
|
174
|
+
processEvents(events) {
|
175
|
+
const toRemoveTable = new Map();
|
176
|
+
const toInsertTable = new Map();
|
177
|
+
events.forEach((evt) => {
|
178
|
+
if (!evt.args) {
|
179
|
+
return;
|
180
|
+
}
|
181
|
+
if (evt.event === "MembershipErased" ||
|
182
|
+
evt.event === "MembershipExpired") {
|
183
|
+
let index = evt.args.index;
|
184
|
+
if (!index) {
|
185
|
+
return;
|
186
|
+
}
|
187
|
+
if (typeof index === "number" || typeof index === "string") {
|
188
|
+
index = BigNumber.from(index);
|
189
|
+
}
|
190
|
+
const toRemoveVal = toRemoveTable.get(evt.blockNumber);
|
191
|
+
if (toRemoveVal != undefined) {
|
192
|
+
toRemoveVal.push(index.toNumber());
|
193
|
+
toRemoveTable.set(evt.blockNumber, toRemoveVal);
|
194
|
+
}
|
195
|
+
else {
|
196
|
+
toRemoveTable.set(evt.blockNumber, [index.toNumber()]);
|
197
|
+
}
|
198
|
+
}
|
199
|
+
else if (evt.event === "MembershipRegistered") {
|
200
|
+
let eventsPerBlock = toInsertTable.get(evt.blockNumber);
|
201
|
+
if (eventsPerBlock == undefined) {
|
202
|
+
eventsPerBlock = [];
|
203
|
+
}
|
204
|
+
eventsPerBlock.push(evt);
|
205
|
+
toInsertTable.set(evt.blockNumber, eventsPerBlock);
|
206
|
+
}
|
207
|
+
});
|
208
|
+
}
|
209
|
+
subscribeToMembers() {
|
210
|
+
this.contract.on(this.membersFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
|
211
|
+
this.processEvents([event]);
|
212
|
+
});
|
213
|
+
this.contract.on(this.membershipErasedFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
|
214
|
+
this.processEvents([event]);
|
215
|
+
});
|
216
|
+
this.contract.on(this.membersExpiredFilter, (_idCommitment, _membershipRateLimit, _index, event) => {
|
217
|
+
this.processEvents([event]);
|
218
|
+
});
|
219
|
+
}
|
220
|
+
async registerWithIdentity(identity) {
|
221
|
+
try {
|
222
|
+
log.info(`Registering identity with rate limit: ${this.rateLimit} messages/epoch`);
|
223
|
+
// Check if the ID commitment is already registered
|
224
|
+
const existingIndex = await this.getMemberIndex(identity.IDCommitmentBigInt.toString());
|
225
|
+
if (existingIndex) {
|
226
|
+
throw new Error(`ID commitment is already registered with index ${existingIndex}`);
|
227
|
+
}
|
228
|
+
// Check if there's enough remaining rate limit
|
229
|
+
const remainingRateLimit = await this.getRemainingTotalRateLimit();
|
230
|
+
if (remainingRateLimit < this.rateLimit) {
|
231
|
+
throw new Error(`Not enough remaining rate limit. Requested: ${this.rateLimit}, Available: ${remainingRateLimit}`);
|
232
|
+
}
|
233
|
+
const estimatedGas = await this.contract.estimateGas.register(identity.IDCommitmentBigInt, this.rateLimit, []);
|
234
|
+
const gasLimit = estimatedGas.add(10000);
|
235
|
+
const txRegisterResponse = await this.contract.register(identity.IDCommitmentBigInt, this.rateLimit, [], { gasLimit });
|
236
|
+
const txRegisterReceipt = await txRegisterResponse.wait();
|
237
|
+
if (txRegisterReceipt.status === 0) {
|
238
|
+
throw new Error("Transaction failed on-chain");
|
239
|
+
}
|
240
|
+
const memberRegistered = txRegisterReceipt.events?.find((event) => event.event === "MembershipRegistered");
|
241
|
+
if (!memberRegistered || !memberRegistered.args) {
|
242
|
+
log.error("Failed to register membership: No MembershipRegistered event found");
|
243
|
+
return undefined;
|
244
|
+
}
|
245
|
+
const decodedData = {
|
246
|
+
idCommitment: memberRegistered.args.idCommitment,
|
247
|
+
membershipRateLimit: memberRegistered.args.membershipRateLimit,
|
248
|
+
index: memberRegistered.args.index
|
249
|
+
};
|
250
|
+
log.info(`Successfully registered membership with index ${decodedData.index} ` +
|
251
|
+
`and rate limit ${decodedData.membershipRateLimit}`);
|
252
|
+
const network = await this.contract.provider.getNetwork();
|
253
|
+
const address = this.contract.address;
|
254
|
+
const membershipId = Number(decodedData.index);
|
255
|
+
return {
|
256
|
+
identity,
|
257
|
+
membership: {
|
258
|
+
address,
|
259
|
+
treeIndex: membershipId,
|
260
|
+
chainId: network.chainId,
|
261
|
+
rateLimit: decodedData.membershipRateLimit.toNumber()
|
262
|
+
}
|
263
|
+
};
|
264
|
+
}
|
265
|
+
catch (error) {
|
266
|
+
if (error instanceof Error) {
|
267
|
+
const errorMessage = error.message;
|
268
|
+
log.error("registerWithIdentity - error message:", errorMessage);
|
269
|
+
log.error("registerWithIdentity - error stack:", error.stack);
|
270
|
+
// Try to extract more specific error information
|
271
|
+
if (errorMessage.includes("CannotExceedMaxTotalRateLimit")) {
|
272
|
+
throw new Error("Registration failed: Cannot exceed maximum total rate limit");
|
273
|
+
}
|
274
|
+
else if (errorMessage.includes("InvalidIdCommitment")) {
|
275
|
+
throw new Error("Registration failed: Invalid ID commitment");
|
276
|
+
}
|
277
|
+
else if (errorMessage.includes("InvalidMembershipRateLimit")) {
|
278
|
+
throw new Error("Registration failed: Invalid membership rate limit");
|
279
|
+
}
|
280
|
+
else if (errorMessage.includes("execution reverted")) {
|
281
|
+
throw new Error("Contract execution reverted. Check contract requirements.");
|
282
|
+
}
|
283
|
+
else {
|
284
|
+
throw new Error(`Error in registerWithIdentity: ${errorMessage}`);
|
285
|
+
}
|
286
|
+
}
|
287
|
+
else {
|
288
|
+
throw new Error("Unknown error in registerWithIdentity", {
|
289
|
+
cause: error
|
290
|
+
});
|
291
|
+
}
|
292
|
+
}
|
293
|
+
}
|
294
|
+
/**
|
295
|
+
* Helper method to get remaining messages in current epoch
|
296
|
+
* @param membershipId The ID of the membership to check
|
297
|
+
* @returns number of remaining messages allowed in current epoch
|
298
|
+
*/
|
299
|
+
async getRemainingMessages(membershipId) {
|
300
|
+
try {
|
301
|
+
const [startTime, , rateLimit] = await this.contract.getMembershipInfo(membershipId);
|
302
|
+
// Calculate current epoch
|
303
|
+
const currentTime = Math.floor(Date.now() / 1000);
|
304
|
+
const epochsPassed = Math.floor((currentTime - startTime) / RATE_LIMIT_PARAMS.EPOCH_LENGTH);
|
305
|
+
const currentEpochStart = startTime + epochsPassed * RATE_LIMIT_PARAMS.EPOCH_LENGTH;
|
306
|
+
// Get message count in current epoch using contract's function
|
307
|
+
const messageCount = await this.contract.getMessageCount(membershipId, currentEpochStart);
|
308
|
+
return Math.max(0, rateLimit.sub(messageCount).toNumber());
|
309
|
+
}
|
310
|
+
catch (error) {
|
311
|
+
log.error(`Error getting remaining messages: ${error.message}`);
|
312
|
+
return 0; // Fail safe: assume no messages remaining on error
|
313
|
+
}
|
314
|
+
}
|
315
|
+
async registerWithPermitAndErase(identity, permit, idCommitmentsToErase) {
|
316
|
+
try {
|
317
|
+
log.info(`Registering identity with permit and rate limit: ${this.rateLimit} messages/epoch`);
|
318
|
+
const txRegisterResponse = await this.contract.registerWithPermit(permit.owner, permit.deadline, permit.v, permit.r, permit.s, identity.IDCommitmentBigInt, this.rateLimit, idCommitmentsToErase.map((id) => BigNumber.from(id)));
|
319
|
+
const txRegisterReceipt = await txRegisterResponse.wait();
|
320
|
+
const memberRegistered = txRegisterReceipt.events?.find((event) => event.event === "MembershipRegistered");
|
321
|
+
if (!memberRegistered || !memberRegistered.args) {
|
322
|
+
log.error("Failed to register membership with permit: No MembershipRegistered event found");
|
323
|
+
return undefined;
|
324
|
+
}
|
325
|
+
const decodedData = {
|
326
|
+
idCommitment: memberRegistered.args.idCommitment,
|
327
|
+
membershipRateLimit: memberRegistered.args.membershipRateLimit,
|
328
|
+
index: memberRegistered.args.index
|
329
|
+
};
|
330
|
+
log.info(`Successfully registered membership with permit. Index: ${decodedData.index}, ` +
|
331
|
+
`Rate limit: ${decodedData.membershipRateLimit}, Erased ${idCommitmentsToErase.length} commitments`);
|
332
|
+
const network = await this.contract.provider.getNetwork();
|
333
|
+
const address = this.contract.address;
|
334
|
+
const membershipId = Number(decodedData.index);
|
335
|
+
return {
|
336
|
+
identity,
|
337
|
+
membership: {
|
338
|
+
address,
|
339
|
+
treeIndex: membershipId,
|
340
|
+
chainId: network.chainId,
|
341
|
+
rateLimit: decodedData.membershipRateLimit.toNumber()
|
342
|
+
}
|
343
|
+
};
|
344
|
+
}
|
345
|
+
catch (error) {
|
346
|
+
log.error(`Error in registerWithPermitAndErase: ${error.message}`);
|
347
|
+
return undefined;
|
348
|
+
}
|
349
|
+
}
|
350
|
+
async withdraw(token, holder) {
|
351
|
+
try {
|
352
|
+
const tx = await this.contract.withdraw(token, { from: holder });
|
353
|
+
await tx.wait();
|
354
|
+
}
|
355
|
+
catch (error) {
|
356
|
+
log.error(`Error in withdraw: ${error.message}`);
|
357
|
+
}
|
358
|
+
}
|
359
|
+
async getMembershipInfo(idCommitment) {
|
360
|
+
try {
|
361
|
+
const [startBlock, endBlock, rateLimit] = await this.contract.getMembershipInfo(idCommitment);
|
362
|
+
const currentBlock = await this.contract.provider.getBlockNumber();
|
363
|
+
let state;
|
364
|
+
if (currentBlock < startBlock) {
|
365
|
+
state = MembershipState.Active;
|
366
|
+
}
|
367
|
+
else if (currentBlock < endBlock) {
|
368
|
+
state = MembershipState.GracePeriod;
|
369
|
+
}
|
370
|
+
else {
|
371
|
+
state = MembershipState.Expired;
|
372
|
+
}
|
373
|
+
const index = await this.getMemberIndex(idCommitment);
|
374
|
+
if (!index)
|
375
|
+
return undefined;
|
376
|
+
return {
|
377
|
+
index,
|
378
|
+
idCommitment,
|
379
|
+
rateLimit: rateLimit.toNumber(),
|
380
|
+
startBlock: startBlock.toNumber(),
|
381
|
+
endBlock: endBlock.toNumber(),
|
382
|
+
state
|
383
|
+
};
|
384
|
+
}
|
385
|
+
catch (error) {
|
386
|
+
return undefined;
|
387
|
+
}
|
388
|
+
}
|
389
|
+
async extendMembership(idCommitment) {
|
390
|
+
return this.contract.extendMemberships([idCommitment]);
|
391
|
+
}
|
392
|
+
async eraseMembership(idCommitment, eraseFromMembershipSet = true) {
|
393
|
+
return this.contract.eraseMemberships([idCommitment], eraseFromMembershipSet);
|
394
|
+
}
|
395
|
+
async registerMembership(idCommitment, rateLimit = DEFAULT_RATE_LIMIT) {
|
396
|
+
if (rateLimit < RATE_LIMIT_PARAMS.MIN_RATE ||
|
397
|
+
rateLimit > RATE_LIMIT_PARAMS.MAX_RATE) {
|
398
|
+
throw new Error(`Rate limit must be between ${RATE_LIMIT_PARAMS.MIN_RATE} and ${RATE_LIMIT_PARAMS.MAX_RATE}`);
|
399
|
+
}
|
400
|
+
return this.contract.register(idCommitment, rateLimit, []);
|
401
|
+
}
|
402
|
+
async getMemberIndex(idCommitment) {
|
403
|
+
try {
|
404
|
+
const events = await this.contract.queryFilter(this.contract.filters.MembershipRegistered(idCommitment));
|
405
|
+
if (events.length === 0)
|
406
|
+
return undefined;
|
407
|
+
// Get the most recent registration event
|
408
|
+
const event = events[events.length - 1];
|
409
|
+
return event.args?.index;
|
410
|
+
}
|
411
|
+
catch (error) {
|
412
|
+
return undefined;
|
413
|
+
}
|
414
|
+
}
|
415
|
+
}
|
416
|
+
// These values should be tested on other networks
|
417
|
+
const FETCH_CHUNK = 5;
|
418
|
+
const BLOCK_RANGE = 3000;
|
419
|
+
async function queryFilter(contract, options) {
|
420
|
+
const { fromBlock, membersFilter, fetchRange = BLOCK_RANGE, fetchChunks = FETCH_CHUNK } = options;
|
421
|
+
if (fromBlock === undefined) {
|
422
|
+
return contract.queryFilter(membersFilter);
|
423
|
+
}
|
424
|
+
if (!contract.provider) {
|
425
|
+
throw Error("No provider found on the contract.");
|
426
|
+
}
|
427
|
+
const toBlock = await contract.provider.getBlockNumber();
|
428
|
+
if (toBlock - fromBlock < fetchRange) {
|
429
|
+
return contract.queryFilter(membersFilter, fromBlock, toBlock);
|
430
|
+
}
|
431
|
+
const events = [];
|
432
|
+
const chunks = splitToChunks(fromBlock, toBlock, fetchRange);
|
433
|
+
for (const portion of takeN(chunks, fetchChunks)) {
|
434
|
+
const promises = portion.map(([left, right]) => ignoreErrors(contract.queryFilter(membersFilter, left, right), []));
|
435
|
+
const fetchedEvents = await Promise.all(promises);
|
436
|
+
events.push(fetchedEvents.flatMap((v) => v));
|
437
|
+
}
|
438
|
+
return events.flatMap((v) => v);
|
439
|
+
}
|
440
|
+
function splitToChunks(from, to, step) {
|
441
|
+
const chunks = [];
|
442
|
+
let left = from;
|
443
|
+
while (left < to) {
|
444
|
+
const right = left + step < to ? left + step : to;
|
445
|
+
chunks.push([left, right]);
|
446
|
+
left = right;
|
447
|
+
}
|
448
|
+
return chunks;
|
449
|
+
}
|
450
|
+
function* takeN(array, size) {
|
451
|
+
let start = 0;
|
452
|
+
while (start < array.length) {
|
453
|
+
const portion = array.slice(start, start + size);
|
454
|
+
yield portion;
|
455
|
+
start += size;
|
456
|
+
}
|
457
|
+
}
|
458
|
+
async function ignoreErrors(promise, defaultValue) {
|
459
|
+
try {
|
460
|
+
return await promise;
|
461
|
+
}
|
462
|
+
catch (err) {
|
463
|
+
if (err instanceof Error) {
|
464
|
+
log.info(`Ignoring an error during query: ${err.message}`);
|
465
|
+
}
|
466
|
+
else {
|
467
|
+
log.info(`Ignoring an unknown error during query`);
|
468
|
+
}
|
469
|
+
return defaultValue;
|
470
|
+
}
|
471
|
+
}
|
472
|
+
|
473
|
+
export { MembershipState, RLNLightContract };
|
@@ -1,6 +1,6 @@
|
|
1
|
-
import { cipherDecrypt as cipherDecrypt_1 } from '
|
2
|
-
import { kdf as kdf_2 } from '
|
3
|
-
import { normalizePassword as normalizePassword_1 } from '
|
1
|
+
import { cipherDecrypt as cipherDecrypt_1 } from '../../node_modules/@chainsafe/bls-keystore/lib/cipher.js';
|
2
|
+
import { kdf as kdf_2 } from '../../node_modules/@chainsafe/bls-keystore/lib/kdf.js';
|
3
|
+
import { normalizePassword as normalizePassword_1 } from '../../node_modules/@chainsafe/bls-keystore/lib/password.js';
|
4
4
|
import { keccak256 } from '../../../../node_modules/ethereum-cryptography/esm/keccak.js';
|
5
5
|
import { hexToBytes } from '../../../../node_modules/ethereum-cryptography/esm/utils.js';
|
6
6
|
import { concatBytes, bytesToHex } from '../../../../node_modules/@noble/hashes/esm/utils.js';
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import '
|
1
|
+
import '../../node_modules/@chainsafe/bls-keystore/lib/index.js';
|
2
2
|
import '../../../interfaces/dist/protocols.js';
|
3
3
|
import '../../../interfaces/dist/connection_manager.js';
|
4
4
|
import '../../../interfaces/dist/health_indicator.js';
|
@@ -176,7 +176,8 @@ class Keystore {
|
|
176
176
|
membership: {
|
177
177
|
treeIndex: _.get(obj, "treeIndex"),
|
178
178
|
chainId: _.get(obj, "membershipContract.chainId"),
|
179
|
-
address: _.get(obj, "membershipContract.address")
|
179
|
+
address: _.get(obj, "membershipContract.address"),
|
180
|
+
rateLimit: _.get(obj, "membershipContract.rateLimit")
|
180
181
|
}
|
181
182
|
};
|
182
183
|
}
|
@@ -21,7 +21,7 @@ import { Logger } from '../../utils/dist/logger/index.js';
|
|
21
21
|
import '../../core/dist/lib/metadata/metadata.js';
|
22
22
|
import __wbg_init, { init_panic_hook, newRLN } from '../../../node_modules/@waku/zerokit-rln-wasm/rln_wasm.js';
|
23
23
|
import { createRLNEncoder, createRLNDecoder } from './codec.js';
|
24
|
-
import {
|
24
|
+
import { LINEA_CONTRACT, DEFAULT_RATE_LIMIT } from './contract/constants.js';
|
25
25
|
import { RLNContract } from './contract/rln_contract.js';
|
26
26
|
import { Keystore } from './keystore/keystore.js';
|
27
27
|
import verificationKey from './resources/verification_key.js';
|
@@ -106,7 +106,7 @@ class RLNInstance {
|
|
106
106
|
this.starting = true;
|
107
107
|
try {
|
108
108
|
const { credentials, keystore } = await RLNInstance.decryptCredentialsIfNeeded(options.credentials);
|
109
|
-
const { signer, address } = await this.determineStartOptions(options, credentials);
|
109
|
+
const { signer, address, rateLimit } = await this.determineStartOptions(options, credentials);
|
110
110
|
if (keystore) {
|
111
111
|
this.keystore = keystore;
|
112
112
|
}
|
@@ -115,7 +115,7 @@ class RLNInstance {
|
|
115
115
|
this._contract = await RLNContract.init(this, {
|
116
116
|
address: address,
|
117
117
|
signer: signer,
|
118
|
-
rateLimit:
|
118
|
+
rateLimit: rateLimit ?? this.zerokit.getRateLimit
|
119
119
|
});
|
120
120
|
this.started = true;
|
121
121
|
}
|
@@ -127,9 +127,9 @@ class RLNInstance {
|
|
127
127
|
let chainId = credentials?.membership.chainId;
|
128
128
|
const address = credentials?.membership.address ||
|
129
129
|
options.address ||
|
130
|
-
|
131
|
-
if (address ===
|
132
|
-
chainId =
|
130
|
+
LINEA_CONTRACT.address;
|
131
|
+
if (address === LINEA_CONTRACT.address) {
|
132
|
+
chainId = LINEA_CONTRACT.chainId;
|
133
133
|
}
|
134
134
|
const signer = options.signer || (await extractMetaMaskSigner());
|
135
135
|
const currentChainId = await signer.getChainId();
|