Merge branch 'master' into lars/replace-service-date-by-forknumbers

Author: larskuhtz

.github/workflows/applications.yml

@@ -364,7 +364,6 @@ jobs:
         cabal build -j2 --ghc-options=-j2 \
           chainweb:bench:bench \
           exe:b64 \
-          exe:calculate-release \
           exe:compact \
           exe:db-checksum \
           exe:ea \
@@ -403,7 +402,6 @@ jobs:
         mkdir -p artifacts/chainweb
         cp $(cabal list-bin b64) artifacts/chainweb
         cp $(cabal list-bin bench) artifacts/chainweb
-        cp $(cabal list-bin calculate-release) artifacts/chainweb
         cp $(cabal list-bin chainweb-node) artifacts/chainweb
         cp $(cabal list-bin chainweb-storage-tests) artifacts/chainweb
         cp $(cabal list-bin chainweb-tests) artifacts/chainweb

.github/workflows/macos.yaml

@@ -120,7 +120,6 @@ jobs:
         cabal build -j \
           chainweb:bench:bench \
           exe:b64 \
-          exe:calculate-release \
           exe:compact \
           exe:db-checksum \
           exe:ea \

chainweb.cabal

@@ -563,7 +563,7 @@ library chainweb-test-utils
         , pact-time:numeric >=0.3.0.1
         , pact-tng >=5.0
         , pact-tng:pact-request-api >=5.0
-        , property-matchers
+        , property-matchers >= 0.7
         , quickcheck-instances >= 0.3
         , random >= 1.3
         , resourcet >= 1.3
@@ -731,7 +731,7 @@ test-suite chainweb-tests
         , pact-tng:pact-repl
         , patience >= 0.3
         , prettyprinter
-        , property-matchers
+        , property-matchers >= 0.7
         , pretty-show
         , quickcheck-instances >= 0.3
         , random >= 1.3
@@ -900,7 +900,7 @@ benchmark bench
         , pact
         , pact-tng
         , pact-tng:pact-request-api
-        , property-matchers
+        , property-matchers >= 0.7
         , random >= 1.3
         , safe-exceptions
         , streaming

cwtools/calculate-release/Main.hs

@@ -92,24 +92,6 @@ executable b64
         , optparse-applicative
         , text
 
-executable calculate-release
-    import: warning-flags, debugging-flags
-    default-language: Haskell2010
-    ghc-options:
-        -threaded
-    hs-source-dirs: calculate-release
-    main-is: Main.hs
-    build-depends:
-        -- internal
-        , chainweb
-
-        -- external
-        , base >= 4.12 && < 5
-        , lens
-        , lens-aeson
-        , time
-        , wreq
-
 -- Compact pact state and RocksDB.
 executable compact
     import: warning-flags, debugging-flags

cwtools/cwtools.cabal

@@ -117,7 +117,6 @@ let haskellSrc = with nix-filter.lib; filter {
             name = "cwtools";
             exes = [
               "b64"
-              "calculate-release"
               "compact"
               "db-checksum"
               "ea"

default.nix

@@ -6,6 +6,7 @@
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE ImportQualifiedPost #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiWayIf #-}
 {-# LANGUAGE NumericUnderscores #-}
@@ -45,40 +46,6 @@ module Main
 , main
 ) where
 
-import Configuration.Utils hiding (Error)
-import Configuration.Utils.Validation (validateFilePath)
-
-import Control.Concurrent
-import Control.Concurrent.Async
-import Control.DeepSeq
-import Control.Exception
-import Control.Lens hiding ((.=))
-import Control.Monad
-import Control.Monad.Managed
-
-import Data.Text (Text)
-import qualified Data.Text as T
-import Data.Time
-import Data.Typeable
-
-import GHC.Generics hiding (from)
-import GHC.Stack
-import GHC.Stats
-
-import qualified Network.HTTP.Client as HTTP
-import qualified Network.HTTP.Client.TLS as HTTPS
-
-import qualified Streaming.Prelude as S
-
-import System.Directory
-import System.FilePath
-import System.IO
-import qualified System.Logger as L
-import System.LogLevel
-import System.Mem
-
--- internal modules
-
 import Chainweb.BlockHeader
 import Chainweb.Chainweb
 import Chainweb.Chainweb.Configuration
@@ -94,35 +61,50 @@ import Chainweb.Mempool.Consensus (ReintroducedTxsLog)
 import Chainweb.Mempool.InMemTypes (MempoolStats(..))
 import Chainweb.Miner.Coordinator (MiningStats)
 import Chainweb.Pact.Backend.DbCache (DbCacheStats)
-import Chainweb.Pact.Service.PactQueue (PactQueueStats)
 import Chainweb.Pact.RestAPI.Server (PactCmdLog(..))
+import Chainweb.Pact.Service.PactQueue (PactQueueStats)
 import Chainweb.Pact.Types
 import Chainweb.Payload
 import Chainweb.Payload.PayloadStore
+import Chainweb.Storage.Table.RocksDB
 import Chainweb.Time
-import Data.Time.Format.ISO8601
 import Chainweb.Utils
 import Chainweb.Utils.RequestLog
 import Chainweb.Version
 import Chainweb.Version.Mainnet
-import Chainweb.Version.Testnet04 (testnet04)
 import Chainweb.Version.Registry
-
-import Chainweb.Storage.Table.RocksDB
-
+import Configuration.Utils hiding (Error)
+import Configuration.Utils.Validation (validateFilePath)
+import Control.Concurrent
+import Control.Concurrent.Async
+import Control.DeepSeq
+import Control.Exception
+import Control.Lens hiding ((.=))
+import Control.Monad
+import Control.Monad.Managed
 import Data.LogMessage
-
+import Data.Text (Text)
+import Data.Typeable
+import GHC.Generics hiding (from)
+import GHC.Stack
+import GHC.Stats
+import Network.HTTP.Client qualified as HTTP
+import Network.HTTP.Client.TLS qualified as HTTPS
 import P2P.Node
-
 import PkgInfo
-
+import Streaming.Prelude qualified as S
+import System.Directory
+import System.FilePath
+import System.IO
+import System.LogLevel
+import System.Logger qualified as L
+import System.Mem
+import Utils.CheckRLimits
+import Utils.InstallSignalHandlers
 import Utils.Logging
 import Utils.Logging.Config
 import Utils.Logging.Trace
 
-import Utils.CheckRLimits
-import Utils.InstallSignalHandlers
-
 -- -------------------------------------------------------------------------- --
 -- Configuration
 
@@ -479,60 +461,6 @@ mkTelemetryLogger
 mkTelemetryLogger mgr = configureHandler
     $ withJsonHandleBackend @a (sshow $ typeRep $ Proxy @a) mgr pkgInfoScopes
 
--- -------------------------------------------------------------------------- --
--- Service Date
-
-newtype ServiceDate = ServiceDate Text
-
-instance Show ServiceDate where
-    show (ServiceDate t) = "Service interval end: " <> T.unpack t
-
-instance Exception ServiceDate where
-    fromException = asyncExceptionFromException
-    toException = asyncExceptionToException
-
-withServiceDate
-    :: ChainwebVersion
-    -> (LogLevel -> Text -> IO ())
-    -> Maybe UTCTime
-    -> IO a
-    -> IO a
-withServiceDate v lf msd inner = case msd of
-  Nothing -> do
-    inner
-  Just sd -> do
-    if _versionCode v == _versionCode mainnet || _versionCode v == _versionCode testnet04
-    then do
-      race (timer sd) inner >>= \case
-        Left () -> error "Service date thread terminated unexpectedly"
-        Right a -> return a
-    else do
-      inner
-  where
-    timer t = runForever lf "ServiceDate" $ do
-      now <- getCurrentTime
-      when (now >= t) $ do
-        lf Error shutdownMessage
-        throw $ ServiceDate shutdownMessage
-
-      let w = diffUTCTime t now
-      let micros = round $ w * 1_000_000
-      lf Warn warning
-      threadDelay $ min (10 * 60 * 1_000_000) micros
-
-      where
-        warning :: Text
-        warning = T.concat
-          [ "This version of chainweb node will stop working at " <> sshow t <> "."
-          , " Please upgrade to a new version before that date."
-          ]
-
-        shutdownMessage :: Text
-        shutdownMessage = T.concat
-          [ "Shutting down. This version of chainweb was only valid until " <> sshow t <> "."
-          , " Please upgrade to a new version."
-          ]
-
 -- -------------------------------------------------------------------------- --
 -- Encode Package Info into Log mesage scopes
 
@@ -575,9 +503,7 @@ main = do
                 , Handler $ \(e :: SomeException) ->
                     logFunctionJson logger Error (ProcessDied $ show e) >> throwIO e
                 ] $ do
-                kt <- mapM iso8601ParseM (_versionServiceDate v)
-                withServiceDate (_configChainwebVersion (_nodeConfigChainweb conf)) (logFunctionText logger) kt $ void $
-                    race (node conf logger) (gcRunner (logFunctionText logger))
+                void $ race (node conf logger) (gcRunner (logFunctionText logger))
     where
     gcRunner lf = runForever lf "GarbageCollect" $ do
         performMajorGC

node/src/ChainwebNode.hs

@@ -70,8 +70,6 @@ data NodeInfo = NodeInfo
     -- ^ Genesis heights of each chain.
   , nodeHistoricalChains :: NE.NonEmpty (BlockHeight, [(ChainId, [ChainId])])
     -- ^ All graph upgrades
-  , nodeServiceDate :: Maybe Text
-    -- ^ The upcoming service date for the node.
   , nodeBlockDelay :: BlockDelay
     -- ^ The PoW block delay of the node (microseconds)
   }
@@ -96,7 +94,6 @@ nodeInfoHandler v (SomeCutDb (CutDbT db :: CutDbT cas v)) = do
       , nodeLatestBehaviorHeight = latestBehaviorAt v
       , nodeGenesisHeights = map (\c -> (chainIdToText c, genesisHeight v c)) $ HS.toList (chainIds v)
       , nodeHistoricalChains = ruleElems $ fmap (HM.toList . HM.map HS.toList . toAdjacencySets) $ _versionGraphs v
-      , nodeServiceDate = T.pack <$> _versionServiceDate v
       , nodeBlockDelay = _versionBlockDelay v
       }
 

src/Chainweb/RestAPI/NodeInfo.hs

@@ -75,7 +75,6 @@ module Chainweb.Version
     , versionGenesis
     , versionVerifierPluginNames
     , versionQuirks
-    , versionServiceDate
     , versionForkNumber
     , genesisBlockPayload
     , genesisBlockPayloadHash
@@ -507,8 +506,6 @@ data ChainwebVersion
         -- ^ Verifier plugins that can be run to verify transaction contents.
     , _versionQuirks :: VersionQuirks
         -- ^ Modifications to behavior at particular blockheights
-    , _versionServiceDate :: Maybe String
-        -- ^ The node service date for this version.
     , _versionForkNumber :: ForkNumber
         -- ^ The current fork number for this version. Starting with
         -- chainweb-node version 2.33, fork numbers replace named forks. Fork

src/Chainweb/Version.hs

@@ -64,6 +64,5 @@ devnet = ChainwebVersion
     , _versionVerifierPluginNames = AllChains $ Bottom
         (minBound, Set.fromList $ map VerifierName ["hyperlane_v3_message", "allow", "signed_list"])
     , _versionQuirks = noQuirks
-    , _versionServiceDate = Nothing
     , _versionForkNumber = 0
     }