Much quieter replays

src/Chainweb/Chainweb.hs

@@ -418,7 +418,6 @@ withChainwebInternal conf logger peer serviceSock rocksDb pactDbDir backupDir re
     pactConfig maxGasLimit = PactServiceConfig
       { _pactReorgLimit = _configReorgLimit conf
       , _pactLocalRewindDepthLimit = _configLocalRewindDepthLimit conf
-      , _pactRevalidate = True
       , _pactQueueSize = _configPactQueueSize conf
       , _pactResetDb = resetDb
       , _pactAllowReadsInLocal = _configAllowReadsInLocal conf

src/Chainweb/Pact/PactService.hs

@@ -154,7 +154,7 @@ withPactService ver cid chainwebLogger bhDb pdb sqlenv config act =
                     , _psLocalRewindDepthLimit = _pactLocalRewindDepthLimit config
                     , _psOnFatalError = defaultOnFatalError (logFunctionText chainwebLogger)
                     , _psVersion = ver
-                    , _psValidateHashesOnReplay = _pactRevalidate config
+                    , _psReplaying = False
                     , _psAllowReadsInLocal = _pactAllowReadsInLocal config
                     , _psIsBatch = False
                     , _psCheckpointerDepth = 0

src/Chainweb/Pact/PactService/Checkpointer.hs

@@ -400,8 +400,7 @@ rewindTo rewindLimit (Just (ParentHeader parent)) = do
                     withAsync (heightProgress (_blockHeight commonAncestor) heightRef (logInfo_ logger)) $ \_ ->
                       s
                           & S.scanM
-                              -- no need to re-validate hashes, because these blocks have already been validated
-                              (\ !p !c -> runPact (local (psValidateHashesOnReplay .~ False) $ fastForward (ParentHeader p, c)) >> writeIORef heightRef (_blockHeight c) >> return c)
+                              (\ !p !c -> runPact (fastForward (ParentHeader p, c)) >> writeIORef heightRef (_blockHeight c) >> return c)
                               (return h) -- initial parent
                               return
                           & S.length_
@@ -416,7 +415,7 @@ fastForward
     . (HasCallStack, CanReadablePayloadCas tbl, Logger logger)
     => (ParentHeader, BlockHeader)
     -> PactServiceM logger tbl ()
-fastForward (target, block) =
+fastForward (target, block) = do
     -- This does a restore, i.e. it rewinds the checkpointer back in
     -- history, if needed.
     withCheckpointerWithoutRewind (Just target) "fastForward" $ \pdbenv -> do
@@ -609,7 +608,7 @@ rewindToIncremental rewindLimit (Just (ParentHeader parent)) = do
                     -- transactions (withBatchIO).
                     let playChunk :: IORef BlockHeight -> BlockHeader -> Stream (Of BlockHeader) IO r -> IO (Of BlockHeader r)
                         playChunk heightRef cur s = withBatchIO runPact $ \runPactLocal -> S.foldM
-                            (\c x -> x <$ (runPactLocal (fastForward (ParentHeader c, x)) >> writeIORef heightRef (_blockHeight c)))
+                            (\c x -> x <$ (runPactLocal (local (psReplaying .~ True) $ fastForward (ParentHeader c, x)) >> writeIORef heightRef (_blockHeight c)))
                             (return cur)
                             return
                             s

src/Chainweb/Pact/PactService/ExecBlock.hs

@@ -53,6 +53,7 @@ import Data.Vector (Vector)
 import qualified Data.Vector as V
 
 import System.IO
+import qualified System.Logger as L
 import System.Timeout
 
 import Prelude hiding (lookup)
@@ -151,8 +152,9 @@ execBlock currHeader plData pdbenv = do
 
     modify' $ set psStateValidated $ Just currHeader
 
-    -- Validate hashes if requested
-    asks _psValidateHashesOnReplay >>= \x -> when x $
+    -- Validate hashes if not doing a replay. no need to re-validate hashes
+    -- during a replay, because these blocks have already been validated
+    view psReplaying >>= \x -> unless x $
         either throwM (void . return) $!
         validateHashes currHeader plData miner results
 
@@ -347,7 +349,6 @@ runCoinbase
     -> PactServiceM logger tbl (P.CommandResult [P.TxLogJson])
 runCoinbase True _ _ _ _ _ = return noCoinbase
 runCoinbase False dbEnv miner enfCBFail usePrecomp mc = do
-    logger <- view psLogger
     rs <- view psMinerRewards
     v <- view chainwebVersion
     txCtx <- getTxContext def
@@ -357,7 +358,8 @@ runCoinbase False dbEnv miner enfCBFail usePrecomp mc = do
     reward <- liftIO $! minerReward v rs bh
 
     (T2 cr upgradedCacheM) <-
-      liftIO $! applyCoinbase v logger dbEnv miner reward txCtx enfCBFail usePrecomp mc
+      withSilentLoggerForReplays $ \logger ->
+        liftIO $ applyCoinbase v logger dbEnv miner reward txCtx enfCBFail usePrecomp mc
     mapM_ upgradeInitCache upgradedCacheM
     debugResult "runCoinbase" (P.crLogs %~ fmap J.Array $ cr)
     return $! cr
@@ -388,6 +390,14 @@ applyPactCmds isGenesis env cmds miner mc blockGas txTimeLimit = do
       evalStateT (V.mapM (applyPactCmd isGenesis env miner txTimeLimit) cmds) (T2 mc blockGas)
     return txs
 
+-- we don't want pact tx failure or unknown exception messages when we're doing a replay.
+withSilentLoggerForReplays :: Logger logger => (logger -> PactServiceM logger tbl a) -> PactServiceM logger tbl a
+withSilentLoggerForReplays f = do
+  replaying <- view psReplaying
+  logger <- view psLogger
+  if replaying then L.withLoggerLevel L.Error logger f
+  else f logger
+
 applyPactCmd
   :: (Logger logger)
   => Bool
@@ -434,9 +444,9 @@ applyPactCmd isGenesis env miner txTimeLimit cmd = StateT $ \(T2 mcache maybeBlo
             Just limit ->
                maybe (throwM timeoutError) return <=< timeout (fromIntegral limit)
         let txGas (T3 r _ _) = fromIntegral $ P._crGas r
-        T3 r c _warns <-
+        T3 r c _warns <- withSilentLoggerForReplays $ \cmdLogger ->
           tracePactServiceM' "applyCmd" (J.toJsonViaEncode (P._cmdHash cmd)) txGas $
-            liftIO $ txTimeout $ applyCmd v logger gasLogger env miner (gasModel txCtx) txCtx spv gasLimitedCmd initialGas mcache ApplySend
+            liftIO $ txTimeout $ applyCmd v cmdLogger gasLogger env miner (gasModel txCtx) txCtx spv gasLimitedCmd initialGas mcache ApplySend
         pure $ T2 r c
 
     if isGenesis

src/Chainweb/Pact/Service/Types.hs

@@ -86,8 +86,6 @@ data PactServiceConfig = PactServiceConfig
     -- hardcodes this to 8 currently.
   , _pactLocalRewindDepthLimit :: !RewindLimit
     -- ^ Maximum allowed rewind depth in the local command.
-  , _pactRevalidate :: !Bool
-    -- ^ Re-validate payload hashes during transaction replay
   , _pactAllowReadsInLocal :: !Bool
     -- ^ Allow direct database reads in local mode
   , _pactQueueSize :: !Natural

src/Chainweb/Pact/TransactionExec.hs

@@ -329,7 +329,7 @@ applyGenesisCmd logger dbEnv spv txCtx cmd =
 
     go = do
       -- TODO: fix with version recordification so that this matches the flags at genesis heights.
-      cr <- catchesPactError logger PrintsUnexpectedError $! runGenesis cmd permissiveNamespacePolicy interp
+      cr <- catchesPactError logger (onChainErrorPrintingFor txCtx) $! runGenesis cmd permissiveNamespacePolicy interp
       case cr of
         Left e -> fatal $ "Genesis command failed: " <> sshow e
         Right r -> r <$ debug "successful genesis tx for request key"
@@ -635,7 +635,7 @@ jsonErrorResult err msg = do
     l <- view txLogger
 
     logInfo_ l
-      $! msg
+      $ msg
       <> ": " <> sshow rk
       <> ": " <> sshow err
 
@@ -1136,15 +1136,15 @@ gasLog m = do
   l <- view txGasLogger
   rk <- view txRequestKey
   for_ l $ \logger ->
-    logInfo_ logger $! m <> ": " <> sshow rk
+    logInfo_ logger $ m <> ": " <> sshow rk
 
 -- | Log request keys at DEBUG when successful
 --
 debug :: (Logger logger) => Text -> TransactionM logger db ()
 debug s = do
     l <- view txLogger
     rk <- view txRequestKey
-    logDebug_ l $! s <> ": " <> sshow rk
+    logDebug_ l $ s <> ": " <> sshow rk
 
 
 -- | Denotes fatal failure points in the tx exec process
@@ -1155,7 +1155,7 @@ fatal e = do
     rk <- view txRequestKey
 
     logError_ l
-      $! "critical transaction failure: "
+      $ "critical transaction failure: "
       <> sshow rk <> ": " <> e
 
     throwM $ PactTransactionExecError (fromUntypedHash $ unRequestKey rk) e

src/Chainweb/Pact/Types.hs

@@ -38,6 +38,7 @@ module Chainweb.Pact.Types
   , GasId(..)
   , EnforceCoinbaseFailure(..)
   , CoinbaseUsePrecompiled(..)
+  , cleanModuleCache
 
     -- * Transaction State
   , TransactionState(..)
@@ -80,7 +81,7 @@ module Chainweb.Pact.Types
   , psLocalRewindDepthLimit
   , psOnFatalError
   , psVersion
-  , psValidateHashesOnReplay
+  , psReplaying
   , psLogger
   , psGasLogger
   , psAllowReadsInLocal
@@ -215,7 +216,6 @@ import Chainweb.Time
 import Chainweb.Transaction
 import Chainweb.Utils
 import Chainweb.Version
-import Chainweb.Version.Guards
 import Utils.Logging.Trace
 
 
@@ -286,6 +286,15 @@ moduleCacheKeys :: ModuleCache -> [ModuleName]
 moduleCacheKeys (ModuleCache a) = fst <$> LHM.toList a
 {-# INLINE moduleCacheKeys #-}
 
+-- this can't go in Chainweb.Version.Guards because it causes an import cycle
+-- it uses genesisHeight which is from BlockHeader which imports Guards
+cleanModuleCache :: ChainwebVersion -> ChainId -> BlockHeight -> Bool
+cleanModuleCache v cid bh =
+  case v ^?! versionForks . at Chainweb217Pact . _Just . onChain cid of
+    ForkAtBlockHeight bh' -> bh == bh'
+    ForkAtGenesis -> bh == genesisHeight v cid
+    ForkNever -> False
+
 -- -------------------------------------------------------------------- --
 -- Local vs. Send execution context flag
 
@@ -410,7 +419,7 @@ data PactServiceEnv logger tbl = PactServiceEnv
     -- ^ The limit of checkpointer's rewind in the `execValidationBlock` command.
     , _psOnFatalError :: !(forall a. PactException -> Text -> IO a)
     , _psVersion :: !ChainwebVersion
-    , _psValidateHashesOnReplay :: !Bool
+    , _psReplaying :: !Bool
     , _psAllowReadsInLocal :: !Bool
     , _psLogger :: !logger
     , _psGasLogger :: !(Maybe logger)
@@ -456,7 +465,6 @@ testPactServiceConfig :: PactServiceConfig
 testPactServiceConfig = PactServiceConfig
       { _pactReorgLimit = defaultReorgLimit
       , _pactLocalRewindDepthLimit = defaultLocalRewindDepthLimit
-      , _pactRevalidate = True
       , _pactQueueSize = 1000
       , _pactResetDb = True
       , _pactAllowReadsInLocal = False
@@ -720,9 +728,11 @@ catchesPactError :: (MonadCatch m, MonadIO m, Logger logger) => logger -> Unexpe
 catchesPactError logger exnPrinting action = catches (Right <$> action)
   [ Handler $ \(e :: PactError) -> return $ Left e
   , Handler $ \(e :: SomeException) -> do
-      liftIO $ logWarn_ logger ("catchesPactError: unknown error: " <> sshow e)
-      return $ Left $ PactError EvalError def def $
-        case exnPrinting of
-          PrintsUnexpectedError -> viaShow e
-          CensorsUnexpectedError -> "unknown error"
+      !err <- case exnPrinting of
+          PrintsUnexpectedError ->
+            return (viaShow e)
+          CensorsUnexpectedError -> do
+            liftIO $ logWarn_ logger ("catchesPactError: unknown error: " <> sshow e)
+            return "unknown error"
+      return $ Left $ PactError EvalError def def err
   ]

src/Chainweb/Version/Guards.hs

@@ -38,7 +38,6 @@ module Chainweb.Version.Guards
     , chainweb215Pact
     , chainweb216Pact
     , chainweb217Pact
-    , cleanModuleCache
     , chainweb218Pact
     , chainweb219Pact
     , chainweb220Pact
@@ -223,9 +222,6 @@ chainweb216Pact = checkFork after Chainweb216Pact
 chainweb217Pact :: ChainwebVersion -> ChainId -> BlockHeight -> Bool
 chainweb217Pact = checkFork after Chainweb217Pact
 
-cleanModuleCache :: ChainwebVersion -> ChainId -> BlockHeight -> Bool
-cleanModuleCache = checkFork atOrAfter Chainweb217Pact
-
 chainweb218Pact :: ChainwebVersion -> ChainId -> BlockHeight -> Bool
 chainweb218Pact = checkFork atOrAfter Chainweb218Pact
 

test/Chainweb/Test/Pact/Utils.hs

@@ -630,7 +630,7 @@ testPactCtxSQLite logger v cid bhdb pdb sqlenv conf gasmodel = do
         , _psLocalRewindDepthLimit = _pactLocalRewindDepthLimit conf
         , _psOnFatalError = defaultOnFatalError mempty
         , _psVersion = v
-        , _psValidateHashesOnReplay = _pactRevalidate conf
+        , _psReplaying = False
         , _psAllowReadsInLocal = _pactAllowReadsInLocal conf
         , _psIsBatch = False
         , _psCheckpointerDepth = 0

tools/cwtool/TxSimulator.hs

@@ -170,7 +170,7 @@ simulate sc@(SimConfig dbDir txIdx' _ _ cid ver gasLog doTypecheck) = do
                   , _psReorgLimit = RewindLimit 0
                   , _psOnFatalError = ferr
                   , _psVersion = ver
-                  , _psValidateHashesOnReplay = True
+                  , _psReplaying = False
                   , _psAllowReadsInLocal = False
                   , _psLogger = logger
                   , _psGasLogger = gasLogger