@gzeoneth/gov-tracker 0.4.0 → 0.5.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 +95 -11
- package/dist/abis-json.d.ts +2315 -0
- package/dist/abis-json.d.ts.map +1 -0
- package/dist/abis-json.js +3207 -0
- package/dist/abis-json.js.map +1 -0
- package/dist/abis.d.ts +12 -7
- package/dist/abis.d.ts.map +1 -1
- package/dist/abis.js +32 -1
- package/dist/abis.js.map +1 -1
- package/dist/calldata/decoder.d.ts.map +1 -1
- package/dist/calldata/decoder.js +33 -28
- package/dist/calldata/decoder.js.map +1 -1
- package/dist/calldata/parameter-decoder.d.ts.map +1 -1
- package/dist/calldata/parameter-decoder.js +19 -25
- package/dist/calldata/parameter-decoder.js.map +1 -1
- package/dist/calldata/retryable-ticket.d.ts +2 -2
- package/dist/calldata/retryable-ticket.d.ts.map +1 -1
- package/dist/calldata/retryable-ticket.js +17 -12
- package/dist/calldata/retryable-ticket.js.map +1 -1
- package/dist/calldata/signature-lookup.js +5 -4
- package/dist/calldata/signature-lookup.js.map +1 -1
- package/dist/cli/cli.js +112 -20
- package/dist/cli/cli.js.map +1 -1
- package/dist/cli/lib/cli.d.ts +4 -2
- package/dist/cli/lib/cli.d.ts.map +1 -1
- package/dist/cli/lib/cli.js +34 -18
- package/dist/cli/lib/cli.js.map +1 -1
- package/dist/cli/lib/election-check.d.ts.map +1 -1
- package/dist/cli/lib/election-check.js +2 -1
- package/dist/cli/lib/election-check.js.map +1 -1
- package/dist/cli/lib/json-state.js +1 -1
- package/dist/cli/lib/json-state.js.map +1 -1
- package/dist/cli/tui/components/StageProgress.js +1 -1
- package/dist/cli/tui/components/StageProgress.js.map +1 -1
- package/dist/cli/tui/components/StageRow.d.ts.map +1 -1
- package/dist/cli/tui/components/StageRow.js +15 -20
- package/dist/cli/tui/components/StageRow.js.map +1 -1
- package/dist/cli/tui/components/VotingStats.d.ts.map +1 -1
- package/dist/cli/tui/components/VotingStats.js +2 -1
- package/dist/cli/tui/components/VotingStats.js.map +1 -1
- package/dist/cli/tui/hooks/useCache.d.ts.map +1 -1
- package/dist/cli/tui/hooks/useCache.js +2 -1
- package/dist/cli/tui/hooks/useCache.js.map +1 -1
- package/dist/cli/tui/hooks/useElectionData.d.ts.map +1 -1
- package/dist/cli/tui/hooks/useElectionData.js +3 -2
- package/dist/cli/tui/hooks/useElectionData.js.map +1 -1
- package/dist/cli/tui/hooks/useNavigation.d.ts.map +1 -1
- package/dist/cli/tui/hooks/useNavigation.js +2 -3
- package/dist/cli/tui/hooks/useNavigation.js.map +1 -1
- package/dist/cli/tui/hooks/useProposals.d.ts.map +1 -1
- package/dist/cli/tui/hooks/useProposals.js +26 -36
- package/dist/cli/tui/hooks/useProposals.js.map +1 -1
- package/dist/cli/tui/hooks/useStageCalldata.d.ts.map +1 -1
- package/dist/cli/tui/hooks/useStageCalldata.js +2 -1
- package/dist/cli/tui/hooks/useStageCalldata.js.map +1 -1
- package/dist/cli/tui/utils/index.d.ts +7 -7
- package/dist/cli/tui/utils/index.d.ts.map +1 -1
- package/dist/cli/tui/utils/index.js +18 -13
- package/dist/cli/tui/utils/index.js.map +1 -1
- package/dist/cli/tui/utils/markdown-parser.d.ts +5 -0
- package/dist/cli/tui/utils/markdown-parser.d.ts.map +1 -1
- package/dist/cli/tui/utils/markdown-parser.js +16 -0
- package/dist/cli/tui/utils/markdown-parser.js.map +1 -1
- package/dist/cli/tui/utils/navigation.d.ts +1 -0
- package/dist/cli/tui/utils/navigation.d.ts.map +1 -1
- package/dist/cli/tui/utils/navigation.js +9 -5
- package/dist/cli/tui/utils/navigation.js.map +1 -1
- package/dist/cli/tui/utils/proposal-detail-helpers.js +6 -6
- package/dist/cli/tui/utils/proposal-detail-helpers.js.map +1 -1
- package/dist/cli/tui/utils/stage-status.d.ts +4 -0
- package/dist/cli/tui/utils/stage-status.d.ts.map +1 -1
- package/dist/cli/tui/utils/stage-status.js +47 -1
- package/dist/cli/tui/utils/stage-status.js.map +1 -1
- package/dist/cli/tui/utils/time.d.ts +4 -4
- package/dist/cli/tui/utils/time.d.ts.map +1 -1
- package/dist/cli/tui/utils/time.js +13 -11
- package/dist/cli/tui/utils/time.js.map +1 -1
- package/dist/cli/tui/views/CalldataView.d.ts.map +1 -1
- package/dist/cli/tui/views/CalldataView.js +3 -2
- package/dist/cli/tui/views/CalldataView.js.map +1 -1
- package/dist/cli/tui/views/DescriptionView.d.ts.map +1 -1
- package/dist/cli/tui/views/DescriptionView.js +4 -2
- package/dist/cli/tui/views/DescriptionView.js.map +1 -1
- package/dist/cli/tui/views/ElectionView.d.ts.map +1 -1
- package/dist/cli/tui/views/ElectionView.js +4 -9
- package/dist/cli/tui/views/ElectionView.js.map +1 -1
- package/dist/constants.d.ts +54 -23
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +78 -21
- package/dist/constants.js.map +1 -1
- package/dist/data/bundled-cache.json +393 -20
- package/dist/data/delegate-cache.json +118014 -0
- package/dist/deduplication.d.ts.map +1 -1
- package/dist/deduplication.js +34 -54
- package/dist/deduplication.js.map +1 -1
- package/dist/delegates/cache.d.ts +44 -0
- package/dist/delegates/cache.d.ts.map +1 -0
- package/dist/delegates/cache.js +202 -0
- package/dist/delegates/cache.js.map +1 -0
- package/dist/delegates/index.d.ts +13 -0
- package/dist/delegates/index.d.ts.map +1 -0
- package/dist/delegates/index.js +32 -0
- package/dist/delegates/index.js.map +1 -0
- package/dist/delegates/indexer.d.ts +32 -0
- package/dist/delegates/indexer.d.ts.map +1 -0
- package/dist/delegates/indexer.js +191 -0
- package/dist/delegates/indexer.js.map +1 -0
- package/dist/delegates/queries.d.ts +30 -0
- package/dist/delegates/queries.d.ts.map +1 -0
- package/dist/delegates/queries.js +79 -0
- package/dist/delegates/queries.js.map +1 -0
- package/dist/discovery/governor-discovery.d.ts +21 -1
- package/dist/discovery/governor-discovery.d.ts.map +1 -1
- package/dist/discovery/governor-discovery.js +47 -13
- package/dist/discovery/governor-discovery.js.map +1 -1
- package/dist/discovery/timelock-discovery.d.ts.map +1 -1
- package/dist/discovery/timelock-discovery.js +27 -30
- package/dist/discovery/timelock-discovery.js.map +1 -1
- package/dist/election/contracts.d.ts.map +1 -1
- package/dist/election/contracts.js +4 -1
- package/dist/election/contracts.js.map +1 -1
- package/dist/election/details.d.ts.map +1 -1
- package/dist/election/details.js +7 -3
- package/dist/election/details.js.map +1 -1
- package/dist/election/index.d.ts +3 -1
- package/dist/election/index.d.ts.map +1 -1
- package/dist/election/index.js +12 -1
- package/dist/election/index.js.map +1 -1
- package/dist/election/params.d.ts.map +1 -1
- package/dist/election/params.js +14 -28
- package/dist/election/params.js.map +1 -1
- package/dist/election/participants.d.ts.map +1 -1
- package/dist/election/participants.js +21 -26
- package/dist/election/participants.js.map +1 -1
- package/dist/election/proposal-ids.js +19 -22
- package/dist/election/proposal-ids.js.map +1 -1
- package/dist/election/status.d.ts +28 -1
- package/dist/election/status.d.ts.map +1 -1
- package/dist/election/status.js +116 -3
- package/dist/election/status.js.map +1 -1
- package/dist/election/write.d.ts +132 -0
- package/dist/election/write.d.ts.map +1 -0
- package/dist/election/write.js +184 -0
- package/dist/election/write.js.map +1 -0
- package/dist/governance/index.d.ts +5 -0
- package/dist/governance/index.d.ts.map +1 -0
- package/dist/governance/index.js +28 -0
- package/dist/governance/index.js.map +1 -0
- package/dist/governance/read.d.ts +50 -0
- package/dist/governance/read.d.ts.map +1 -0
- package/dist/governance/read.js +194 -0
- package/dist/governance/read.js.map +1 -0
- package/dist/governance/write.d.ts +54 -0
- package/dist/governance/write.d.ts.map +1 -0
- package/dist/governance/write.js +132 -0
- package/dist/governance/write.js.map +1 -0
- package/dist/index.d.ts +40 -21
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +149 -15
- package/dist/index.js.map +1 -1
- package/dist/simulation/index.d.ts +4 -1
- package/dist/simulation/index.d.ts.map +1 -1
- package/dist/simulation/index.js +5 -1
- package/dist/simulation/index.js.map +1 -1
- package/dist/simulation/simulation-data.d.ts +33 -2
- package/dist/simulation/simulation-data.d.ts.map +1 -1
- package/dist/simulation/simulation-data.js +68 -24
- package/dist/simulation/simulation-data.js.map +1 -1
- package/dist/simulation/tenderly-payloads.d.ts +107 -0
- package/dist/simulation/tenderly-payloads.d.ts.map +1 -0
- package/dist/simulation/tenderly-payloads.js +103 -0
- package/dist/simulation/tenderly-payloads.js.map +1 -0
- package/dist/stages/l2-to-l1-message.d.ts.map +1 -1
- package/dist/stages/l2-to-l1-message.js +43 -63
- package/dist/stages/l2-to-l1-message.js.map +1 -1
- package/dist/stages/proposal-queued.js.map +1 -1
- package/dist/stages/retryables.d.ts.map +1 -1
- package/dist/stages/retryables.js +10 -9
- package/dist/stages/retryables.js.map +1 -1
- package/dist/stages/timelock.d.ts +43 -3
- package/dist/stages/timelock.d.ts.map +1 -1
- package/dist/stages/timelock.js +170 -53
- package/dist/stages/timelock.js.map +1 -1
- package/dist/stages/utils.d.ts +56 -1
- package/dist/stages/utils.d.ts.map +1 -1
- package/dist/stages/utils.js +146 -30
- package/dist/stages/utils.js.map +1 -1
- package/dist/tracker/bundled-cache.d.ts +136 -0
- package/dist/tracker/bundled-cache.d.ts.map +1 -0
- package/dist/tracker/bundled-cache.js +207 -0
- package/dist/tracker/bundled-cache.js.map +1 -0
- package/dist/tracker/checkpoint-helpers.d.ts +20 -1
- package/dist/tracker/checkpoint-helpers.d.ts.map +1 -1
- package/dist/tracker/checkpoint-helpers.js +41 -7
- package/dist/tracker/checkpoint-helpers.js.map +1 -1
- package/dist/tracker/discovery.d.ts +3 -0
- package/dist/tracker/discovery.d.ts.map +1 -1
- package/dist/tracker/discovery.js +59 -34
- package/dist/tracker/discovery.js.map +1 -1
- package/dist/tracker/pipeline.d.ts +3 -10
- package/dist/tracker/pipeline.d.ts.map +1 -1
- package/dist/tracker/pipeline.js +18 -32
- package/dist/tracker/pipeline.js.map +1 -1
- package/dist/tracker/query.d.ts +1 -0
- package/dist/tracker/query.d.ts.map +1 -1
- package/dist/tracker/query.js +28 -36
- package/dist/tracker/query.js.map +1 -1
- package/dist/tracker/state.d.ts +3 -2
- package/dist/tracker/state.d.ts.map +1 -1
- package/dist/tracker/state.js +5 -4
- package/dist/tracker/state.js.map +1 -1
- package/dist/tracker.d.ts +33 -11
- package/dist/tracker.d.ts.map +1 -1
- package/dist/tracker.js +76 -43
- package/dist/tracker.js.map +1 -1
- package/dist/types/config.d.ts +39 -3
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/delegates.d.ts +55 -0
- package/dist/types/delegates.d.ts.map +1 -0
- package/dist/types/delegates.js +9 -0
- package/dist/types/delegates.js.map +1 -0
- package/dist/types/election.d.ts +23 -0
- package/dist/types/election.d.ts.map +1 -1
- package/dist/types/index.d.ts +3 -2
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/types/simulation.d.ts +2 -2
- package/dist/types/simulation.d.ts.map +1 -1
- package/dist/types/tracking.d.ts +2 -2
- package/dist/types/tracking.d.ts.map +1 -1
- package/dist/utils/chain.d.ts +5 -1
- package/dist/utils/chain.d.ts.map +1 -1
- package/dist/utils/chain.js +7 -0
- package/dist/utils/chain.js.map +1 -1
- package/dist/utils/formatters.d.ts +2 -6
- package/dist/utils/formatters.d.ts.map +1 -1
- package/dist/utils/formatters.js +9 -12
- package/dist/utils/formatters.js.map +1 -1
- package/dist/utils/log-filters.js +1 -1
- package/dist/utils/log-filters.js.map +1 -1
- package/dist/utils/logger.d.ts +2 -0
- package/dist/utils/logger.d.ts.map +1 -1
- package/dist/utils/logger.js +2 -0
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/multicall.d.ts +0 -1
- package/dist/utils/multicall.d.ts.map +1 -1
- package/dist/utils/rpc-utils.d.ts +5 -0
- package/dist/utils/rpc-utils.d.ts.map +1 -1
- package/dist/utils/rpc-utils.js +9 -1
- package/dist/utils/rpc-utils.js.map +1 -1
- package/dist/utils/stage-metadata.d.ts +19 -0
- package/dist/utils/stage-metadata.d.ts.map +1 -1
- package/dist/utils/stage-metadata.js +44 -0
- package/dist/utils/stage-metadata.js.map +1 -1
- package/dist/utils/timing.d.ts +3 -10
- package/dist/utils/timing.d.ts.map +1 -1
- package/dist/utils/timing.js +9 -22
- package/dist/utils/timing.js.map +1 -1
- package/package.json +7 -3
- package/dist/cli/tui/utils/calldata-formatter.d.ts +0 -7
- package/dist/cli/tui/utils/calldata-formatter.d.ts.map +0 -1
- package/dist/cli/tui/utils/calldata-formatter.js +0 -14
- package/dist/cli/tui/utils/calldata-formatter.js.map +0 -1
- package/dist/cli/tui/utils/stage-formatter.d.ts +0 -7
- package/dist/cli/tui/utils/stage-formatter.d.ts.map +0 -1
- package/dist/cli/tui/utils/stage-formatter.js +0 -13
- package/dist/cli/tui/utils/stage-formatter.js.map +0 -1
- package/dist/cli/tui/utils/text.d.ts +0 -7
- package/dist/cli/tui/utils/text.d.ts.map +0 -1
- package/dist/cli/tui/utils/text.js +0 -12
- package/dist/cli/tui/utils/text.js.map +0 -1
|
@@ -210,40 +210,35 @@ async function getTimelockState(timelockAddress, operationId, provider, options
|
|
|
210
210
|
state.isBatch = true;
|
|
211
211
|
}
|
|
212
212
|
}
|
|
213
|
+
// Validate fromBlock when log search is needed
|
|
214
|
+
const needsScheduledSearch = !options.skipLogSearch && !state.scheduledData && contractState.isOperation;
|
|
215
|
+
const needsExecutedSearch = !options.skipLogSearch && !options.skipExecutedSearch && contractState.isDone;
|
|
216
|
+
if ((needsScheduledSearch || needsExecutedSearch) && options.fromBlock === undefined) {
|
|
217
|
+
throw new Error("fromBlock is required when searching logs in getTimelockState");
|
|
218
|
+
}
|
|
213
219
|
// SLOW PATH: Only search for logs when needed and not already provided
|
|
214
|
-
if (
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
if (
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
state.
|
|
229
|
-
// Check if this is a batch operation by looking for multiple CallScheduled events
|
|
230
|
-
// with the SAME operationId (not just any events in the same tx)
|
|
231
|
-
const allScheduledData = await findAllCallScheduledInTx(scheduledData.txHash, provider, operationId);
|
|
232
|
-
if (allScheduledData.length > 1) {
|
|
233
|
-
state.allScheduledData = allScheduledData;
|
|
234
|
-
state.isBatch = true;
|
|
235
|
-
}
|
|
220
|
+
if (needsScheduledSearch) {
|
|
221
|
+
const fromBlock = options.fromBlock; // Validated above
|
|
222
|
+
const scheduledData = await findCallScheduledEvent(timelockAddress, operationId, provider, {
|
|
223
|
+
startBlock: fromBlock,
|
|
224
|
+
endBlock: options.toBlock,
|
|
225
|
+
chunkSize: options.chunkSize,
|
|
226
|
+
});
|
|
227
|
+
if (scheduledData) {
|
|
228
|
+
state.scheduledData = scheduledData;
|
|
229
|
+
// Check if this is a batch operation by looking for multiple CallScheduled events
|
|
230
|
+
// with the SAME operationId (not just any events in the same tx)
|
|
231
|
+
const allScheduledData = await findAllCallScheduledInTx(scheduledData.txHash, provider, operationId);
|
|
232
|
+
if (allScheduledData.length > 1) {
|
|
233
|
+
state.allScheduledData = allScheduledData;
|
|
234
|
+
state.isBatch = true;
|
|
236
235
|
}
|
|
237
236
|
}
|
|
238
237
|
}
|
|
239
238
|
// Only search for executed data if the operation is done and caller wants it
|
|
240
239
|
// Note: Caller may skip this to do an optimized search starting after the delay
|
|
241
|
-
if (
|
|
242
|
-
//
|
|
243
|
-
if (options.fromBlock === undefined) {
|
|
244
|
-
throw new Error("fromBlock is required when searching logs in getTimelockState");
|
|
245
|
-
}
|
|
246
|
-
// Use scheduledData blockNumber if available, otherwise use fromBlock
|
|
240
|
+
if (needsExecutedSearch) {
|
|
241
|
+
// Use scheduledData blockNumber if available, otherwise use fromBlock (validated above)
|
|
247
242
|
const executedSearchStart = state.scheduledData?.blockNumber ?? options.fromBlock;
|
|
248
243
|
const executedData = await findCallExecutedEvent(timelockAddress, operationId, provider, {
|
|
249
244
|
startBlock: executedSearchStart,
|
|
@@ -278,8 +273,7 @@ async function findAllCallScheduledInTx(txHash, provider, operationId) {
|
|
|
278
273
|
.filter((log) => log.topics[0] === constants_1.EVENT_TOPICS.CALL_SCHEDULED)
|
|
279
274
|
.map(parseCallScheduledEvent)
|
|
280
275
|
.filter((parsed) => parsed !== null && (!operationId || (0, chain_1.addressEquals)(parsed.operationId, operationId)));
|
|
281
|
-
|
|
282
|
-
return results.sort((a, b) => a.index.toNumber() - b.index.toNumber());
|
|
276
|
+
return results.sort((a, b) => (0, chain_1.compareBigNumbers)(a.index, b.index));
|
|
283
277
|
}
|
|
284
278
|
/** Lookup map: governor address → L2 timelock address */
|
|
285
279
|
const GOVERNOR_TO_TIMELOCK = new Map([
|
|
@@ -303,6 +297,9 @@ async function discoverTimelockOps(timelockAddress, fromBlock, toBlock, provider
|
|
|
303
297
|
const seen = new Set();
|
|
304
298
|
return logs
|
|
305
299
|
.filter((log) => {
|
|
300
|
+
// CallScheduled events always have operationId as indexed topic[1]
|
|
301
|
+
if (log.topics.length < 2)
|
|
302
|
+
return false;
|
|
306
303
|
const operationId = log.topics[1];
|
|
307
304
|
if (seen.has(operationId))
|
|
308
305
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timelock-discovery.js","sourceRoot":"","sources":["../../src/discovery/timelock-discovery.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AA4BH,8CAEC;AAKD,oCAEC;AAkDD,8DAkCC;AAKD,0DAoBC;AAKD,wDAiBC;AAOD,wDAwBC;AAKD,8DAiBC;AAOD,sDAwBC;AAWD,
|
|
1
|
+
{"version":3,"file":"timelock-discovery.js","sourceRoot":"","sources":["../../src/discovery/timelock-discovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/election/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/election/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;AAQ3C,wBAAgB,kBAAkB,CAChC,OAAO,GAAE,MAA4C,EACrD,QAAQ,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,GACnC,MAAM,CAAC,QAAQ,CAEjB;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,GAAE,MAA2C,EACpD,QAAQ,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,GACnC,MAAM,CAAC,QAAQ,CAEjB;AAED,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,kBAAkB,GAAE,MAAa,EACjC,aAAa,GAAE,MAAe,GAC7B,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAejD"}
|
|
@@ -7,6 +7,8 @@ const ethers_1 = require("ethers");
|
|
|
7
7
|
const constants_1 = require("../constants");
|
|
8
8
|
const rpc_utils_1 = require("../utils/rpc-utils");
|
|
9
9
|
const abis_1 = require("../abis");
|
|
10
|
+
const logger_1 = require("../utils/logger");
|
|
11
|
+
const log = logger_1.loggers.election;
|
|
10
12
|
function getNomineeGovernor(address = constants_1.ADDRESSES.ELECTION_NOMINEE_GOVERNOR, provider) {
|
|
11
13
|
return new ethers_1.ethers.Contract(address, abis_1.NOMINEE_ELECTION_GOVERNOR_ABI, provider);
|
|
12
14
|
}
|
|
@@ -20,7 +22,8 @@ async function getLogQueryBlockRange(governor, proposalId, provider, offsetFromS
|
|
|
20
22
|
const snapshot = await (0, rpc_utils_1.queryWithRetry)(() => governor.proposalSnapshot(proposalId));
|
|
21
23
|
fromBlock = Math.max(0, snapshot.toNumber() - offsetFromSnapshot);
|
|
22
24
|
}
|
|
23
|
-
catch {
|
|
25
|
+
catch (err) {
|
|
26
|
+
log("proposalSnapshot failed for %s, using fallback range: %s", proposalId, (0, rpc_utils_1.getErrorMessage)(err));
|
|
24
27
|
fromBlock = Math.max(0, toBlock - fallbackRange);
|
|
25
28
|
}
|
|
26
29
|
return { fromBlock, toBlock };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/election/contracts.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/election/contracts.ts"],"names":[],"mappings":";;AAQA,gDAKC;AAED,8CAKC;AAED,sDAqBC;AA3CD,mCAA2C;AAC3C,4CAAyC;AACzC,kDAAqE;AACrE,kCAAsF;AACtF,4CAA0C;AAE1C,MAAM,GAAG,GAAG,gBAAO,CAAC,QAAQ,CAAC;AAE7B,SAAgB,kBAAkB,CAChC,UAAkB,qBAAS,CAAC,yBAAyB,EACrD,QAAoC;IAEpC,OAAO,IAAI,eAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,oCAA6B,EAAE,QAAQ,CAAC,CAAC;AAC/E,CAAC;AAED,SAAgB,iBAAiB,CAC/B,UAAkB,qBAAS,CAAC,wBAAwB,EACpD,QAAoC;IAEpC,OAAO,IAAI,eAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,mCAA4B,EAAE,QAAQ,CAAC,CAAC;AAC9E,CAAC;AAEM,KAAK,UAAU,qBAAqB,CACzC,QAAyB,EACzB,UAAkB,EAClB,QAAmC,EACnC,qBAA6B,IAAI,EACjC,gBAAwB,MAAM;IAE9B,MAAM,OAAO,GAAG,MAAM,IAAA,0BAAc,EAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC;IACtE,IAAI,SAAiB,CAAC;IACtB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAc,EAAY,GAAG,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;QAC9F,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,QAAQ,EAAE,GAAG,kBAAkB,CAAC,CAAC;IACpE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CACD,0DAA0D,EAC1D,UAAU,EACV,IAAA,2BAAe,EAAC,GAAG,CAAC,CACrB,CAAC;QACF,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;AAChC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"details.d.ts","sourceRoot":"","sources":["../../src/election/details.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"details.d.ts","sourceRoot":"","sources":["../../src/election/details.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;AAM3C,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EAKrB,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,UAAU,CAAC;AAoClB,wBAAsB,yBAAyB,CAC7C,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,sBAAsB,GAAE,MAA4C,GACnE,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAqCxC;AAED,wBAAsB,wBAAwB,CAC5C,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,qBAAqB,GAAE,MAA2C,EAClE,sBAAsB,GAAE,MAA4C,GACnE,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAmFvC;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,sBAAsB,GAC9B,0BAA0B,CAe5B;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,qBAAqB,GAAG,yBAAyB,CAShG"}
|
package/dist/election/details.js
CHANGED
|
@@ -9,6 +9,7 @@ const constants_1 = require("../constants");
|
|
|
9
9
|
const rpc_utils_1 = require("../utils/rpc-utils");
|
|
10
10
|
const abis_1 = require("../abis");
|
|
11
11
|
const logger_1 = require("../utils/logger");
|
|
12
|
+
const chain_1 = require("../utils/chain");
|
|
12
13
|
const multicall_1 = require("../utils/multicall");
|
|
13
14
|
const contracts_1 = require("./contracts");
|
|
14
15
|
const proposal_ids_1 = require("./proposal-ids");
|
|
@@ -52,8 +53,11 @@ async function getNomineeElectionDetails(electionIndex, provider, nomineeGoverno
|
|
|
52
53
|
(0, rpc_utils_1.queryWithRetry)(() => governor.proposalSnapshot(proposalId)),
|
|
53
54
|
]);
|
|
54
55
|
const quorumThreshold = await (0, rpc_utils_1.queryWithRetry)(() => governor.quorum(snapshotBlock.toNumber()));
|
|
55
|
-
const compliantNominees =
|
|
56
|
-
const excludedNominees =
|
|
56
|
+
const compliantNominees = [];
|
|
57
|
+
const excludedNominees = [];
|
|
58
|
+
for (const n of nominees) {
|
|
59
|
+
(n.isExcluded ? excludedNominees : compliantNominees).push(n);
|
|
60
|
+
}
|
|
57
61
|
return {
|
|
58
62
|
proposalId,
|
|
59
63
|
electionIndex,
|
|
@@ -102,7 +106,7 @@ async function getMemberElectionDetails(electionIndex, provider, memberGovernorA
|
|
|
102
106
|
}));
|
|
103
107
|
}
|
|
104
108
|
const nomineeDetails = nomineeWeights
|
|
105
|
-
.sort((a, b) => (
|
|
109
|
+
.sort((a, b) => -(0, chain_1.compareBigNumbers)(a.weight, b.weight))
|
|
106
110
|
.map((n, i) => ({
|
|
107
111
|
address: n.addr,
|
|
108
112
|
weightReceived: n.weight,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"details.js","sourceRoot":"","sources":["../../src/election/details.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"details.js","sourceRoot":"","sources":["../../src/election/details.ts"],"names":[],"mappings":"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"}
|
package/dist/election/index.d.ts
CHANGED
|
@@ -4,5 +4,7 @@ export { getElectionProposalParams, getMemberElectionProposalParams, prepareElec
|
|
|
4
4
|
export type { ElectionProposalParams, PreparedElectionCreation } from "./params";
|
|
5
5
|
export { getContenders, getNomineesWithVotes, getExcludedNominees } from "./participants";
|
|
6
6
|
export { getNomineeElectionDetails, getMemberElectionDetails, serializeNomineeDetails, serializeMemberDetails, } from "./details";
|
|
7
|
-
export { getElectionCount, checkElectionStatus, hasVettingPeriod, determineElectionPhase, } from "./status";
|
|
7
|
+
export { getElectionCount, checkElectionStatus, hasVettingPeriod, determineElectionPhase, getElectionStatus, getAllElectionStatuses, } from "./status";
|
|
8
|
+
export { encodeElectionVoteParams, decodeElectionVoteParams, getAddContenderTypedData, prepareAddContender, prepareContenderRegistration, prepareNomineeElectionVote, prepareMemberElectionVote, } from "./write";
|
|
9
|
+
export type { AddContenderTypedData, PreparedContenderRegistration } from "./write";
|
|
8
10
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/election/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGpE,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,2BAA2B,EAC3B,6BAA6B,GAC9B,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAC/B,uBAAuB,EACvB,4BAA4B,EAC5B,8BAA8B,GAC/B,MAAM,UAAU,CAAC;AAClB,YAAY,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAGjF,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAG1F,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACxB,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,WAAW,CAAC;AAGnB,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,UAAU,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/election/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGpE,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,2BAA2B,EAC3B,6BAA6B,GAC9B,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAC/B,uBAAuB,EACvB,4BAA4B,EAC5B,8BAA8B,GAC/B,MAAM,UAAU,CAAC;AAClB,YAAY,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAGjF,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAG1F,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACxB,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,WAAW,CAAC;AAGnB,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,sBAAsB,EACtB,iBAAiB,EACjB,sBAAsB,GACvB,MAAM,UAAU,CAAC;AAGlB,OAAO,EACL,wBAAwB,EACxB,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,EACnB,4BAA4B,EAC5B,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,SAAS,CAAC;AACjB,YAAY,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC"}
|
package/dist/election/index.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// Election Module Public API
|
|
4
4
|
// ============================================================================
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.determineElectionPhase = exports.hasVettingPeriod = exports.checkElectionStatus = exports.getElectionCount = exports.serializeMemberDetails = exports.serializeNomineeDetails = exports.getMemberElectionDetails = exports.getNomineeElectionDetails = exports.getExcludedNominees = exports.getNomineesWithVotes = exports.getContenders = exports.prepareMemberElectionExecution = exports.prepareMemberElectionTrigger = exports.prepareElectionCreation = exports.getMemberElectionProposalParams = exports.getElectionProposalParams = exports.getElectionIndexForProposalId = exports.getMemberElectionProposalId = exports.getElectionProposalId = exports.clearElectionCache = exports.getMemberGovernor = exports.getNomineeGovernor = void 0;
|
|
6
|
+
exports.prepareMemberElectionVote = exports.prepareNomineeElectionVote = exports.prepareContenderRegistration = exports.prepareAddContender = exports.getAddContenderTypedData = exports.decodeElectionVoteParams = exports.encodeElectionVoteParams = exports.getAllElectionStatuses = exports.getElectionStatus = exports.determineElectionPhase = exports.hasVettingPeriod = exports.checkElectionStatus = exports.getElectionCount = exports.serializeMemberDetails = exports.serializeNomineeDetails = exports.getMemberElectionDetails = exports.getNomineeElectionDetails = exports.getExcludedNominees = exports.getNomineesWithVotes = exports.getContenders = exports.prepareMemberElectionExecution = exports.prepareMemberElectionTrigger = exports.prepareElectionCreation = exports.getMemberElectionProposalParams = exports.getElectionProposalParams = exports.getElectionIndexForProposalId = exports.getMemberElectionProposalId = exports.getElectionProposalId = exports.clearElectionCache = exports.getMemberGovernor = exports.getNomineeGovernor = void 0;
|
|
7
7
|
// Contracts
|
|
8
8
|
var contracts_1 = require("./contracts");
|
|
9
9
|
Object.defineProperty(exports, "getNomineeGovernor", { enumerable: true, get: function () { return contracts_1.getNomineeGovernor; } });
|
|
@@ -38,4 +38,15 @@ Object.defineProperty(exports, "getElectionCount", { enumerable: true, get: func
|
|
|
38
38
|
Object.defineProperty(exports, "checkElectionStatus", { enumerable: true, get: function () { return status_1.checkElectionStatus; } });
|
|
39
39
|
Object.defineProperty(exports, "hasVettingPeriod", { enumerable: true, get: function () { return status_1.hasVettingPeriod; } });
|
|
40
40
|
Object.defineProperty(exports, "determineElectionPhase", { enumerable: true, get: function () { return status_1.determineElectionPhase; } });
|
|
41
|
+
Object.defineProperty(exports, "getElectionStatus", { enumerable: true, get: function () { return status_1.getElectionStatus; } });
|
|
42
|
+
Object.defineProperty(exports, "getAllElectionStatuses", { enumerable: true, get: function () { return status_1.getAllElectionStatuses; } });
|
|
43
|
+
// Write actions (prepare-only)
|
|
44
|
+
var write_1 = require("./write");
|
|
45
|
+
Object.defineProperty(exports, "encodeElectionVoteParams", { enumerable: true, get: function () { return write_1.encodeElectionVoteParams; } });
|
|
46
|
+
Object.defineProperty(exports, "decodeElectionVoteParams", { enumerable: true, get: function () { return write_1.decodeElectionVoteParams; } });
|
|
47
|
+
Object.defineProperty(exports, "getAddContenderTypedData", { enumerable: true, get: function () { return write_1.getAddContenderTypedData; } });
|
|
48
|
+
Object.defineProperty(exports, "prepareAddContender", { enumerable: true, get: function () { return write_1.prepareAddContender; } });
|
|
49
|
+
Object.defineProperty(exports, "prepareContenderRegistration", { enumerable: true, get: function () { return write_1.prepareContenderRegistration; } });
|
|
50
|
+
Object.defineProperty(exports, "prepareNomineeElectionVote", { enumerable: true, get: function () { return write_1.prepareNomineeElectionVote; } });
|
|
51
|
+
Object.defineProperty(exports, "prepareMemberElectionVote", { enumerable: true, get: function () { return write_1.prepareMemberElectionVote; } });
|
|
41
52
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/election/index.ts"],"names":[],"mappings":";AAAA,+EAA+E;AAC/E,6BAA6B;AAC7B,+EAA+E;;;AAE/E,YAAY;AACZ,yCAAoE;AAA3D,+GAAA,kBAAkB,OAAA;AAAE,8GAAA,iBAAiB,OAAA;AAE9C,0BAA0B;AAC1B,+CAKwB;AAJtB,kHAAA,kBAAkB,OAAA;AAClB,qHAAA,qBAAqB,OAAA;AACrB,2HAAA,2BAA2B,OAAA;AAC3B,6HAAA,6BAA6B,OAAA;AAG/B,yBAAyB;AACzB,mCAMkB;AALhB,mHAAA,yBAAyB,OAAA;AACzB,yHAAA,+BAA+B,OAAA;AAC/B,iHAAA,uBAAuB,OAAA;AACvB,sHAAA,4BAA4B,OAAA;AAC5B,wHAAA,8BAA8B,OAAA;AAIhC,eAAe;AACf,+CAA0F;AAAjF,6GAAA,aAAa,OAAA;AAAE,oHAAA,oBAAoB,OAAA;AAAE,mHAAA,mBAAmB,OAAA;AAEjE,UAAU;AACV,qCAKmB;AAJjB,oHAAA,yBAAyB,OAAA;AACzB,mHAAA,wBAAwB,OAAA;AACxB,kHAAA,uBAAuB,OAAA;AACvB,iHAAA,sBAAsB,OAAA;AAGxB,SAAS;AACT,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/election/index.ts"],"names":[],"mappings":";AAAA,+EAA+E;AAC/E,6BAA6B;AAC7B,+EAA+E;;;AAE/E,YAAY;AACZ,yCAAoE;AAA3D,+GAAA,kBAAkB,OAAA;AAAE,8GAAA,iBAAiB,OAAA;AAE9C,0BAA0B;AAC1B,+CAKwB;AAJtB,kHAAA,kBAAkB,OAAA;AAClB,qHAAA,qBAAqB,OAAA;AACrB,2HAAA,2BAA2B,OAAA;AAC3B,6HAAA,6BAA6B,OAAA;AAG/B,yBAAyB;AACzB,mCAMkB;AALhB,mHAAA,yBAAyB,OAAA;AACzB,yHAAA,+BAA+B,OAAA;AAC/B,iHAAA,uBAAuB,OAAA;AACvB,sHAAA,4BAA4B,OAAA;AAC5B,wHAAA,8BAA8B,OAAA;AAIhC,eAAe;AACf,+CAA0F;AAAjF,6GAAA,aAAa,OAAA;AAAE,oHAAA,oBAAoB,OAAA;AAAE,mHAAA,mBAAmB,OAAA;AAEjE,UAAU;AACV,qCAKmB;AAJjB,oHAAA,yBAAyB,OAAA;AACzB,mHAAA,wBAAwB,OAAA;AACxB,kHAAA,uBAAuB,OAAA;AACvB,iHAAA,sBAAsB,OAAA;AAGxB,SAAS;AACT,mCAOkB;AANhB,0GAAA,gBAAgB,OAAA;AAChB,6GAAA,mBAAmB,OAAA;AACnB,0GAAA,gBAAgB,OAAA;AAChB,gHAAA,sBAAsB,OAAA;AACtB,2GAAA,iBAAiB,OAAA;AACjB,gHAAA,sBAAsB,OAAA;AAGxB,+BAA+B;AAC/B,iCAQiB;AAPf,iHAAA,wBAAwB,OAAA;AACxB,iHAAA,wBAAwB,OAAA;AACxB,iHAAA,wBAAwB,OAAA;AACxB,4GAAA,mBAAmB,OAAA;AACnB,qHAAA,4BAA4B,OAAA;AAC5B,mHAAA,0BAA0B,OAAA;AAC1B,kHAAA,yBAAyB,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../src/election/params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAM3C,OAAO,
|
|
1
|
+
{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../src/election/params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAM3C,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAOvF,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AAuCD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,sBAAsB,EAC9B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,GAClB,mBAAmB,CAgBrB;AAED,wBAAsB,yBAAyB,CAC7C,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,sBAAsB,GAAE,MAA4C,GACnE,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAWxC;AAED,wBAAsB,+BAA+B,CACnD,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,qBAAqB,GAAE,MAA2C,GACjE,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAmBxC;AAMD,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,mBAAmB,CAAC;IACjC,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,EACrD,sBAAsB,GAAE,MAA4C,GACnE,wBAAwB,CAe1B;AAED,wBAAsB,4BAA4B,CAChD,cAAc,EAAE,IAAI,CAAC,sBAAsB,EAAE,eAAe,GAAG,yBAAyB,CAAC,EACzF,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,sBAAsB,GAAE,MAA4C,GACnE,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAwBrC;AAED,wBAAsB,8BAA8B,CAClD,cAAc,EAAE,IAAI,CAAC,sBAAsB,EAAE,eAAe,GAAG,kBAAkB,CAAC,EAClF,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,qBAAqB,GAAE,MAA2C,GACjE,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAwBrC"}
|
package/dist/election/params.js
CHANGED
|
@@ -11,44 +11,30 @@ const rpc_utils_1 = require("../utils/rpc-utils");
|
|
|
11
11
|
const abis_1 = require("../abis");
|
|
12
12
|
const salt_computation_1 = require("../utils/salt-computation");
|
|
13
13
|
const logger_1 = require("../utils/logger");
|
|
14
|
+
const governor_discovery_1 = require("../discovery/governor-discovery");
|
|
14
15
|
const contracts_1 = require("./contracts");
|
|
15
16
|
const proposal_ids_1 = require("./proposal-ids");
|
|
16
17
|
const log = logger_1.loggers.election;
|
|
17
18
|
async function findProposalCreatedParams(proposalId, governorAddress, governor, provider) {
|
|
18
19
|
const topic = abis_1.proposalCreatedInterface.getEventTopic("ProposalCreated");
|
|
19
|
-
|
|
20
|
-
try {
|
|
21
|
-
const snapshot = await (0, rpc_utils_1.queryWithRetry)(() => governor.proposalSnapshot(proposalId));
|
|
22
|
-
startBlock = Math.max(0, snapshot.toNumber() - 1000);
|
|
23
|
-
}
|
|
24
|
-
catch {
|
|
25
|
-
const currentBlock = await (0, rpc_utils_1.queryWithRetry)(() => provider.getBlockNumber());
|
|
26
|
-
startBlock = Math.max(0, currentBlock - 10000);
|
|
27
|
-
}
|
|
28
|
-
const currentBlock = await (0, rpc_utils_1.queryWithRetry)(() => provider.getBlockNumber());
|
|
20
|
+
const { fromBlock, toBlock } = await (0, contracts_1.getLogQueryBlockRange)(governor, proposalId, provider);
|
|
29
21
|
const logs = await (0, rpc_utils_1.queryWithRetry)(() => provider.getLogs({
|
|
30
22
|
address: governorAddress,
|
|
31
23
|
topics: [topic],
|
|
32
|
-
fromBlock
|
|
33
|
-
toBlock
|
|
24
|
+
fromBlock,
|
|
25
|
+
toBlock,
|
|
34
26
|
}));
|
|
35
27
|
for (const eventLog of logs) {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
descriptionHash: (0, salt_computation_1.saltFromDescription)(args.description),
|
|
47
|
-
};
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
catch {
|
|
51
|
-
continue;
|
|
28
|
+
const parsed = (0, governor_discovery_1.parseProposalCreatedRaw)(eventLog);
|
|
29
|
+
if (parsed && parsed.proposalId === proposalId) {
|
|
30
|
+
log("Found ProposalCreated event for proposal %s", proposalId);
|
|
31
|
+
return {
|
|
32
|
+
targets: parsed.targets,
|
|
33
|
+
values: parsed.values,
|
|
34
|
+
calldatas: parsed.calldatas,
|
|
35
|
+
description: parsed.description,
|
|
36
|
+
descriptionHash: (0, salt_computation_1.saltFromDescription)(parsed.description),
|
|
37
|
+
};
|
|
52
38
|
}
|
|
53
39
|
}
|
|
54
40
|
log("ProposalCreated event not found for proposal %s", proposalId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../src/election/params.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../src/election/params.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"participants.d.ts","sourceRoot":"","sources":["../../src/election/participants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;AAK3C,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"participants.d.ts","sourceRoot":"","sources":["../../src/election/participants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;AAK3C,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAO9D,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,sBAAsB,GAAE,MAA4C,GACnE,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA8B9B;AAED,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,sBAAsB,GAAE,MAA4C,GACnE,OAAO,CAAC,eAAe,EAAE,CAAC,CAmC5B;AAED,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,sBAAsB,GAAE,MAA4C,GACnE,OAAO,CAAC,eAAe,EAAE,CAAC,CAoD5B"}
|
|
@@ -10,19 +10,8 @@ const abis_1 = require("../abis");
|
|
|
10
10
|
const logger_1 = require("../utils/logger");
|
|
11
11
|
const multicall_1 = require("../utils/multicall");
|
|
12
12
|
const contracts_1 = require("./contracts");
|
|
13
|
+
const log_filters_1 = require("../utils/log-filters");
|
|
13
14
|
const log = logger_1.loggers.election;
|
|
14
|
-
/** Parse logs safely, returning mapped results for successfully parsed logs only */
|
|
15
|
-
function parseLogsWithMapper(logs, iface, mapper) {
|
|
16
|
-
return logs.flatMap((eventLog) => {
|
|
17
|
-
try {
|
|
18
|
-
const parsed = iface.parseLog(eventLog);
|
|
19
|
-
return [mapper(parsed, eventLog)];
|
|
20
|
-
}
|
|
21
|
-
catch {
|
|
22
|
-
return [];
|
|
23
|
-
}
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
15
|
async function getContenders(proposalId, provider, nomineeGovernorAddress = constants_1.ADDRESSES.ELECTION_NOMINEE_GOVERNOR) {
|
|
27
16
|
log("getContenders for proposal %s", proposalId);
|
|
28
17
|
const governor = (0, contracts_1.getNomineeGovernor)(nomineeGovernorAddress, provider);
|
|
@@ -37,11 +26,14 @@ async function getContenders(proposalId, provider, nomineeGovernorAddress = cons
|
|
|
37
26
|
fromBlock,
|
|
38
27
|
toBlock,
|
|
39
28
|
}));
|
|
40
|
-
const contenders =
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
29
|
+
const contenders = (0, log_filters_1.parseLogsSafe)(logs, (eventLog) => {
|
|
30
|
+
const parsed = iface.parseLog(eventLog);
|
|
31
|
+
return {
|
|
32
|
+
address: parsed.args.contender.toLowerCase(),
|
|
33
|
+
registeredAtBlock: eventLog.blockNumber,
|
|
34
|
+
registrationTxHash: eventLog.transactionHash,
|
|
35
|
+
};
|
|
36
|
+
});
|
|
45
37
|
log("Found %d contenders for proposal %s", contenders.length, proposalId);
|
|
46
38
|
return contenders;
|
|
47
39
|
}
|
|
@@ -79,21 +71,24 @@ async function getExcludedNominees(proposalId, provider, nomineeGovernorAddress
|
|
|
79
71
|
fromBlock,
|
|
80
72
|
toBlock,
|
|
81
73
|
}));
|
|
82
|
-
const parsedLogs =
|
|
83
|
-
eventLog
|
|
84
|
-
|
|
85
|
-
|
|
74
|
+
const parsedLogs = (0, log_filters_1.parseLogsSafe)(logs, (eventLog) => {
|
|
75
|
+
const parsed = iface.parseLog(eventLog);
|
|
76
|
+
return {
|
|
77
|
+
eventLog,
|
|
78
|
+
nominee: parsed.args.nominee,
|
|
79
|
+
};
|
|
80
|
+
});
|
|
86
81
|
if (parsedLogs.length === 0) {
|
|
87
82
|
return [];
|
|
88
83
|
}
|
|
89
|
-
const calls = parsedLogs.map((
|
|
84
|
+
const calls = parsedLogs.map((item) => (0, multicall_1.buildCallInput)(nomineeGovernorAddress, abis_1.nomineeElectionGovernorInterface, "votesReceived", [proposalId, item.nominee]));
|
|
90
85
|
const results = await (0, multicall_1.multicall)(provider, calls);
|
|
91
|
-
const excluded = parsedLogs.map((
|
|
92
|
-
address: nominee.toLowerCase(),
|
|
86
|
+
const excluded = parsedLogs.map((item, i) => ({
|
|
87
|
+
address: item.nominee.toLowerCase(),
|
|
93
88
|
votesReceived: results[i] ?? ethers_1.BigNumber.from(0),
|
|
94
89
|
isExcluded: true,
|
|
95
|
-
excludedAtBlock: eventLog.blockNumber,
|
|
96
|
-
exclusionTxHash: eventLog.transactionHash,
|
|
90
|
+
excludedAtBlock: item.eventLog.blockNumber,
|
|
91
|
+
exclusionTxHash: item.eventLog.transactionHash,
|
|
97
92
|
}));
|
|
98
93
|
log("Found %d excluded nominees for proposal %s", excluded.length, proposalId);
|
|
99
94
|
return excluded;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"participants.js","sourceRoot":"","sources":["../../src/election/participants.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"participants.js","sourceRoot":"","sources":["../../src/election/participants.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,8 +70,8 @@ async function getElectionProposalIds(electionIndex, provider, options = {}) {
|
|
|
70
70
|
]),
|
|
71
71
|
]);
|
|
72
72
|
const result = {
|
|
73
|
-
nomineeProposalId: nomineeState
|
|
74
|
-
memberProposalId: memberState
|
|
73
|
+
nomineeProposalId: nomineeState != null ? nomineeProposalId : null,
|
|
74
|
+
memberProposalId: memberState != null ? computedMemberProposalId : null,
|
|
75
75
|
};
|
|
76
76
|
electionProposalIdsCache.set(electionIndex, result, blockNumber);
|
|
77
77
|
return result;
|
|
@@ -87,29 +87,26 @@ async function getElectionIndexForProposalId(proposalId, l2Provider, l1Provider,
|
|
|
87
87
|
log("getElectionIndexForProposalId: searching for proposal %s", proposalId);
|
|
88
88
|
const status = await (0, status_1.checkElectionStatus)(l2Provider, l1Provider);
|
|
89
89
|
const electionCount = status.electionCount;
|
|
90
|
+
// Fetch all election proposal IDs in parallel
|
|
91
|
+
const electionIndices = Array.from({ length: electionCount }, (_, i) => i);
|
|
92
|
+
const results = await Promise.allSettled(electionIndices.map((i) => getElectionProposalIds(i, l2Provider, { blockNumber })));
|
|
93
|
+
// Search from newest to oldest for a match
|
|
90
94
|
for (let i = electionCount - 1; i >= 0; i--) {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
blockNumber,
|
|
95
|
-
});
|
|
96
|
-
log("got election %d proposal IDs", i);
|
|
97
|
-
const nomMatch = nomineeProposalId === proposalId;
|
|
98
|
-
const memMatch = memberProposalId === proposalId;
|
|
99
|
-
log("election %d: nomId=%s nomMatch=%s", i, nomineeProposalId, nomMatch);
|
|
100
|
-
if (nomMatch) {
|
|
101
|
-
log("Found proposal %s as nominee proposal for election %d", proposalId, i);
|
|
102
|
-
return i;
|
|
103
|
-
}
|
|
104
|
-
if (memMatch) {
|
|
105
|
-
log("Found proposal %s as member proposal for election %d", proposalId, i);
|
|
106
|
-
return i;
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
catch (err) {
|
|
110
|
-
log(" -> error: %s", err.message);
|
|
95
|
+
const result = results[i];
|
|
96
|
+
if (result.status === "rejected") {
|
|
97
|
+
log("election %d: error - %s", i, (0, rpc_utils_1.getErrorMessage)(result.reason));
|
|
111
98
|
continue;
|
|
112
99
|
}
|
|
100
|
+
const { nomineeProposalId, memberProposalId } = result.value;
|
|
101
|
+
log("election %d: nomId=%s memId=%s", i, nomineeProposalId, memberProposalId);
|
|
102
|
+
if (nomineeProposalId === proposalId) {
|
|
103
|
+
log("Found proposal %s as nominee proposal for election %d", proposalId, i);
|
|
104
|
+
return i;
|
|
105
|
+
}
|
|
106
|
+
if (memberProposalId === proposalId) {
|
|
107
|
+
log("Found proposal %s as member proposal for election %d", proposalId, i);
|
|
108
|
+
return i;
|
|
109
|
+
}
|
|
113
110
|
}
|
|
114
111
|
log("Proposal %s not found in any election", proposalId);
|
|
115
112
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proposal-ids.js","sourceRoot":"","sources":["../../src/election/proposal-ids.ts"],"names":[],"mappings":";;AA+BA,sEAEC;AAED,gDAEC;AAED,8DAmBC;AAED,sDAcC;AAED,kEAOC;AAED,wDAwCC;AAQD,sEAyCC;AA9KD,mCAA2C;AAC3C,4CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"proposal-ids.js","sourceRoot":"","sources":["../../src/election/proposal-ids.ts"],"names":[],"mappings":"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"}
|