8.8.0-pre integration

cabal.project

@@ -60,3 +60,57 @@ package plutus-scripts-bench
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
 
 -- `smtp-mail` should depend on `crypton-connection` rather than `connection`!
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/cardano-ledger
+  tag: 33c0a26b753807bd683e109c73ecc8849de64a94
+  subdir:
+    eras/allegra/impl
+    eras/alonzo/impl
+    eras/alonzo/test-suite
+    eras/babbage/impl
+    eras/babbage/test-suite
+    eras/byron/ledger/impl
+    eras/conway/impl
+    eras/conway/test-suite
+    eras/mary/impl
+    eras/shelley/impl
+    eras/shelley/test-suite
+    eras/shelley-ma/test-suite
+    libs/cardano-data
+    libs/cardano-ledger-api
+    libs/cardano-ledger-binary
+    libs/cardano-ledger-core
+    libs/cardano-protocol-tpraos
+    libs/small-steps
+    libs/small-steps-test
+    libs/vector-map
+  --sha256: sha256-Ycdgk8c7X0Sbw1uixIxi9IwIb/2FB6hvzo+Mij6pnM8=
+
+source-repository-package
+    type: git
+    location: https://github.com/IntersectMBO/ouroboros-consensus.git
+    tag: 6b125bea3a25a60f350ac0f1a228c5411f0182ef
+    subdir:
+      ouroboros-consensus
+      ouroboros-consensus-cardano
+      ouroboros-consensus-protocol
+      ouroboros-consensus-diffusion
+      sop-extras
+      strict-sop-core
+    --sha256: sha256-d/5Q/nE0De0TtvpCHHHDBVnGmi4Jbdrv2raCqELOGs8=
+
+source-repository-package
+    type: git
+    location: https://github.com/IntersectMBO/cardano-api.git
+    tag: af785f9b057c8401b30c5cbd3be3780abe357613
+    subdir: cardano-api
+    --sha256: sha256-uje2F77Q3rSuBC4R6GmQt0jJdtusF0UK8HD9UpUxvCI=
+
+source-repository-package
+    type: git
+    location: https://github.com/IntersectMBO/cardano-cli.git
+    tag: b5d94431000f645754667618b7164e8ac406eea6
+    subdir: cardano-cli
+    --sha256: sha256-UhSh7Kwk3jERTVzo+p87emSNb3BxqJrR2ZH3W1/gNA8=

cardano-node/cardano-node.cabal

@@ -37,7 +37,7 @@ common project-config
                         -Wno-unticked-promoted-constructors
                         -Wpartial-fields
                         -Wredundant-constraints
-                        -Wunused-packages
+                        -- -Wunused-packages
 common maybe-Win32
   if os(windows)
     build-depends:      Win32
@@ -145,6 +145,7 @@ library
                       , base16-bytestring
                       , bytestring
                       , cardano-api ^>= 8.37.1.0
+                      , cardano-api:internal
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-git-rev

cardano-node/src/Cardano/Node/Protocol/Shelley.hs

@@ -3,6 +3,7 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
+{-# OPTIONS_GHC -w #-}
 
 module Cardano.Node.Protocol.Shelley
   ( mkSomeConsensusProtocolShelley
@@ -79,27 +80,28 @@ mkSomeConsensusProtocolShelley NodeShelleyProtocolConfiguration {
                                   npcShelleyGenesisFile,
                                   npcShelleyGenesisFileHash
                                 }
-                          files = do
-    (genesis, genesisHash) <- firstExceptT GenesisReadError $
-                              readGenesis npcShelleyGenesisFile
-                                          npcShelleyGenesisFileHash
-    firstExceptT GenesisValidationError $ validateGenesis genesis
-    leaderCredentials <- firstExceptT PraosLeaderCredentialsError $
-                         readLeaderCredentials files
-
-    return $ SomeConsensusProtocol Api.ShelleyBlockType $ Api.ProtocolInfoArgsShelley
-      genesis
-      Consensus.ProtocolParamsShelleyBased {
-        shelleyBasedInitialNonce = genesisHashToPraosNonce genesisHash,
-        shelleyBasedLeaderCredentials =
-            leaderCredentials
-      }
-      Consensus.ProtocolParamsShelley {
-        shelleyProtVer =
-          ProtVer (natVersion @2) 0,
-        shelleyMaxTxCapacityOverrides =
-          TxLimits.mkOverrides TxLimits.noOverridesMeasure
-      }
+                          files = undefined
+    --                         do
+    -- (genesis, genesisHash) <- firstExceptT GenesisReadError $
+    --                           readGenesis npcShelleyGenesisFile
+    --                                       npcShelleyGenesisFileHash
+    -- firstExceptT GenesisValidationError $ validateGenesis genesis
+    -- leaderCredentials <- firstExceptT PraosLeaderCredentialsError $
+    --                      readLeaderCredentials files
+
+    -- return $ SomeConsensusProtocol Api.ShelleyBlockType $ Api.ProtocolInfoArgsShelley
+    --   genesis
+    --   Consensus.ProtocolParamsShelleyBased {
+    --     shelleyBasedInitialNonce = genesisHashToPraosNonce genesisHash,
+    --     shelleyBasedLeaderCredentials =
+    --         leaderCredentials
+    --   }
+    --   Consensus.ProtocolParamsShelley {
+    --     shelleyProtVer =
+    --       ProtVer (natVersion @2) 0,
+    --     shelleyMaxTxCapacityOverrides =
+    --       TxLimits.mkOverrides TxLimits.noOverridesMeasure
+    --   }
 
 genesisHashToPraosNonce :: GenesisHash -> Nonce
 genesisHashToPraosNonce (GenesisHash h) = Nonce (Crypto.castHash h)

cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs

@@ -14,18 +14,20 @@
 {-# LANGUAGE UndecidableInstances #-}
 
 {-# OPTIONS_GHC -Wno-orphans  #-}
+{-# OPTIONS_GHC -w #-}
 
 module Cardano.Node.Tracing.Era.Shelley () where
 
 import           Cardano.Api (textShow)
 import qualified Cardano.Api.Shelley as Api
+import           Cardano.Api.Tx.Body (toScriptIndex)
 
 import qualified Cardano.Crypto.Hash.Class as Crypto
 import qualified Cardano.Crypto.VRF.Class as Crypto
 import           Cardano.Ledger.Allegra.Rules (AllegraUtxoPredFailure)
 import qualified Cardano.Ledger.Allegra.Rules as Allegra
 import qualified Cardano.Ledger.Allegra.Scripts as Allegra
-import qualified Cardano.Ledger.Alonzo.PlutusScriptApi as Alonzo
+import qualified Cardano.Ledger.Alonzo.Plutus.Evaluate as Alonzo
 import           Cardano.Ledger.Alonzo.Rules (AlonzoBbodyPredFailure, AlonzoUtxoPredFailure,
                    AlonzoUtxosPredFailure, AlonzoUtxowPredFailure (..))
 import qualified Cardano.Ledger.Alonzo.Rules as Alonzo
@@ -348,10 +350,10 @@ instance
   ) => LogFormatting (AlonzoUtxowPredFailure era) where
   forMachine dtal (ShelleyInAlonzoUtxowPredFailure utxoPredFail) =
     forMachine dtal utxoPredFail
-  forMachine _ (MissingRedeemers scripts) =
-    mconcat [ "kind" .= String "MissingRedeemers"
-             , "scripts" .= renderMissingRedeemers scripts
-             ]
+  forMachine _ (MissingRedeemers scripts) = undefined
+    -- mconcat [ "kind" .= String "MissingRedeemers"
+    --          , "scripts" .= renderMissingRedeemers scripts
+    --          ]
   forMachine _ (MissingRequiredDatums required received) =
     mconcat [ "kind" .= String "MissingRequiredDatums"
              , "required" .= map (Crypto.hashToTextAsHex . SafeHash.extractHash)
@@ -377,11 +379,11 @@ instance
              , "disallowed" .= Set.toList disallowed
              , "acceptable" .= Set.toList acceptable
              ]
-  forMachine _ (ExtraRedeemers rdmrs) =
-    mconcat
-      [ "kind" .= String "ExtraRedeemers"
-      , "rdmrs" .= map Api.fromAlonzoRdmrPtr rdmrs
-      ]
+  forMachine _ (ExtraRedeemers rdmrs) = undefined
+    -- mconcat
+    --   [ "kind" .= String "ExtraRedeemers"
+    --   , "rdmrs" .= map (toScriptIndex undefined) rdmrs
+    --   ]
 
 instance
   ( Consensus.ShelleyBasedEra era
@@ -1135,9 +1137,9 @@ instance
     mconcat [ "kind" .= String "ExpirationEpochTooSmall"
             , "credentialsToEpoch" .= credsToEpoch
             ]
-  forMachine _ (Conway.InvalidPrevGovActionIdsInProposals proposals) =
-    mconcat [ "kind" .= String "InvalidPrevGovActionIdsInProposals"
-            , "proposals" .= proposals
+  forMachine _ (Conway.InvalidPrevGovActionId proposalProcedure) =
+    mconcat [ "kind" .= String "InvalidPrevGovActionId"
+            , "proposalProcedure" .= proposalProcedure
             ]
   forMachine _ (Conway.VotingOnExpiredGovAction actions) =
     mconcat [ "kind" .= String "VotingOnExpiredGovAction"

cardano-node/src/Cardano/Node/Tracing/Render.hs

@@ -38,6 +38,9 @@ import           Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text
 
+import qualified Cardano.Ledger.Alonzo as Alonzo
+import           Cardano.Ledger.Alonzo.Scripts
+  (AlonzoPlutusPurpose (..), AsItem (..), PlutusPurpose)
 import qualified Cardano.Ledger.Alonzo.Tx as Alonzo
 import qualified Cardano.Ledger.Core as Ledger
 import           Cardano.Ledger.Crypto (StandardCrypto)
@@ -180,14 +183,14 @@ renderScriptIntegrityHash Nothing = Aeson.Null
 
 
 renderMissingRedeemers :: ()
-  => Ledger.EraCrypto ledgerera ~ StandardCrypto
-  => [(Alonzo.ScriptPurpose ledgerera, Ledger.ScriptHash StandardCrypto)]
+  => Ledger.EraCrypto (Alonzo.AlonzoEra c) ~ StandardCrypto
+  => [(PlutusPurpose AsItem (Alonzo.AlonzoEra c), Ledger.ScriptHash StandardCrypto)]
   -> Aeson.Value
 renderMissingRedeemers scripts = Aeson.object $ map renderTuple  scripts
   where
     renderTuple :: ()
-      => Ledger.EraCrypto ledgerera ~ StandardCrypto
-      => (Alonzo.ScriptPurpose ledgerera, Ledger.ScriptHash StandardCrypto)
+      => Ledger.EraCrypto (Alonzo.AlonzoEra c) ~ StandardCrypto
+      => (PlutusPurpose AsItem (Alonzo.AlonzoEra c), Ledger.ScriptHash StandardCrypto)
       -> Aeson.Pair
     renderTuple (scriptPurpose, sHash) =
       Aeson.fromText (renderScriptHash sHash) .= renderScriptPurpose scriptPurpose
@@ -196,17 +199,17 @@ renderScriptHash :: Ledger.ScriptHash StandardCrypto -> Text
 renderScriptHash = Api.serialiseToRawBytesHexText . Api.fromShelleyScriptHash
 
 renderScriptPurpose :: ()
-  => Ledger.EraCrypto ledgerera ~ StandardCrypto
-  => Alonzo.ScriptPurpose ledgerera
+  => Ledger.EraCrypto (Alonzo.AlonzoEra c) ~ StandardCrypto
+  => PlutusPurpose AsItem (Alonzo.AlonzoEra c)
   -> Aeson.Value
 renderScriptPurpose = \case
-  Alonzo.Minting pid ->
+  AlonzoMinting pid ->
     Aeson.object [ "minting" .= Aeson.toJSON pid]
-  Alonzo.Spending txin ->
+  AlonzoSpending (AsItem txin) ->
     Aeson.object [ "spending" .= Api.fromShelleyTxIn txin]
-  Alonzo.Rewarding rwdAcct ->
+  AlonzoRewarding (AsItem rwdAcct) ->
     Aeson.object [ "rewarding" .= Aeson.String (Api.serialiseAddress $ Api.fromShelleyStakeAddr rwdAcct)]
-  Alonzo.Certifying _cert ->
+  AlonzoCertifying _cert ->
     Aeson.object
       [ "certifying" .= Aeson.toJSON @String "TODO CIP-1694 unimplemented" -- toJSON (Api.textEnvelopeDefaultDescr $ Api.fromShelleyCertificate sbe cert)
       ]

cardano-node/src/Cardano/Node/Tracing/Tracers/Peer.hs

@@ -29,6 +29,7 @@ import qualified Data.Text as Text
 import           Text.Printf (printf)
 
 import           Ouroboros.Consensus.Block (Header)
+import           Ouroboros.Consensus.Util.NormalForm.StrictTVar (StrictTVar, readTVar)
 import           Ouroboros.Consensus.Util.Orphans ()
 import           Ouroboros.Network.ConnectionId (remoteAddress)
 
@@ -105,9 +106,9 @@ getCurrentPeers nkd = mapNodeKernelDataIO extractPeers nkd
   tuple3pop (a, b, _) = (a, b)
 
   getCandidates
-    :: STM.StrictTVar IO (Map peer (STM.StrictTVar IO (Net.AnchoredFragment (Header blk))))
+    :: StrictTVar IO (Map peer (StrictTVar IO (Net.AnchoredFragment (Header blk))))
     -> STM.STM IO (Map peer (Net.AnchoredFragment (Header blk)))
-  getCandidates var = STM.readTVar var >>= traverse STM.readTVar
+  getCandidates var = readTVar var >>= traverse readTVar
 
   extractPeers :: NodeKernel IO RemoteAddress LocalConnectionId blk
                 -> IO [PeerT blk]