diff --git a/node/ChainwebNode.hs b/node/ChainwebNode.hs index 1304a1f224..5fe732b8de 100644 --- a/node/ChainwebNode.hs +++ b/node/ChainwebNode.hs @@ -529,7 +529,7 @@ pkgInfoScopes = -- SERVICE DATE for version 2.19 -- serviceDate :: Maybe String -serviceDate = Just "2023-09-07T00:00:00Z" +serviceDate = Just "2023-11-07T00:00:00Z" mainInfo :: ProgramInfo ChainwebNodeConfiguration mainInfo = programInfoValidate @@ -558,7 +558,7 @@ main = do logFunctionJson logger Error (ProcessDied $ show e) >> throwIO e ] $ do kt <- mapM iso8601ParseM serviceDate - withServiceDate (logFunctionText logger) kt $ void $ + withServiceDate (logFunctionText logger) kt $ void $ race (node conf logger) (gcRunner (logFunctionText logger)) where gcRunner lf = runForever lf "GarbageCollect" $ do diff --git a/src/Chainweb/Version/Mainnet.hs b/src/Chainweb/Version/Mainnet.hs index 8240fad9e0..05ebafaf8e 100644 --- a/src/Chainweb/Version/Mainnet.hs +++ b/src/Chainweb/Version/Mainnet.hs @@ -139,7 +139,7 @@ mainnet = ChainwebVersion Chainweb217Pact -> AllChains (ForkAtBlockHeight $ BlockHeight 3_250_348) -- 2022-12-02T00:00:00+00:00 Chainweb218Pact -> AllChains (ForkAtBlockHeight $ BlockHeight 3_512_363) -- 2023-03-03 00:00:00+00:00 Chainweb219Pact -> AllChains (ForkAtBlockHeight $ BlockHeight 3_774_423) -- 2023-06-02 00:00:00+00:00 - Chainweb220Pact -> AllChains ForkNever + Chainweb220Pact -> AllChains (ForkAtBlockHeight $ BlockHeight 4_056_980) -- 2023-09-08 00:00:00+00:00 , _versionGraphs = (to20ChainsMainnet, twentyChainGraph) `Above` diff --git a/src/Chainweb/Version/Testnet.hs b/src/Chainweb/Version/Testnet.hs index dab02a2531..11a31d8859 100644 --- a/src/Chainweb/Version/Testnet.hs +++ b/src/Chainweb/Version/Testnet.hs @@ -119,7 +119,7 @@ testnet = ChainwebVersion Chainweb217Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 2_777_367 -- 2022-12-01 12:00:00+00:00 Chainweb218Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 3_038_343 -- 2023-03-02 12:00:00+00:00 Chainweb219Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 3_299_753 -- 2023-06-01 12:00:00+00:00 - Chainweb220Pact -> AllChains ForkNever + Chainweb220Pact -> AllChains $ ForkAtBlockHeight $ BlockHeight 3_581_450 -- 2023-09-08 12:00:00+00:00 , _versionGraphs = (to20ChainsTestnet, twentyChainGraph) `Above` diff --git a/tools/calculate-release/CalculateRelease.hs b/tools/calculate-release/CalculateRelease.hs index 31728264b6..06c0074306 100644 --- a/tools/calculate-release/CalculateRelease.hs +++ b/tools/calculate-release/CalculateRelease.hs @@ -48,8 +48,8 @@ main = do putStrLn $ "Mainnet fork height (at " <> show mainnetForkTime <> "): " <> show mainnetForkHeight putStrLn $ "Testnet fork height (at " <> show testnetForkTime <> "): " <> show testnetForkHeight - let nextServiceDateDay = addGregorianMonthsClip 4 serviceDateDay - putStrLn $ "Next service date (+4 months): " <> show nextServiceDateDay + let nextServiceDateDay = addGregorianMonthsClip 2 serviceDateDay + putStrLn $ "Next service date (+2 months): " <> show nextServiceDateDay where heightOfChain0 :: String -> IO BlockHeight heightOfChain0 cutUrl =