Skip to content

Extend ForkHeight to manage Fork numbers #20

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
edmundnoble merged 8 commits into from
Jan 12, 2026
Merged

Extend ForkHeight to manage Fork numbers #20

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d02e2a
Extend ForkHeight to manage by ForkNumber
kdafriend Jan 6, 2026
489728f
Apply suggestions from code review
kdafriend Jan 6, 2026
92fff2a
Add comments
kdafriend Jan 6, 2026
dd5a906
maxBlockGasLimit, minimumBlockHeaderHistory, verifiersAt use ForkNumber
kdafriend Jan 7, 2026
4e7fb56
Headers compaction height depends on the ForkNumber + Rename some va…
kdafriend Jan 7, 2026
e0f4b5f
Validate that no fork or rules application happens by height after Ch…
kdafriend Jan 7, 2026
e64444c
Apply suggestions from code review
kdafriend Jan 8, 2026
52c1a46
Check that no fork use fork number of 0
kdafriend Jan 12, 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
27 changes: 18 additions & 9 deletions src/Chainweb/Version/Registry.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ unregisterVersion v = do
then error "You cannot unregister mainnet or testnet04 versions"
else atomicModifyIORef' versionMap $ \m -> (HM.delete (_versionCode v) m, ())

validateNoHeightAfterChainweb31' :: ChainwebVersion -> ForkHeight -> Either String ()
validateNoHeightAfterChainweb31' v fh =
validateNoHeightAfterChainweb31 :: ChainwebVersion -> ForkHeight -> Either String ()
validateNoHeightAfterChainweb31 v fh =
case (fork31Height, fh) of
(Just (ForkAtBlockHeight refAth), ForkAtBlockHeight ath) ->
if ath > (refAth + 1)
Expand All @@ -89,12 +89,21 @@ validateNoHeightAfterChainweb31' v fh =
where
fork31Height = v ^? versionForks . at Chainweb31 . _Just . atChain (unsafeChainId 0)

validateNoHeightAfterChainweb31 :: ChainwebVersion -> Either String ()
validateNoHeightAfterChainweb31 v =
(mapM_ (mapM_ (validateNoHeightAfterChainweb31' v)) (v ^. versionForks))
>> (mapM_ (validateNoHeightAfterChainweb31' v . fst) $ ruleElems $ v ^. versionMaxBlockGasLimit)
>> (mapM_ (validateNoHeightAfterChainweb31' v . fst) $ ruleElems $ v ^. versionSpvProofRootValidWindow)
>> (mapM_ (mapM_ (validateNoHeightAfterChainweb31' v . fst) . ruleElems) $ v ^. versionVerifierPluginNames)
validateNoForkAtZero :: ForkHeight -> Either String ()
validateNoForkAtZero (ForkAtForkNumber atn)
| atn == 0 = Left ("ValidateSting: Fork Numbers can't be 0 ")
| otherwise = Right ()
Copy link
Copy Markdown

@edmundnoble edmundnoble Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can delete this case.

validateNoForkAtZero _ = Right ()


validateForkHeights :: ChainwebVersion -> Either String ()
validateForkHeights v =
(mapM_ (mapM_ doValidation) (v ^. versionForks))
Copy link
Copy Markdown

@edmundnoble edmundnoble Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be made a bit nicer in a follow-up with do instead of >>.

>> (mapM_ (doValidation . fst) $ ruleElems $ v ^. versionMaxBlockGasLimit)
>> (mapM_ (doValidation . fst) $ ruleElems $ v ^. versionSpvProofRootValidWindow)
>> (mapM_ (mapM_ (doValidation . fst) . ruleElems) $ v ^. versionVerifierPluginNames)
where
doValidation fh = validateNoHeightAfterChainweb31 v fh >> validateNoForkAtZero fh

validateVersion :: HasCallStack => ChainwebVersion -> IO ()
validateVersion v = do
Expand Down Expand Up @@ -125,7 +134,7 @@ validateVersion v = do
, [ "validateVersion: some pact upgrade has no transactions"
| any (any isUpgradeEmpty) (_versionUpgrades v) ]
, [ err
| Left err <- [validateNoHeightAfterChainweb31 v] ]
| Left err <- [validateForkHeights v] ]
-- TODO: check that pact 4/5 upgrades are only enabled when pact 4/5 is enabled
]
unless (null errors) $
Expand Down
Loading