update version forks for Chainweb 2.24

Change-Id: I82023a0ceb73b8de32e9f3512de67b477d6bbfa0
kadena-io · May 21, 2024 · 00efb0f · 00efb0f
1 parent 5b63bcf
commit 00efb0f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/node/ChainwebNode.hs b/node/ChainwebNode.hs
@@ -535,10 +535,10 @@ pkgInfoScopes =
 -- -------------------------------------------------------------------------- --
 -- main
 
--- SERVICE DATE for version 2.23
+-- SERVICE DATE for version 2.24
 --
 serviceDate :: Maybe String
-serviceDate = Just "2024-05-29T00:00:00Z"
+serviceDate = Just "2024-08-21T00:00:00Z"
 
 mainInfo :: ProgramInfo ChainwebNodeConfiguration
 mainInfo = programInfoValidate

diff --git a/src/Chainweb/Version.hs b/src/Chainweb/Version.hs
@@ -205,6 +205,7 @@ data Fork
     | Chainweb222Pact
     | Chainweb223Pact
     | Chainweb224Pact
+    | Chainweb225Pact
     -- always add new forks at the end, not in the middle of the constructors.
     deriving stock (Bounded, Generic, Eq, Enum, Ord, Show)
     deriving anyclass (NFData, Hashable)
@@ -239,6 +240,7 @@ instance HasTextRepresentation Fork where
     toText Chainweb222Pact = "chainweb222Pact"
     toText Chainweb223Pact = "chainweb223Pact"
     toText Chainweb224Pact = "chainweb224Pact"
+    toText Chainweb225Pact = "chainweb225Pact"
 
     fromText "slowEpoch" = return SlowEpoch
     fromText "vuln797Fix" = return Vuln797Fix
@@ -269,6 +271,7 @@ instance HasTextRepresentation Fork where
     fromText "chainweb222Pact" = return Chainweb222Pact
     fromText "chainweb223Pact" = return Chainweb223Pact
     fromText "chainweb224Pact" = return Chainweb224Pact
+    fromText "chainweb225Pact" = return Chainweb225Pact
     fromText t = throwM . TextFormatException $ "Unknown Chainweb fork: " <> t
 
 instance ToJSON Fork where

diff --git a/src/Chainweb/Version/Guards.hs b/src/Chainweb/Version/Guards.hs
@@ -45,6 +45,7 @@ module Chainweb.Version.Guards
     , chainweb222Pact
     , chainweb223Pact
     , chainweb224Pact
+    , chainweb225Pact
     , pact44NewTrans
     , pactParserVersion
     , maxBlockGasLimit
@@ -253,6 +254,9 @@ chainweb223Pact = checkFork atOrAfter Chainweb223Pact
 chainweb224Pact :: ChainwebVersion -> ChainId -> BlockHeight -> Bool
 chainweb224Pact = checkFork atOrAfter Chainweb224Pact
 
+chainweb225Pact :: ChainwebVersion -> ChainId -> BlockHeight -> Bool
+chainweb225Pact = checkFork atOrAfter Chainweb225Pact
+
 pactParserVersion :: ChainwebVersion -> ChainId -> BlockHeight -> PactParserVersion
 pactParserVersion v cid bh
     | chainweb213Pact v cid bh = PactParserChainweb213

diff --git a/src/Chainweb/Version/Mainnet.hs b/src/Chainweb/Version/Mainnet.hs
@@ -148,7 +148,8 @@ mainnet = ChainwebVersion
         Chainweb221Pact -> AllChains (ForkAtBlockHeight $ BlockHeight 4_177_889) -- 2023-10-20 00:00:00+00:00
         Chainweb222Pact -> AllChains (ForkAtBlockHeight $ BlockHeight 4_335_753) -- 2023-12-14 00:00:00+00:00
         Chainweb223Pact -> AllChains (ForkAtBlockHeight $ BlockHeight 4_577_530) -- 2024-03-07 00:00:00+00:00
-        Chainweb224Pact -> AllChains ForkNever
+        Chainweb224Pact -> AllChains (ForkAtBlockHeight $ BlockHeight 4_819_246) -- 2024-05-30 00:00:00+00:00
+        Chainweb225Pact -> AllChains ForkNever
 
     , _versionGraphs =
         (to20ChainsMainnet, twentyChainGraph) `Above`

diff --git a/src/Chainweb/Version/Testnet.hs b/src/Chainweb/Version/Testnet.hs
@@ -128,7 +128,8 @@ testnet = ChainwebVersion
         Chainweb221Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 3_702_250 -- 2023-10-19 12:00:00+00:00
         Chainweb222Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 3_859_808 -- 2023-12-13 12:00:00+00:00
         Chainweb223Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 4_100_681 -- 2024-03-06 12:00:00+00:00
-        Chainweb224Pact -> AllChains ForkNever
+        Chainweb224Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 4_333_587 -- 2024-05-29 12:00:00+00:00
+        Chainweb225Pact -> AllChains ForkNever
 
     , _versionGraphs =
         (to20ChainsTestnet, twentyChainGraph) `Above`

diff --git a/test/Chainweb/Test/TestVersions.hs b/test/Chainweb/Test/TestVersions.hs
@@ -161,6 +161,7 @@ fastForks = tabulateHashMap $ \case
     Chainweb222Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 36
     Chainweb223Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 38
     Chainweb224Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 40
+    Chainweb225Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 42
 
 -- | A test version without Pact or PoW, with only one chain graph.
 barebonesTestVersion :: ChainGraph -> ChainwebVersion
@@ -282,6 +283,7 @@ slowForks = tabulateHashMap \case
     Chainweb222Pact -> AllChains $ ForkAtBlockHeight (BlockHeight 115)
     Chainweb223Pact -> AllChains $ ForkAtBlockHeight (BlockHeight 120)
     Chainweb224Pact -> AllChains $ ForkAtBlockHeight (BlockHeight 125)
+    Chainweb225Pact -> AllChains $ ForkAtBlockHeight (BlockHeight 130)
 
 -- | CPM version (see `cpmTestVersion`) with forks and upgrades slowly enabled.
 slowForkingCpmTestVersion :: ChainGraph -> ChainwebVersion