Update to node-8.12

Use textShow from Cardano.Prelude
Native Script pattern and classes adjusted

Author: kderme

cabal.project

@@ -10,8 +10,8 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-  , hackage.haskell.org 2024-03-26T06:28:59Z
-  , cardano-haskell-packages 2024-05-14T16:00:00Z
+  , hackage.haskell.org 2024-06-13T08:49:27Z
+  , cardano-haskell-packages 2024-06-20T14:49:55Z
 
 packages:
   cardano-db
@@ -79,8 +79,8 @@ allow-newer:
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/cardano-node
-  tag: 4a18841e7df0d10edab98a612c80217ea49a5c11
-  --sha256: sha256-T5kZqlzTnaain3rypUwhpmY3YcZoDtbSqEQADeucJH4=
+  tag: ae8bc933ee6b6366c04854c1e127fd8dfb29b556
+  --sha256: sha256-//1Tgd0ZFWMca2CDx/SPxencvTbn9/qd3bu/bqa98c0=
   subdir:
     cardano-node
     cardano-submit-api

cardano-chain-gen/src/Cardano/Mock/Forging/Interpreter.hs

@@ -43,7 +43,7 @@ import qualified Cardano.Mock.Forging.Tx.Babbage as Babbage
 import qualified Cardano.Mock.Forging.Tx.Conway as Conway
 import qualified Cardano.Mock.Forging.Tx.Shelley as Shelley
 import Cardano.Mock.Forging.Types
-import Cardano.Prelude (bimap, throwIO)
+import Cardano.Prelude (bimap, textShow, throwIO)
 import Control.Concurrent.Class.MonadSTM.Strict (
   StrictTVar,
   atomically,
@@ -60,7 +60,6 @@ import qualified Data.List as List
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import Data.SOP.Strict (NS (S, Z))
-import Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Data.Text.IO as Text
 import Data.Word (Word64)
@@ -626,8 +625,5 @@ mkForecast ::
   Forecast (LedgerView (BlockProtocol CardanoBlock))
 mkForecast cfg st = ledgerViewForecastAt (configLedger cfg) (ledgerState st)
 
-textShow :: Show a => a -> Text
-textShow = Text.pack . show
-
 throwLeftIO :: Exception e => Either e a -> IO a
 throwLeftIO = either throwIO pure

cardano-chain-gen/test/Test/Cardano/Db/Mock/Config.hs

@@ -56,7 +56,7 @@ import Cardano.Mock.ChainSync.Server
 import Cardano.Mock.Forging.Interpreter
 import Cardano.Node.Protocol.Shelley (readLeaderCredentials)
 import Cardano.Node.Types (ProtocolFilepaths (..))
-import Cardano.Prelude (ReaderT, panic, stderr)
+import Cardano.Prelude (ReaderT, panic, stderr, textShow)
 import Cardano.SMASH.Server.PoolDataLayer
 import Control.Concurrent.Async (Async, async, cancel, poll)
 import Control.Concurrent.STM (atomically)
@@ -74,7 +74,6 @@ import Control.Monad.Logger (NoLoggingT, runNoLoggingT)
 import Control.Monad.Trans.Except.Extra (runExceptT)
 import Control.Tracer (nullTracer)
 import Data.Text (Text)
-import qualified Data.Text as Text
 import Database.Persist.Postgresql (createPostgresqlPool)
 import Database.Persist.Sql (SqlBackend)
 import Ouroboros.Consensus.Block.Forging
@@ -526,9 +525,6 @@ recreateDir path = do
   removePathForcibly path
   createDirectoryIfMissing True path
 
-textShow :: (Show a) => a -> Text
-textShow = Text.pack . show
-
 replaceConfigFile :: FilePath -> DBSyncEnv -> IO DBSyncEnv
 replaceConfigFile newFilename dbSync@DBSyncEnv {..} = do
   cfg <- readSyncNodeConfig $ mkConfigFile configDir newFilename

cardano-db-sync/src/Cardano/DbSync.hs

@@ -26,7 +26,6 @@ module Cardano.DbSync (
 
 import Cardano.BM.Trace (Trace, logError, logInfo, logWarning)
 import qualified Cardano.Crypto as Crypto
-import Cardano.Db (textShow)
 import qualified Cardano.Db as Db
 import Cardano.DbSync.Api
 import Cardano.DbSync.Api.Types (InsertOptions (..), RunMigration, SyncEnv (..), SyncOptions (..), envLedgerEnv)

cardano-db-sync/src/Cardano/DbSync/Api.hs

@@ -368,9 +368,9 @@ logDbState env = do
     showTip tipInfo =
       mconcat
         [ "slot "
-        , DB.textShow (unSlotNo $ bSlotNo tipInfo)
+        , textShow (unSlotNo $ bSlotNo tipInfo)
         , ", block "
-        , DB.textShow (unBlockNo $ bBlockNo tipInfo)
+        , textShow (unBlockNo $ bBlockNo tipInfo)
         ]
 
     tracer :: Trace IO Text
@@ -490,19 +490,19 @@ mkSyncEnvFromConfig trce backend connectionString syncOptions genCfg syncNodeCon
             . SNErrCardanoConfig
             $ mconcat
               [ "ProtocolMagicId "
-              , DB.textShow (unProtocolMagicId $ Byron.configProtocolMagicId bCfg)
+              , textShow (unProtocolMagicId $ Byron.configProtocolMagicId bCfg)
               , " /= "
-              , DB.textShow (Shelley.sgNetworkMagic $ scConfig sCfg)
+              , textShow (Shelley.sgNetworkMagic $ scConfig sCfg)
               ]
       | Byron.gdStartTime (Byron.configGenesisData bCfg) /= Shelley.sgSystemStart (scConfig sCfg) ->
           pure
             . Left
             . SNErrCardanoConfig
             $ mconcat
               [ "SystemStart "
-              , DB.textShow (Byron.gdStartTime $ Byron.configGenesisData bCfg)
+              , textShow (Byron.gdStartTime $ Byron.configGenesisData bCfg)
               , " /= "
-              , DB.textShow (Shelley.sgSystemStart $ scConfig sCfg)
+              , textShow (Shelley.sgSystemStart $ scConfig sCfg)
               ]
       | otherwise ->
           Right

cardano-db-sync/src/Cardano/DbSync/Api/Ledger.hs

@@ -19,6 +19,7 @@ import Cardano.DbSync.Era.Util
 import Cardano.DbSync.Error
 import Cardano.DbSync.Ledger.State
 import Cardano.DbSync.Types
+import Cardano.Ledger.Allegra.Scripts (Timelock)
 import Cardano.Ledger.Alonzo.Scripts
 import Cardano.Ledger.Babbage.Core
 import Cardano.Ledger.Babbage.TxBody (BabbageTxOut)
@@ -28,7 +29,7 @@ import Cardano.Ledger.Mary.Value
 import Cardano.Ledger.Shelley.LedgerState
 import Cardano.Ledger.TxIn
 import Cardano.Ledger.UTxO (UTxO (..))
-import Cardano.Prelude (lift)
+import Cardano.Prelude (lift, textShow)
 import Control.Concurrent.Class.MonadSTM.Strict (atomically, readTVarIO, writeTVar)
 import Control.Monad.Extra
 import Control.Monad.IO.Class (MonadIO, liftIO)
@@ -75,7 +76,7 @@ migrateBootstrapUTxO syncEnv txCache = do
       when (count > 0) $
         liftIO $
           logWarning trce $
-            "Found and deleted " <> DB.textShow count <> " tx_out."
+            "Found and deleted " <> textShow count <> " tx_out."
       storeUTxOFromLedger syncEnv txCache cls
       lift $ DB.insertExtraMigration DB.BootstrapFinished
       liftIO $ logInfo trce "UTxO bootstrap migration done"
@@ -107,6 +108,7 @@ storeUTxO ::
   , MonadIO m
   , MonadBaseControl IO m
   , DBPlutusScript era
+  , NativeScript era ~ Timelock era
   ) =>
   SyncEnv ->
   TxCache ->
@@ -117,9 +119,9 @@ storeUTxO env txCache mp = do
     logInfo trce $
       mconcat
         [ "Inserting "
-        , DB.textShow size
+        , textShow size
         , " tx_out as pages of "
-        , DB.textShow pageSize
+        , textShow pageSize
         ]
   mapM_ (storePage env txCache pagePerc) . zip [0 ..] . chunksOf pageSize . Map.toList $ mp
   where
@@ -135,6 +137,7 @@ storePage ::
   , TxOut era ~ BabbageTxOut era
   , DBPlutusScript era
   , BabbageEraTxOut era
+  , NativeScript era ~ Timelock era
   , MonadIO m
   , MonadBaseControl IO m
   ) =>
@@ -162,6 +165,7 @@ prepareTxOut ::
   , MonadIO m
   , MonadBaseControl IO m
   , DBPlutusScript era
+  , NativeScript era ~ Timelock era
   ) =>
   SyncEnv ->
   TxCache ->

cardano-db-sync/src/Cardano/DbSync/Cache.hs

@@ -294,9 +294,9 @@ queryPoolKeyOrInsert txt trce cache cacheUA logsWarning hsh = do
           logWarning trce $
             mconcat
               [ "Failed with "
-              , DB.textShow err
+              , textShow err
               , " while trying to find pool "
-              , DB.textShow hsh
+              , textShow hsh
               , " for "
               , txt
               , ". We will assume that the pool exists and move on."

cardano-db-sync/src/Cardano/DbSync/Cache/Types.hs

@@ -112,56 +112,56 @@ textShowStats (ActiveCache ic) = do
       [ "\nCache Statistics:"
       , "\n  Stake Addresses: "
       , "cache size: "
-      , DB.textShow (LRU.getCapacity stakeHashRaws)
+      , textShow (LRU.getCapacity stakeHashRaws)
       , if credsQueries stats == 0
           then ""
-          else ", hit rate: " <> DB.textShow (100 * credsHits stats `div` credsQueries stats) <> "%"
+          else ", hit rate: " <> textShow (100 * credsHits stats `div` credsQueries stats) <> "%"
       , ", hits: "
-      , DB.textShow (credsHits stats)
+      , textShow (credsHits stats)
       , ", misses: "
-      , DB.textShow (credsQueries stats - credsHits stats)
+      , textShow (credsQueries stats - credsHits stats)
       , "\n  Pools: "
       , "cache size: "
-      , DB.textShow (Map.size pools)
+      , textShow (Map.size pools)
       , if poolsQueries stats == 0
           then ""
-          else ", hit rate: " <> DB.textShow (100 * poolsHits stats `div` poolsQueries stats) <> "%"
+          else ", hit rate: " <> textShow (100 * poolsHits stats `div` poolsQueries stats) <> "%"
       , ", hits: "
-      , DB.textShow (poolsHits stats)
+      , textShow (poolsHits stats)
       , ", misses: "
-      , DB.textShow (poolsQueries stats - poolsHits stats)
+      , textShow (poolsQueries stats - poolsHits stats)
       , "\n  Datums: "
       , "cache capacity: "
-      , DB.textShow (LRU.getCapacity datums)
+      , textShow (LRU.getCapacity datums)
       , ", cache size: "
-      , DB.textShow (LRU.getSize datums)
+      , textShow (LRU.getSize datums)
       , if datumQueries stats == 0
           then ""
-          else ", hit rate: " <> DB.textShow (100 * datumHits stats `div` datumQueries stats) <> "%"
+          else ", hit rate: " <> textShow (100 * datumHits stats `div` datumQueries stats) <> "%"
       , ", hits: "
-      , DB.textShow (datumHits stats)
+      , textShow (datumHits stats)
       , ", misses: "
-      , DB.textShow (datumQueries stats - datumHits stats)
+      , textShow (datumQueries stats - datumHits stats)
       , "\n  Multi Assets: "
       , "cache capacity: "
-      , DB.textShow (LRU.getCapacity mAssets)
+      , textShow (LRU.getCapacity mAssets)
       , ", cache size: "
-      , DB.textShow (LRU.getSize mAssets)
+      , textShow (LRU.getSize mAssets)
       , if multiAssetsQueries stats == 0
           then ""
-          else ", hit rate: " <> DB.textShow (100 * multiAssetsHits stats `div` multiAssetsQueries stats) <> "%"
+          else ", hit rate: " <> textShow (100 * multiAssetsHits stats `div` multiAssetsQueries stats) <> "%"
       , ", hits: "
-      , DB.textShow (multiAssetsHits stats)
+      , textShow (multiAssetsHits stats)
       , ", misses: "
-      , DB.textShow (multiAssetsQueries stats - multiAssetsHits stats)
+      , textShow (multiAssetsQueries stats - multiAssetsHits stats)
       , "\n  Previous Block: "
       , if prevBlockQueries stats == 0
           then ""
-          else "hit rate: " <> DB.textShow (100 * prevBlockHits stats `div` prevBlockQueries stats) <> "%"
+          else "hit rate: " <> textShow (100 * prevBlockHits stats `div` prevBlockQueries stats) <> "%"
       , ", hits: "
-      , DB.textShow (prevBlockHits stats)
+      , textShow (prevBlockHits stats)
       , ", misses: "
-      , DB.textShow (prevBlockQueries stats - prevBlockHits stats)
+      , textShow (prevBlockQueries stats - prevBlockHits stats)
       ]
 
 useNoCache :: CacheStatus

cardano-db-sync/src/Cardano/DbSync/Config/Alonzo.hs

@@ -8,10 +8,10 @@ module Cardano.DbSync.Config.Alonzo (
 ) where
 
 import qualified Cardano.Crypto.Hash as Crypto
-import Cardano.Db (textShow)
 import Cardano.DbSync.Config.Types
 import Cardano.DbSync.Error
 import Cardano.Ledger.Alonzo.Genesis
+import Cardano.Prelude (textShow)
 import Control.Monad.Trans.Except (ExceptT)
 import Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither, left)
 import qualified Data.Aeson as Aeson

cardano-db-sync/src/Cardano/DbSync/Config/Shelley.hs

@@ -10,9 +10,9 @@ module Cardano.DbSync.Config.Shelley (
 ) where
 
 import qualified Cardano.Crypto.Hash as Crypto
-import Cardano.Db (textShow)
 import Cardano.DbSync.Config.Types
 import Cardano.DbSync.Error
+import Cardano.Prelude (textShow)
 import Control.Monad.Trans.Except (ExceptT)
 import Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither, left)
 import qualified Data.Aeson as Aeson