diff --git a/frontend/pages/index.tsx b/frontend/pages/index.tsx index 49d4ecb..178a932 100644 --- a/frontend/pages/index.tsx +++ b/frontend/pages/index.tsx @@ -11,6 +11,8 @@ import SiteTitle from "../components/SiteTitle.tsx"; import SiteMenu from "../components/SiteMenu.tsx"; import { useStoreState } from "../state/index.ts"; +const forkName = config.fork.name; + const DescriptionBlock = styled.div` max-width: 600px; margin: auto; @@ -38,6 +40,7 @@ const CurrentPeriod = styled.h2` const LockinInfo = styled.h2` font-size: 16px; + text-align: right; margin-bottom: 10px; color: #ff9b20; text-shadow: #000 2px 2px 0px; @@ -51,9 +54,8 @@ const BootstrappingInProgress = styled.p` export default function Blocks() { const blocks = useStoreState((store) => store.blocks); - const forkName = config.fork.name; - const treshhold = config.fork.threshold; + const currentNumberOfBlocks = blocks.reduce((prev, currentBlock) => prev + +(currentBlock.signals !== undefined), 0); const currentNumberOfSignallingBlocks = blocks.reduce( (prev, currentBlock) => prev + +(currentBlock.signals ?? false), 0 @@ -63,6 +65,14 @@ export default function Blocks() { const blocksLeftInThisPeriod = blocks.reduce((prev, currentBlock) => prev + +(currentBlock.signals === undefined), 0); const currentPeriodFailed = blocksLeftForActivation > blocksLeftInThisPeriod; + const currentSignallingRatio = currentNumberOfSignallingBlocks / currentNumberOfBlocks; + const currentSignallingPercentage = (currentSignallingRatio * 100).toFixed(2); + let willProbablyActivate: boolean | undefined = undefined; + if (currentNumberOfBlocks >= 144) { + const estimatedSignallingBlocksLeft = Math.floor(currentSignallingRatio * blocksLeftInThisPeriod); + willProbablyActivate = estimatedSignallingBlocksLeft <= blocksLeftInThisPeriod && currentSignallingRatio >= 0.9; + } + return ( @@ -78,22 +88,33 @@ export default function Blocks() { Current signalling period of 2016 blocks + {/* 90% of blocks within the period has to signal. */} + {lockedIn && <>{forkName.toUpperCase()} IS LOCKED IN FOR DEPLOYMENT!} {!lockedIn && ( <> - {blocksLeftForActivation} {forkName} blocks left until softfork is locked in. -
- {!currentPeriodFailed && <>90% of the blocks within the period has to signal.} + {!currentPeriodFailed && ( + <> + {blocksLeftForActivation} {forkName} blocks left until softfork is locked in. +
+ {willProbablyActivate && ( + <>Taproot will lock in with the current signalling ratio ({currentSignallingPercentage}%)! + )} + {!willProbablyActivate && ( + <>Taproot will not lock in with the current signalling ratio ({currentSignallingPercentage}%) + )} + + )} {currentPeriodFailed && ( <> - {forkName} cannot be locked in within this period + {forkName} cannot be locked in within this period.
- (90% of the blocks has to signal). + {blocksLeftForActivation} more blocks required to reach 90%, only {blocksLeftInThisPeriod} blocks + left. )} )} - {lockedIn && <>{forkName.toUpperCase()} IS LOCKED IN FOR DEPLOYMENT!} diff --git a/frontend/state/index.ts b/frontend/state/index.ts index f392ff5..064c05c 100644 --- a/frontend/state/index.ts +++ b/frontend/state/index.ts @@ -18,22 +18,31 @@ export const model: IStoreModel = { actions.setBlocks(json); } else { const start = 0; - const end = 1800; + const end = 1500; const blocks: IBlock[] = []; for (let i = start; i < 2016; i++) { if (i < end) { - blocks.push({ - height: i, - signals: Math.floor(Math.random() * 100 + 1) > 35, - coinbase: undefined, - miner: undefined, - }); + if (Math.floor(Math.random() * 100 + 1) > 20) { + blocks.push({ + height: i, + signals: true, + miner: "abc", + minerWebsite: undefined, + }); + } else { + blocks.push({ + height: i, + signals: false, + miner: "def", + minerWebsite: undefined, + }); + } } else { blocks.push({ height: i, signals: undefined, - coinbase: undefined, miner: undefined, + minerWebsite: undefined, }); } }