File tree Expand file tree Collapse file tree 2 files changed +11
-8
lines changed
Expand file tree Collapse file tree 2 files changed +11
-8
lines changed Original file line number Diff line number Diff line change 2222--
2323module Chainweb.NodeVersion
2424( NodeVersion (.. )
25- , minAcceptedVersion
2625, isAcceptedVersion
2726, getNodeVersion
2827
@@ -58,6 +57,7 @@ import qualified Network.HTTP.Types as HTTP
5857
5958import Chainweb.HostAddress
6059import Chainweb.RestAPI.Utils
60+ import Chainweb.Time
6161import Chainweb.Utils
6262import Chainweb.Version
6363
@@ -84,12 +84,13 @@ instance FromJSON NodeVersion where
8484 parseJSON = parseJsonFromText " NodeVersion"
8585 {-# INLINE parseJSON #-}
8686
87- minAcceptedVersion :: NodeVersion
88- minAcceptedVersion = NodeVersion [1 ,2 ]
89- {-# INLINE minAcceptedVersion #-}
90-
91- isAcceptedVersion :: NodeVersion -> Bool
92- isAcceptedVersion = (<=) minAcceptedVersion
87+ isAcceptedVersion :: NodeVersion -> IO Bool
88+ isAcceptedVersion v = do
89+ let forkTime = fromJuste $ parseTimeMicros " 2025-11-07T04:00:00"
90+ now <- getCurrentTimeIntegral
91+ return $! now < forkTime || v >= forkVersion
92+ where
93+ forkVersion = NodeVersion [3 , 0 ]
9394{-# INLINE isAcceptedVersion #-}
9495
9596-- -------------------------------------------------------------------------- --
Original file line number Diff line number Diff line change @@ -381,7 +381,9 @@ guardPeerDb v nid peerDb pinf = do
381381 | isReserved -> return $ Left $ IsReservedHostAddress
382382 | otherwise -> canConnect >>= \ case
383383 Left e -> return $ Left $ IsNotReachable e
384- Right nodeVersion -> if isAcceptedVersion nodeVersion
384+ Right nodeVersion -> do
385+ accepted <- isAcceptedVersion nodeVersion
386+ if accepted
385387 then return $ Right pinf
386388 else return $ Left $ NodeVersionNotAccepted nodeVersion
387389 where
You can’t perform that action at this time.
0 commit comments