Skip to content

fix: fall back to latest stake when L2 block lookup reverts #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rickstaa merged 3 commits into from
Mar 18, 2026
Merged

fix: fall back to latest stake when L2 block lookup reverts #593

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17b0a94
fix: fall back to latest stake when L2 block lookup reverts
rickstaa Mar 17, 2026
005a608
fix: log error detail in L2 block range fallback warning
rickstaa Mar 18, 2026
2060b16
refactor: improve L2 block range conditional formatting
rickstaa Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions lib/api/polls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,15 @@ export const getPollExtended = async (

const isActive = l1BlockNumber <= parseInt(poll?.endBlock ?? "0");

// Get L2 block number corresponding to end of poll
// Create NodeInterface to get L2 block number corresponding to end of poll
const totalStakeString = await getTotalStake(
Number(
isActive
? undefined
: (
await getL2BlockRangeForL1(Number(poll?.endBlock ?? "0"))
).lastBlock
)
);
// Get L2 block number corresponding to end of poll using NodeInterface
let l2BlockNumber: number | undefined;
if (!isActive) {
const { lastBlock } = await getL2BlockRangeForL1(
Number(poll?.endBlock ?? "0")
);
if (lastBlock > 0) l2BlockNumber = lastBlock;
}
const totalStakeString = await getTotalStake(l2BlockNumber);

const totalStake = +(totalStakeString ?? 0);
const noVoteStake = +(poll?.tally?.no || 0);
Expand Down Expand Up @@ -210,10 +208,10 @@ const getL2BlockRangeForL1 = async (l1BlockNumber: number) => {
lastBlock: l2BlockRangeForL1.lastBlock.toNumber(),
firstBlock: l2BlockRangeForL1.firstBlock.toNumber(),
};
} catch (error) {
console.error(
"Error getting L2 block range for L1 " + l1BlockNumber,
error
} catch (err) {
const detail = err instanceof Error ? err.message : String(err);
console.warn(
`Could not resolve L2 block range for L1 block ${l1BlockNumber} — using latest stake (${detail})`
);
return {
lastBlock: 0,
Expand Down
Loading