@gzeoneth/gov-tracker 0.3.0 → 0.4.0-alpha.addr-feedback.36ae67e
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 +6 -11
- package/dist/calldata/decoder.d.ts.map +1 -1
- package/dist/calldata/decoder.js +35 -76
- package/dist/calldata/decoder.js.map +1 -1
- package/dist/calldata/parameter-decoder.d.ts +21 -1
- package/dist/calldata/parameter-decoder.d.ts.map +1 -1
- package/dist/calldata/parameter-decoder.js +30 -0
- 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 +39 -19
- 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 +61 -58
- package/dist/cli/lib/cli.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/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/useProposals.d.ts.map +1 -1
- package/dist/cli/tui/hooks/useProposals.js +24 -34
- 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 +6 -6
- package/dist/cli/tui/utils/index.d.ts.map +1 -1
- package/dist/cli/tui/utils/index.js +14 -14
- 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.map +1 -1
- package/dist/cli/tui/utils/navigation.js +5 -1
- 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/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/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 +3 -3
- package/dist/cli/tui/views/ElectionView.js.map +1 -1
- package/dist/cli/tui/views/StageView.d.ts.map +1 -1
- package/dist/cli/tui/views/StageView.js +1 -1
- package/dist/cli/tui/views/StageView.js.map +1 -1
- package/dist/constants.d.ts +11 -1
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +16 -4
- package/dist/constants.js.map +1 -1
- package/dist/data/bundled-cache.json +21513 -22619
- package/dist/deduplication.d.ts.map +1 -1
- package/dist/deduplication.js +36 -33
- package/dist/deduplication.js.map +1 -1
- package/dist/discovery/governor-discovery.d.ts.map +1 -1
- package/dist/discovery/governor-discovery.js +44 -49
- package/dist/discovery/governor-discovery.js.map +1 -1
- package/dist/discovery/security-council.d.ts +15 -0
- package/dist/discovery/security-council.d.ts.map +1 -1
- package/dist/discovery/security-council.js +42 -19
- package/dist/discovery/security-council.js.map +1 -1
- package/dist/discovery/timelock-discovery.d.ts.map +1 -1
- package/dist/discovery/timelock-discovery.js +62 -84
- 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 +35 -33
- package/dist/election/details.js.map +1 -1
- package/dist/election/index.d.ts +3 -6
- package/dist/election/index.d.ts.map +1 -1
- package/dist/election/index.js +7 -14
- package/dist/election/index.js.map +1 -1
- package/dist/election/params.d.ts +8 -1
- package/dist/election/params.d.ts.map +1 -1
- package/dist/election/params.js +48 -13
- package/dist/election/params.js.map +1 -1
- package/dist/election/participants.d.ts.map +1 -1
- package/dist/election/participants.js +19 -27
- package/dist/election/participants.js.map +1 -1
- package/dist/election/proposal-ids.d.ts +10 -0
- package/dist/election/proposal-ids.d.ts.map +1 -1
- package/dist/election/proposal-ids.js +42 -5
- package/dist/election/proposal-ids.js.map +1 -1
- package/dist/election/status.d.ts.map +1 -1
- package/dist/election/status.js +6 -0
- package/dist/election/status.js.map +1 -1
- package/dist/index.d.ts +24 -14
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +40 -16
- package/dist/index.js.map +1 -1
- package/dist/simulation/simulation-data.d.ts +2 -2
- package/dist/simulation/simulation-data.d.ts.map +1 -1
- package/dist/simulation/simulation-data.js +36 -26
- package/dist/simulation/simulation-data.js.map +1 -1
- package/dist/stages/builder.js +1 -1
- package/dist/stages/builder.js.map +1 -1
- package/dist/stages/l2-to-l1-message.d.ts.map +1 -1
- package/dist/stages/l2-to-l1-message.js +5 -11
- package/dist/stages/l2-to-l1-message.js.map +1 -1
- package/dist/stages/proposal-queued.d.ts.map +1 -1
- package/dist/stages/proposal-queued.js +4 -1
- package/dist/stages/proposal-queued.js.map +1 -1
- package/dist/stages/retryables.d.ts +4 -3
- package/dist/stages/retryables.d.ts.map +1 -1
- package/dist/stages/retryables.js +35 -57
- package/dist/stages/retryables.js.map +1 -1
- package/dist/stages/timelock.d.ts +4 -1
- package/dist/stages/timelock.d.ts.map +1 -1
- package/dist/stages/timelock.js +59 -67
- package/dist/stages/timelock.js.map +1 -1
- package/dist/stages/utils.d.ts +69 -5
- package/dist/stages/utils.d.ts.map +1 -1
- package/dist/stages/utils.js +152 -42
- package/dist/stages/utils.js.map +1 -1
- package/dist/tracker/bundled-cache.d.ts +127 -0
- package/dist/tracker/bundled-cache.d.ts.map +1 -0
- package/dist/tracker/bundled-cache.js +198 -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.map +1 -1
- package/dist/tracker/discovery.js +60 -43
- package/dist/tracker/discovery.js.map +1 -1
- package/dist/tracker/pipeline.d.ts +25 -6
- package/dist/tracker/pipeline.d.ts.map +1 -1
- package/dist/tracker/pipeline.js +428 -211
- package/dist/tracker/pipeline.js.map +1 -1
- package/dist/tracker/query.d.ts +21 -0
- package/dist/tracker/query.d.ts.map +1 -1
- package/dist/tracker/query.js +86 -9
- package/dist/tracker/query.js.map +1 -1
- package/dist/tracker/stage-runner.d.ts +62 -0
- package/dist/tracker/stage-runner.d.ts.map +1 -0
- package/dist/tracker/stage-runner.js +80 -0
- package/dist/tracker/stage-runner.js.map +1 -0
- package/dist/tracker/state.d.ts +65 -0
- package/dist/tracker/state.d.ts.map +1 -1
- package/dist/tracker/state.js +194 -14
- package/dist/tracker/state.js.map +1 -1
- package/dist/tracker.d.ts +36 -8
- package/dist/tracker.d.ts.map +1 -1
- package/dist/tracker.js +264 -201
- 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/core.d.ts +3 -2
- package/dist/types/core.d.ts.map +1 -1
- package/dist/types/core.js +3 -2
- package/dist/types/core.js.map +1 -1
- package/dist/types/index.d.ts +1 -1
- 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 +11 -0
- package/dist/types/tracking.d.ts.map +1 -1
- package/dist/utils/log-filters.d.ts.map +1 -1
- package/dist/utils/log-filters.js +5 -9
- package/dist/utils/log-filters.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 +11 -0
- package/dist/utils/rpc-utils.d.ts.map +1 -1
- package/dist/utils/rpc-utils.js +18 -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 +11 -4
- package/dist/utils/timing.d.ts.map +1 -1
- package/dist/utils/timing.js +45 -15
- package/dist/utils/timing.js.map +1 -1
- package/package.json +7 -6
- 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 -14
- 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
- package/dist/election/prepare.d.ts +0 -10
- package/dist/election/prepare.d.ts.map +0 -1
- package/dist/election/prepare.js +0 -52
- package/dist/election/prepare.js.map +0 -1
- package/dist/election/tracking.d.ts +0 -28
- package/dist/election/tracking.d.ts.map +0 -1
- package/dist/election/tracking.js +0 -412
- package/dist/election/tracking.js.map +0 -1
package/dist/election/params.js
CHANGED
|
@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.buildExecuteTransaction = buildExecuteTransaction;
|
|
4
4
|
exports.getElectionProposalParams = getElectionProposalParams;
|
|
5
5
|
exports.getMemberElectionProposalParams = getMemberElectionProposalParams;
|
|
6
|
+
exports.prepareElectionCreation = prepareElectionCreation;
|
|
7
|
+
exports.prepareMemberElectionTrigger = prepareMemberElectionTrigger;
|
|
8
|
+
exports.prepareMemberElectionExecution = prepareMemberElectionExecution;
|
|
6
9
|
const constants_1 = require("../constants");
|
|
7
10
|
const rpc_utils_1 = require("../utils/rpc-utils");
|
|
8
11
|
const abis_1 = require("../abis");
|
|
@@ -13,21 +16,12 @@ const proposal_ids_1 = require("./proposal-ids");
|
|
|
13
16
|
const log = logger_1.loggers.election;
|
|
14
17
|
async function findProposalCreatedParams(proposalId, governorAddress, governor, provider) {
|
|
15
18
|
const topic = abis_1.proposalCreatedInterface.getEventTopic("ProposalCreated");
|
|
16
|
-
|
|
17
|
-
try {
|
|
18
|
-
const snapshot = await (0, rpc_utils_1.queryWithRetry)(() => governor.proposalSnapshot(proposalId));
|
|
19
|
-
startBlock = Math.max(0, snapshot.toNumber() - 1000);
|
|
20
|
-
}
|
|
21
|
-
catch {
|
|
22
|
-
const currentBlock = await (0, rpc_utils_1.queryWithRetry)(() => provider.getBlockNumber());
|
|
23
|
-
startBlock = Math.max(0, currentBlock - 10000);
|
|
24
|
-
}
|
|
25
|
-
const currentBlock = await (0, rpc_utils_1.queryWithRetry)(() => provider.getBlockNumber());
|
|
19
|
+
const { fromBlock, toBlock } = await (0, contracts_1.getLogQueryBlockRange)(governor, proposalId, provider);
|
|
26
20
|
const logs = await (0, rpc_utils_1.queryWithRetry)(() => provider.getLogs({
|
|
27
21
|
address: governorAddress,
|
|
28
22
|
topics: [topic],
|
|
29
|
-
fromBlock
|
|
30
|
-
toBlock
|
|
23
|
+
fromBlock,
|
|
24
|
+
toBlock,
|
|
31
25
|
}));
|
|
32
26
|
for (const eventLog of logs) {
|
|
33
27
|
try {
|
|
@@ -37,7 +31,7 @@ async function findProposalCreatedParams(proposalId, governorAddress, governor,
|
|
|
37
31
|
log("Found ProposalCreated event for proposal %s", proposalId);
|
|
38
32
|
return {
|
|
39
33
|
targets: args.targets,
|
|
40
|
-
values: args.
|
|
34
|
+
values: parsed.args[3], // `values` collides with ethers.js internals
|
|
41
35
|
calldatas: args.calldatas,
|
|
42
36
|
description: args.description,
|
|
43
37
|
descriptionHash: (0, salt_computation_1.saltFromDescription)(args.description),
|
|
@@ -90,4 +84,45 @@ async function getMemberElectionProposalParams(electionIndex, provider, memberGo
|
|
|
90
84
|
}
|
|
91
85
|
return findProposalCreatedParams(memberProposalId, memberGovernorAddress, memberGovernor, provider);
|
|
92
86
|
}
|
|
87
|
+
function prepareElectionCreation(electionStatus, nomineeGovernorAddress = constants_1.ADDRESSES.ELECTION_NOMINEE_GOVERNOR) {
|
|
88
|
+
const governor = (0, contracts_1.getNomineeGovernor)(nomineeGovernorAddress);
|
|
89
|
+
const calldata = governor.interface.encodeFunctionData("createElection", []);
|
|
90
|
+
return {
|
|
91
|
+
transaction: {
|
|
92
|
+
to: nomineeGovernorAddress,
|
|
93
|
+
data: calldata,
|
|
94
|
+
value: "0",
|
|
95
|
+
chain: "arb1",
|
|
96
|
+
chainId: 42161,
|
|
97
|
+
description: `createElection() on SecurityCouncilNomineeElectionGovernor for election #${electionStatus.electionCount}`,
|
|
98
|
+
},
|
|
99
|
+
electionIndex: electionStatus.electionCount,
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
async function prepareMemberElectionTrigger(electionStatus, provider, nomineeGovernorAddress = constants_1.ADDRESSES.ELECTION_NOMINEE_GOVERNOR) {
|
|
103
|
+
log("prepareMemberElectionTrigger for election %d", electionStatus.electionIndex);
|
|
104
|
+
if (!electionStatus.canProceedToMemberPhase) {
|
|
105
|
+
log("Cannot proceed to member phase - not ready");
|
|
106
|
+
return null;
|
|
107
|
+
}
|
|
108
|
+
const params = await getElectionProposalParams(electionStatus.electionIndex, provider, nomineeGovernorAddress);
|
|
109
|
+
if (!params) {
|
|
110
|
+
log("Could not find proposal params for election %d", electionStatus.electionIndex);
|
|
111
|
+
return null;
|
|
112
|
+
}
|
|
113
|
+
return buildExecuteTransaction(params, nomineeGovernorAddress, `execute() on NomineeElectionGovernor to trigger member election #${electionStatus.electionIndex}`);
|
|
114
|
+
}
|
|
115
|
+
async function prepareMemberElectionExecution(electionStatus, provider, memberGovernorAddress = constants_1.ADDRESSES.ELECTION_MEMBER_GOVERNOR) {
|
|
116
|
+
log("prepareMemberElectionExecution for election %d", electionStatus.electionIndex);
|
|
117
|
+
if (!electionStatus.canExecuteMember) {
|
|
118
|
+
log("Cannot execute member election - not ready");
|
|
119
|
+
return null;
|
|
120
|
+
}
|
|
121
|
+
const params = await getMemberElectionProposalParams(electionStatus.electionIndex, provider, memberGovernorAddress);
|
|
122
|
+
if (!params) {
|
|
123
|
+
log("Could not find proposal params for member election %d", electionStatus.electionIndex);
|
|
124
|
+
return null;
|
|
125
|
+
}
|
|
126
|
+
return buildExecuteTransaction(params, memberGovernorAddress, `execute() on MemberElectionGovernor to install new Security Council members for election #${electionStatus.electionIndex}`);
|
|
127
|
+
}
|
|
93
128
|
//# sourceMappingURL=params.js.map
|
|
@@ -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":";;AAmEA,0DAoBC;AAED,8DAeC;AAED,0EAuBC;AAWD,0DAkBC;AAED,oEA4BC;AAED,wEA4BC;AAzND,4CAAyC;AACzC,kDAAoD;AACpD,kCAAsE;AACtE,gEAAgE;AAChE,4CAA0C;AAO1C,2CAA2F;AAC3F,iDAAkF;AAElF,MAAM,GAAG,GAAG,gBAAO,CAAC,QAAQ,CAAC;AAU7B,KAAK,UAAU,yBAAyB,CACtC,UAAkB,EAClB,eAAuB,EACvB,QAAyB,EACzB,QAAmC;IAEnC,MAAM,KAAK,GAAG,+BAAwB,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAExE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,iCAAqB,EAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IAE3F,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAc,EAAC,GAAG,EAAE,CACrC,QAAQ,CAAC,OAAO,CAAC;QACf,OAAO,EAAE,eAAe;QACxB,MAAM,EAAE,CAAC,KAAK,CAAC;QACf,SAAS;QACT,OAAO;KACR,CAAC,CACH,CAAC;IAEF,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,+BAAwB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC3D,MAAM,IAAI,GAAG,MAAM,CAAC,IAA2C,CAAC;YAChE,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,UAAU,EAAE,CAAC;gBAC9C,GAAG,CAAC,6CAA6C,EAAE,UAAU,CAAC,CAAC;gBAC/D,OAAO;oBACL,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,6CAA6C;oBACrE,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,eAAe,EAAE,IAAA,sCAAmB,EAAC,IAAI,CAAC,WAAW,CAAC;iBACvD,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IAED,GAAG,CAAC,iDAAiD,EAAE,UAAU,CAAC,CAAC;IACnE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,uBAAuB,CACrC,MAA8B,EAC9B,eAAuB,EACvB,WAAmB;IAEnB,MAAM,QAAQ,GAAG,wBAAiB,CAAC,kBAAkB,CAAC,SAAS,EAAE;QAC/D,MAAM,CAAC,OAAO;QACd,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,SAAS;QAChB,MAAM,CAAC,eAAe;KACvB,CAAC,CAAC;IAEH,OAAO;QACL,EAAE,EAAE,eAAe;QACnB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;QACV,KAAK,EAAE,MAAM;QACb,OAAO,EAAE,KAAK;QACd,WAAW;KACZ,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,aAAqB,EACrB,QAAmC,EACnC,yBAAiC,qBAAS,CAAC,yBAAyB;IAEpE,GAAG,CAAC,wCAAwC,EAAE,aAAa,CAAC,CAAC;IAE7D,MAAM,UAAU,GAAG,MAAM,IAAA,oCAAqB,EAAC,aAAa,EAAE,QAAQ,EAAE,sBAAsB,CAAC,CAAC;IAChG,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,GAAG,CAAC,sCAAsC,EAAE,aAAa,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,IAAA,8BAAkB,EAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;IACtE,OAAO,yBAAyB,CAAC,UAAU,EAAE,sBAAsB,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAC3F,CAAC;AAEM,KAAK,UAAU,+BAA+B,CACnD,aAAqB,EACrB,QAAmC,EACnC,wBAAgC,qBAAS,CAAC,wBAAwB;IAElE,GAAG,CAAC,8CAA8C,EAAE,aAAa,CAAC,CAAC;IAEnE,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;IAC1E,MAAM,gBAAgB,GAAG,MAAM,IAAA,wCAAyB,EAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAExF,IAAI,CAAC;QACH,MAAM,IAAA,0BAAc,EAAS,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC7E,CAAC;IAAC,MAAM,CAAC;QACP,GAAG,CAAC,0CAA0C,EAAE,aAAa,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,yBAAyB,CAC9B,gBAAgB,EAChB,qBAAqB,EACrB,cAAc,EACd,QAAQ,CACT,CAAC;AACJ,CAAC;AAWD,SAAgB,uBAAuB,CACrC,cAAqD,EACrD,yBAAiC,qBAAS,CAAC,yBAAyB;IAEpE,MAAM,QAAQ,GAAG,IAAA,8BAAkB,EAAC,sBAAsB,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAE7E,OAAO;QACL,WAAW,EAAE;YACX,EAAE,EAAE,sBAAsB;YAC1B,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,MAAM;YACb,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,4EAA4E,cAAc,CAAC,aAAa,EAAE;SACxH;QACD,aAAa,EAAE,cAAc,CAAC,aAAa;KAC5C,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,4BAA4B,CAChD,cAAyF,EACzF,QAAmC,EACnC,yBAAiC,qBAAS,CAAC,yBAAyB;IAEpE,GAAG,CAAC,8CAA8C,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;IAElF,IAAI,CAAC,cAAc,CAAC,uBAAuB,EAAE,CAAC;QAC5C,GAAG,CAAC,4CAA4C,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAC5C,cAAc,CAAC,aAAa,EAC5B,QAAQ,EACR,sBAAsB,CACvB,CAAC;IAEF,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,GAAG,CAAC,gDAAgD,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;QACpF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,uBAAuB,CAC5B,MAAM,EACN,sBAAsB,EACtB,oEAAoE,cAAc,CAAC,aAAa,EAAE,CACnG,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,8BAA8B,CAClD,cAAkF,EAClF,QAAmC,EACnC,wBAAgC,qBAAS,CAAC,wBAAwB;IAElE,GAAG,CAAC,gDAAgD,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;IAEpF,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;QACrC,GAAG,CAAC,4CAA4C,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,+BAA+B,CAClD,cAAc,CAAC,aAAa,EAC5B,QAAQ,EACR,qBAAqB,CACtB,CAAC;IAEF,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,GAAG,CAAC,uDAAuD,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;QAC3F,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,uBAAuB,CAC5B,MAAM,EACN,qBAAqB,EACrB,6FAA6F,cAAc,CAAC,aAAa,EAAE,CAC5H,CAAC;AACJ,CAAC"}
|
|
@@ -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,6 +10,7 @@ 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
15
|
async function getContenders(proposalId, provider, nomineeGovernorAddress = constants_1.ADDRESSES.ELECTION_NOMINEE_GOVERNOR) {
|
|
15
16
|
log("getContenders for proposal %s", proposalId);
|
|
@@ -25,20 +26,13 @@ async function getContenders(proposalId, provider, nomineeGovernorAddress = cons
|
|
|
25
26
|
fromBlock,
|
|
26
27
|
toBlock,
|
|
27
28
|
}));
|
|
28
|
-
const contenders =
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
registrationTxHash: eventLog.transactionHash,
|
|
36
|
-
},
|
|
37
|
-
];
|
|
38
|
-
}
|
|
39
|
-
catch {
|
|
40
|
-
return [];
|
|
41
|
-
}
|
|
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
|
+
};
|
|
42
36
|
});
|
|
43
37
|
log("Found %d contenders for proposal %s", contenders.length, proposalId);
|
|
44
38
|
return contenders;
|
|
@@ -77,26 +71,24 @@ async function getExcludedNominees(proposalId, provider, nomineeGovernorAddress
|
|
|
77
71
|
fromBlock,
|
|
78
72
|
toBlock,
|
|
79
73
|
}));
|
|
80
|
-
const parsedLogs =
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
return [];
|
|
87
|
-
}
|
|
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
|
+
};
|
|
88
80
|
});
|
|
89
81
|
if (parsedLogs.length === 0) {
|
|
90
82
|
return [];
|
|
91
83
|
}
|
|
92
|
-
const calls = parsedLogs.map((
|
|
84
|
+
const calls = parsedLogs.map((item) => (0, multicall_1.buildCallInput)(nomineeGovernorAddress, abis_1.nomineeElectionGovernorInterface, "votesReceived", [proposalId, item.nominee]));
|
|
93
85
|
const results = await (0, multicall_1.multicall)(provider, calls);
|
|
94
|
-
const excluded = parsedLogs.map((
|
|
95
|
-
address: nominee.toLowerCase(),
|
|
86
|
+
const excluded = parsedLogs.map((item, i) => ({
|
|
87
|
+
address: item.nominee.toLowerCase(),
|
|
96
88
|
votesReceived: results[i] ?? ethers_1.BigNumber.from(0),
|
|
97
89
|
isExcluded: true,
|
|
98
|
-
excludedAtBlock: eventLog.blockNumber,
|
|
99
|
-
exclusionTxHash: eventLog.transactionHash,
|
|
90
|
+
excludedAtBlock: item.eventLog.blockNumber,
|
|
91
|
+
exclusionTxHash: item.eventLog.transactionHash,
|
|
100
92
|
}));
|
|
101
93
|
log("Found %d excluded nominees for proposal %s", excluded.length, proposalId);
|
|
102
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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"}
|
|
@@ -15,4 +15,14 @@ export declare function computeElectionProposalId(electionIndex: number, governo
|
|
|
15
15
|
export declare function getElectionProposalId(electionIndex: number, provider: ethers.providers.Provider, nomineeGovernorAddress?: string): Promise<string | null>;
|
|
16
16
|
export declare function getMemberElectionProposalId(electionIndex: number, provider: ethers.providers.Provider, memberGovernorAddress?: string): Promise<string>;
|
|
17
17
|
export declare function getElectionProposalIds(electionIndex: number, provider: ethers.providers.Provider, options?: GetElectionProposalIdsOptions): Promise<ElectionProposalIds>;
|
|
18
|
+
/**
|
|
19
|
+
* Find the election index for a given proposal ID (nominee or member).
|
|
20
|
+
*
|
|
21
|
+
* Searches through all elections to find which one contains the given proposal ID.
|
|
22
|
+
* Returns null if the proposal ID is not found in any election.
|
|
23
|
+
*/
|
|
24
|
+
export declare function getElectionIndexForProposalId(proposalId: string, l2Provider: ethers.providers.Provider, l1Provider: ethers.providers.Provider, options?: {
|
|
25
|
+
novaProvider?: ethers.providers.Provider;
|
|
26
|
+
blockNumber?: number;
|
|
27
|
+
}): Promise<number | null>;
|
|
18
28
|
//# sourceMappingURL=proposal-ids.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proposal-ids.d.ts","sourceRoot":"","sources":["../../src/election/proposal-ids.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"proposal-ids.d.ts","sourceRoot":"","sources":["../../src/election/proposal-ids.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;AAa3C,MAAM,WAAW,mBAAmB;IAClC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,6BAA6B;IAC5C,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAQD,wBAAgB,6BAA6B,IAAI,IAAI,CAEpD;AAED,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED,wBAAsB,yBAAyB,CAC7C,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ,GACxB,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,qBAAqB,CACzC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,sBAAsB,GAAE,MAA4C,GACnE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAUxB;AAED,wBAAsB,2BAA2B,CAC/C,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,qBAAqB,GAAE,MAA2C,GACjE,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED,wBAAsB,sBAAsB,CAC1C,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,OAAO,GAAE,6BAAkC,GAC1C,OAAO,CAAC,mBAAmB,CAAC,CAoC9B;AAED;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,OAAO,GAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/E,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoCxB"}
|
|
@@ -6,6 +6,7 @@ exports.computeElectionProposalId = computeElectionProposalId;
|
|
|
6
6
|
exports.getElectionProposalId = getElectionProposalId;
|
|
7
7
|
exports.getMemberElectionProposalId = getMemberElectionProposalId;
|
|
8
8
|
exports.getElectionProposalIds = getElectionProposalIds;
|
|
9
|
+
exports.getElectionIndexForProposalId = getElectionIndexForProposalId;
|
|
9
10
|
const ethers_1 = require("ethers");
|
|
10
11
|
const constants_1 = require("../constants");
|
|
11
12
|
const rpc_utils_1 = require("../utils/rpc-utils");
|
|
@@ -13,7 +14,10 @@ const abis_1 = require("../abis");
|
|
|
13
14
|
const multicall_1 = require("../utils/multicall");
|
|
14
15
|
const salt_computation_1 = require("../utils/salt-computation");
|
|
15
16
|
const block_cache_1 = require("../utils/block-cache");
|
|
17
|
+
const logger_1 = require("../utils/logger");
|
|
16
18
|
const contracts_1 = require("./contracts");
|
|
19
|
+
const status_1 = require("./status");
|
|
20
|
+
const log = logger_1.loggers.election;
|
|
17
21
|
const electionProposalIdsCache = new block_cache_1.BlockScopedCache({
|
|
18
22
|
isImmutable: (result) => {
|
|
19
23
|
return result.nomineeProposalId === null || result.memberProposalId !== null;
|
|
@@ -59,19 +63,52 @@ async function getElectionProposalIds(electionIndex, provider, options = {}) {
|
|
|
59
63
|
computeElectionProposalId(electionIndex, nomineeGovernor),
|
|
60
64
|
computeElectionProposalId(electionIndex, memberGovernor),
|
|
61
65
|
]);
|
|
62
|
-
const
|
|
66
|
+
const [nomineeState, memberState] = await (0, multicall_1.multicall)(provider, [
|
|
63
67
|
(0, multicall_1.buildCallInput)(nomineeGovernorAddress, abis_1.governorInterface, "state", [nomineeProposalId]),
|
|
64
68
|
(0, multicall_1.buildCallInput)(memberGovernorAddress, abis_1.governorInterface, "state", [
|
|
65
69
|
computedMemberProposalId,
|
|
66
70
|
]),
|
|
67
71
|
]);
|
|
68
|
-
const nomineeStateResult = stateResults[0];
|
|
69
|
-
const memberStateResult = stateResults[1];
|
|
70
72
|
const result = {
|
|
71
|
-
nomineeProposalId:
|
|
72
|
-
memberProposalId:
|
|
73
|
+
nomineeProposalId: nomineeState !== null ? nomineeProposalId : null,
|
|
74
|
+
memberProposalId: memberState !== null ? computedMemberProposalId : null,
|
|
73
75
|
};
|
|
74
76
|
electionProposalIdsCache.set(electionIndex, result, blockNumber);
|
|
75
77
|
return result;
|
|
76
78
|
}
|
|
79
|
+
/**
|
|
80
|
+
* Find the election index for a given proposal ID (nominee or member).
|
|
81
|
+
*
|
|
82
|
+
* Searches through all elections to find which one contains the given proposal ID.
|
|
83
|
+
* Returns null if the proposal ID is not found in any election.
|
|
84
|
+
*/
|
|
85
|
+
async function getElectionIndexForProposalId(proposalId, l2Provider, l1Provider, options = {}) {
|
|
86
|
+
const { blockNumber } = options;
|
|
87
|
+
log("getElectionIndexForProposalId: searching for proposal %s", proposalId);
|
|
88
|
+
const status = await (0, status_1.checkElectionStatus)(l2Provider, l1Provider);
|
|
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
|
|
94
|
+
for (let i = electionCount - 1; i >= 0; i--) {
|
|
95
|
+
const result = results[i];
|
|
96
|
+
if (result.status === "rejected") {
|
|
97
|
+
log("election %d: error - %s", i, (0, rpc_utils_1.getErrorMessage)(result.reason));
|
|
98
|
+
continue;
|
|
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
|
+
}
|
|
110
|
+
}
|
|
111
|
+
log("Proposal %s not found in any election", proposalId);
|
|
112
|
+
return null;
|
|
113
|
+
}
|
|
77
114
|
//# sourceMappingURL=proposal-ids.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proposal-ids.js","sourceRoot":"","sources":["../../src/election/proposal-ids.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"proposal-ids.js","sourceRoot":"","sources":["../../src/election/proposal-ids.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/election/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;AAI3C,OAAO,EAAc,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AASpF;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,sBAAsB,GAAE,MAA4C,GACnE,OAAO,CAAC,MAAM,CAAC,CAajB;AAED,wBAAgB,sBAAsB,CACpC,oBAAoB,EAAE,aAAa,GAAG,IAAI,EAC1C,gBAAgB,EAAE,MAAM,GAAG,IAAI,EAC/B,mBAAmB,EAAE,aAAa,GAAG,IAAI,EACzC,iBAAiB,EAAE,OAAO,GACzB,aAAa,CA0Bf;AAED,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,sBAAsB,GAAE,MAA4C,GACnE,OAAO,CAAC,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/election/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;AAI3C,OAAO,EAAc,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AASpF;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,sBAAsB,GAAE,MAA4C,GACnE,OAAO,CAAC,MAAM,CAAC,CAajB;AAED,wBAAgB,sBAAsB,CACpC,oBAAoB,EAAE,aAAa,GAAG,IAAI,EAC1C,gBAAgB,EAAE,MAAM,GAAG,IAAI,EAC/B,mBAAmB,EAAE,aAAa,GAAG,IAAI,EACzC,iBAAiB,EAAE,OAAO,GACzB,aAAa,CA0Bf;AAED,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,sBAAsB,GAAE,MAA4C,GACnE,OAAO,CAAC,cAAc,CAAC,CAwEzB;AAED,wBAAsB,gBAAgB,CACpC,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,GAClC,OAAO,CAAC,OAAO,CAAC,CASlB"}
|
package/dist/election/status.js
CHANGED
|
@@ -64,6 +64,9 @@ async function checkElectionStatus(l2Provider, l1Provider, nomineeGovernorAddres
|
|
|
64
64
|
]),
|
|
65
65
|
]);
|
|
66
66
|
const electionCount = electionCountResult[0];
|
|
67
|
+
if (!electionCount) {
|
|
68
|
+
throw new Error("Failed to fetch election count from nominee governor");
|
|
69
|
+
}
|
|
67
70
|
log("L1 block number from L2: %s", l1BlockNumber.toString());
|
|
68
71
|
const l1Block = await (0, rpc_utils_1.queryWithRetry)(() => l1Provider.getBlock(l1BlockNumber.toNumber()));
|
|
69
72
|
if (!l1Block) {
|
|
@@ -78,6 +81,9 @@ async function checkElectionStatus(l2Provider, l1Provider, nomineeGovernorAddres
|
|
|
78
81
|
]);
|
|
79
82
|
const nextElectionTimestamp = electionResults[0];
|
|
80
83
|
const cohort = electionResults[1];
|
|
84
|
+
if (!nextElectionTimestamp || cohort === undefined) {
|
|
85
|
+
throw new Error("Failed to fetch election details from nominee governor");
|
|
86
|
+
}
|
|
81
87
|
log("electionCount=%s nextTimestamp=%s cohort=%d", electionCount.toString(), nextElectionTimestamp.toString(), cohort);
|
|
82
88
|
const secondsUntilElection = Math.max(0, nextElectionTimestamp.toNumber() - currentL1Timestamp);
|
|
83
89
|
const canCreateElection = secondsUntilElection === 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/election/status.ts"],"names":[],"mappings":";;AAqBA,4CAgBC;AAED,wDA+BC;AAED,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/election/status.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -4,13 +4,14 @@
|
|
|
4
4
|
* A lightweight, high-performance library for tracking Arbitrum DAO
|
|
5
5
|
* governance proposal lifecycle stages.
|
|
6
6
|
*
|
|
7
|
-
* @example Basic usage
|
|
7
|
+
* @example Basic usage with RPC URLs
|
|
8
8
|
* ```typescript
|
|
9
9
|
* import { createTracker, findExecutableStage } from "@gzeoneth/gov-tracker";
|
|
10
10
|
*
|
|
11
|
+
* // Accepts RPC URLs directly (creates providers internally)
|
|
11
12
|
* const tracker = createTracker({
|
|
12
|
-
* l2Provider:
|
|
13
|
-
* l1Provider:
|
|
13
|
+
* l2Provider: "https://arb1.arbitrum.io/rpc",
|
|
14
|
+
* l1Provider: "https://eth.llamarpc.com",
|
|
14
15
|
* });
|
|
15
16
|
*
|
|
16
17
|
* const results = await tracker.trackByTxHash(proposalCreationTxHash);
|
|
@@ -25,9 +26,13 @@
|
|
|
25
26
|
*
|
|
26
27
|
* @example Browser usage with LocalStorageCache
|
|
27
28
|
* ```typescript
|
|
28
|
-
* import { createTracker, LocalStorageCache } from "@gzeoneth/gov-tracker";
|
|
29
|
+
* import { createTracker, LocalStorageCache, extractProposals } from "@gzeoneth/gov-tracker";
|
|
29
30
|
* import bundledCache from "@gzeoneth/gov-tracker/bundled-cache.json";
|
|
30
31
|
*
|
|
32
|
+
* // Extract typed data from bundled cache
|
|
33
|
+
* const proposals = extractProposals(bundledCache);
|
|
34
|
+
* console.log(`Loaded ${proposals.length} proposals from cache`);
|
|
35
|
+
*
|
|
31
36
|
* // Initialize cache with bundled data for faster first load
|
|
32
37
|
* const cache = new LocalStorageCache("arb-gov:");
|
|
33
38
|
* for (const [key, checkpoint] of Object.entries(bundledCache)) {
|
|
@@ -35,23 +40,24 @@
|
|
|
35
40
|
* }
|
|
36
41
|
*
|
|
37
42
|
* const tracker = createTracker({
|
|
38
|
-
* l2Provider:
|
|
39
|
-
* l1Provider:
|
|
43
|
+
* l2Provider: "https://arb1.arbitrum.io/rpc",
|
|
44
|
+
* l1Provider: "https://eth.llamarpc.com",
|
|
40
45
|
* cache, // Updates persist to localStorage
|
|
41
46
|
* });
|
|
42
47
|
* ```
|
|
43
48
|
* @packageDocumentation
|
|
44
49
|
*/
|
|
45
50
|
export { ProposalStageTracker, createTracker, extractTimelockLink } from "./tracker";
|
|
46
|
-
export type { StageType, StageStatus, Chain, KnownChain, L2Chain, ChainId, TrackedStage, StageTransaction, StageTiming, StageDataMap, TypedTrackedStage, NextStageHints, StageTrackResult, TrackingResult, TrackingInput, GovernorTrackingInput, TimelockTrackingInput, TrackingCheckpoint, TrackerStats, TrackingProgress, OnProgressCallback, DiscoveryWatermarks, DiscoveryTargets, PreparedTransaction, PrepareResult, PrepareOptions, TrackerOptions, CacheAdapter, ChunkingConfig, ProposalType, GovernorCapability, ProposalState, ProposalData, TimelockState, TimelockParams, TimelockBatchParams, CallScheduledData, TimelockLink, ProposalCreatedData, VotingActiveData, ProposalQueuedData, TimelockStageData, L2ToL1MessageStageData, RetryableStageData, CohortType, ElectionPhase, ElectionProposalStatus, ElectionStatus, ElectionCheckResult, DecodingSource, DecodedCalldata, DecodedParameter, RetryableTicketData, KnownAddress, SignatureEntry, SimulationType, BaseSimulationData, RetryableSimulationData, TimelockSimulationData, CallSimulationData, SimulationData, ExtractedSimulation, } from "./types";
|
|
51
|
+
export type { StageType, StageStatus, Chain, KnownChain, L2Chain, ChainId, TrackedStage, StageTransaction, StageTiming, StageDataMap, TypedTrackedStage, NextStageHints, StageTrackResult, TrackingResult, TrackingInput, GovernorTrackingInput, TimelockTrackingInput, TrackingCheckpoint, TrackerStats, TrackingProgress, OnProgressCallback, DiscoveryWatermarks, DiscoveryTargets, PreparedTransaction, PrepareResult, PrepareOptions, TrackerOptions, ProviderOrUrl, CacheAdapter, ChunkingConfig, ProposalType, GovernorCapability, ProposalState, ProposalData, TimelockState, TimelockParams, TimelockBatchParams, CallScheduledData, TimelockLink, ProposalCreatedData, VotingActiveData, ProposalQueuedData, TimelockStageData, L2ToL1MessageStageData, RetryableStageData, CohortType, ElectionPhase, ElectionProposalStatus, ElectionStatus, ElectionCheckResult, ElectionContender, ElectionNominee, MemberElectionNominee, NomineeElectionDetails, MemberElectionDetails, SerializableContender, SerializableNominee, SerializableMemberNominee, SerializableNomineeDetails, SerializableMemberDetails, DecodingSource, DecodedCalldata, DecodedParameter, RetryableTicketData, KnownAddress, SignatureEntry, SimulationType, BaseSimulationData, RetryableSimulationData, TimelockSimulationData, CallSimulationData, SimulationData, ExtractedSimulation, } from "./types";
|
|
47
52
|
export { isStageType, getStageData, isKnownChain, isL2Chain, isRetryable } from "./types";
|
|
48
53
|
export { ADDRESSES, CHAIN_IDS, DEFAULT_RPC_URLS, CHUNK_SIZES, NETWORK_IDS, TIMELOCK_SELECTORS, isElectionGovernor, buildDefaultTargets, } from "./constants";
|
|
49
|
-
export { findExecutableStage, findAllExecutableStages, needsAction, getTrackingStatusSummary, getCurrentStage, areAllStagesComplete, extractOperationId, isTimelockStage, isConstitutional, findStage, } from "./stages/utils";
|
|
54
|
+
export { findExecutableStage, findAllExecutableStages, needsAction, getTrackingStatusSummary, getLifecyclePhase, getCurrentStage, areAllStagesComplete, extractOperationId, isTimelockStage, isConstitutional, findStage, } from "./stages/utils";
|
|
55
|
+
export type { LifecyclePhase } from "./stages/utils";
|
|
50
56
|
export { detectProposalType, isElectionProposal, detectGovernorCapabilities, getTimelockAddress, getProposalState, discoverProposalByTxHash, } from "./discovery/governor-discovery";
|
|
51
57
|
export type { DiscoveredProposal } from "./discovery/governor-discovery";
|
|
52
58
|
export { isKnownL2Timelock, isL1Timelock, getTimelockOperationState, getTimelockState, findCallScheduledByTxHash, } from "./discovery/timelock-discovery";
|
|
53
59
|
export type { DiscoveredTimelockOp } from "./discovery/timelock-discovery";
|
|
54
|
-
export { isSecurityCouncilOperation, isSecurityCouncilElectionProposal, extractSecurityCouncilParams, extractSecurityCouncilParamsForOperation, checkVettingPeriod, } from "./discovery/security-council";
|
|
60
|
+
export { isSecurityCouncilOperation, isSecurityCouncilElectionProposal, extractSecurityCouncilParams, extractSecurityCouncilParamsForOperation, extractAllSecurityCouncilParams, checkVettingPeriod, getHighestScNonce, isScOperationSuperseded, } from "./discovery/security-council";
|
|
55
61
|
export type { SecurityCouncilOperationParams, SecurityCouncilBatchParams, } from "./discovery/security-council";
|
|
56
62
|
export { calculateEta, calculateExpectedEta, calculateRemainingSeconds, estimateTimestampFromBlock, getL1BlockNumberFromL2, invalidateBlockInfoCache, isStageStale, } from "./utils/timing";
|
|
57
63
|
export { saltFromDescription, generateSecurityCouncilSalt, decodeL1TimelockSchedule, } from "./utils/salt-computation";
|
|
@@ -65,21 +71,25 @@ export type { RetryablePrepareOptions } from "./stages/retryables";
|
|
|
65
71
|
export { prepareGovernorQueue } from "./stages/proposal-queued";
|
|
66
72
|
export type { GovernorProposalParams } from "./stages/proposal-queued";
|
|
67
73
|
export { getTxUrl, getStageTransactionUrl, GOVERNANCE_START_BLOCKS, ELECTION_TIMING, } from "./constants";
|
|
68
|
-
export { getStageMetadata, formatStageTitle } from "./utils/stage-metadata";
|
|
74
|
+
export { getStageMetadata, formatStageTitle, getAllStageMetadata, ALL_STAGE_TYPES, } from "./utils/stage-metadata";
|
|
69
75
|
export type { StageMetadata } from "./utils/stage-metadata";
|
|
70
76
|
export { addressEquals, isAddressIn, getChain } from "./utils/chain";
|
|
71
77
|
export { chainIdToChain, chainToChainId, getChainDisplayName } from "./types";
|
|
72
78
|
export { isGasEstimationError } from "./utils/rpc-utils";
|
|
73
79
|
export { truncateDescription, sanitizeForDisplay, safeJsonParse, MAX_DESCRIPTION_LENGTH, } from "./utils/sanitize";
|
|
74
|
-
export { wrapText, truncate, safeStringify, formatValue, formatDate, CHAIN_TO_CHAIN_ID, type StageDataItem, formatStageData, getTxHash, getProposalIdDisplay, type FormattedLine, formatDecodedCalldata, filterVisibleLines,
|
|
75
|
-
export { getElectionCount, checkElectionStatus, hasVettingPeriod,
|
|
80
|
+
export { wrapText, truncate, safeStringify, formatValue, formatDate, CHAIN_TO_CHAIN_ID, type StageDataItem, formatStageData, getTxHash, getProposalIdDisplay, type FormattedLine, formatDecodedCalldata, filterVisibleLines, } from "./utils/formatters";
|
|
81
|
+
export { getElectionCount, checkElectionStatus, hasVettingPeriod, getElectionIndexForProposalId, getElectionProposalId, getElectionProposalParams, getMemberElectionProposalParams, prepareElectionCreation, prepareMemberElectionTrigger, prepareMemberElectionExecution, getContenders, getNomineesWithVotes, getExcludedNominees, getNomineeElectionDetails, getMemberElectionDetails, serializeNomineeDetails, serializeMemberDetails, } from "./election";
|
|
76
82
|
export type { PreparedElectionCreation, ElectionProposalParams } from "./election";
|
|
77
83
|
export { isSecurityCouncilTimelockOp, linkCheckpointToChild, getParentCheckpoint, isChildCheckpoint, filterChildCheckpoints, getChildToParentMap, getChildCheckpoints, getDeduplicationStats, findPotentialParent, autoLinkOrphanedCheckpoints, } from "./deduplication";
|
|
78
84
|
export type { DeduplicationStats } from "./deduplication";
|
|
79
85
|
export { decodeCalldata, decodeCalldataArray, lookupSignature, lookupLocalSignature, LookupSignatureOptions, parseParamTypes, isLikelyCalldata, formatDecodedValue, getAddressLabel, isRetryableTicketMagic, decodeRetryableTicket, getRetryableChainName, RETRYABLE_TICKET_MAGIC, } from "./calldata";
|
|
80
86
|
export { prepareRetryableSimulation, prepareTimelockSimulation, prepareCallSimulation, extractAllSimulationsFromDecoded, } from "./simulation";
|
|
81
87
|
export { FileCache, LocalStorageCache, MemoryCache, getBundledCachePath } from "./tracker/cache";
|
|
88
|
+
export { extractProposals, extractTimelockOps, extractElections, extractOperationIds, extractTimelockLinkFromStages, getWatermarksFromCache, getVotingDataFromStages, } from "./tracker/bundled-cache";
|
|
89
|
+
export type { BundledCache, ExtractedProposal, ExtractedTimelockOp, ExtractedElection, } from "./tracker/bundled-cache";
|
|
82
90
|
export { createCheckpoint, createTrackingState } from "./tracker/state";
|
|
83
|
-
export {
|
|
84
|
-
export {
|
|
91
|
+
export { getElectionContext, proposalStateToStageStatus } from "./tracker/pipeline";
|
|
92
|
+
export { createCheckpointMetadata, isCheckpointComplete, isCheckpointErrored, getCheckpointErrorCount, computeCacheStats, electionCacheKey, txHashCacheKey, timelockOpCacheKey, isElectionKey, isTxKey, isTimelockOpKey, isDiscoveryKey, parseElectionKey, parseTimelockOpKey, trimFromStage, DEFAULT_ERROR_THRESHOLD, ELECTION_KEY_PREFIX, TX_KEY_PREFIX, } from "./tracker/checkpoint-helpers";
|
|
93
|
+
export { WATERMARKS_KEY, loadWatermarks } from "./tracker/discovery";
|
|
94
|
+
export type { LoadedWatermarks } from "./tracker/discovery";
|
|
85
95
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|