Release 10.3

bench/locli/locli.cabal

@@ -126,7 +126,7 @@ library
                       , hashable
                       , optparse-applicative-fork >= 0.18.1
                       , ouroboros-consensus
-                      , ouroboros-network-api ^>= 0.12
+                      , ouroboros-network-api ^>= 0.13
                       , sop-core
                       , split
                       , sqlite-easy >= 1.1.0.1

bench/plutus-scripts-bench/plutus-scripts-bench.cabal

@@ -82,7 +82,7 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api             ^>=10.8
+    , cardano-api             ^>=10.10
     , plutus-ledger-api       ^>=1.37
     , plutus-tx               ^>=1.37
     , plutus-tx-plugin        ^>=1.37

bench/tx-generator/tx-generator.cabal

@@ -106,7 +106,7 @@ library
                       , attoparsec-aeson
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 10.8
+                      , cardano-api ^>= 10.10
                       , cardano-binary
                       , cardano-cli ^>= 10.4
                       , cardano-crypto-class

cabal.project

@@ -64,3 +64,121 @@ allow-newer:
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
+
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-base
+  tag: b2cec3fbcde4bacb9c961e5510d5a1d3754c4e2b
+  --sha256: sha256-TDEBINZ3SkhpRNomMdt53bR3gdzgkWR9jIlAr8yrU6o=
+  subdir:
+      cardano-crypto-class
+      cardano-slotting
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/plutus
+  tag: be9ccfc7f8ecc6ebc577dcf3374a30530ecdb168
+  --sha256: sha256-R7t5Luc1d9l2tXKg5Jgqye+vQAEONwCrQ9/JDkFCu9M=
+  subdir:
+    plutus-core
+    plutus-ledger-api
+    plutus-tx
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-ledger
+  tag: f5b35692b4d92d664187781a98b7af3fab445bad
+  --sha256: sha256-krYzn7ct6S52bGLC8vs5/pL421UbP0+jVjxwUhOcbcA=
+  subdir:
+      eras/allegra/impl
+      eras/alonzo/impl
+      eras/alonzo/test-suite
+      eras/babbage/impl
+      eras/babbage/test-suite
+      eras/byron/chain/executable-spec
+      eras/byron/crypto
+      eras/byron/crypto/test
+      eras/byron/ledger/executable-spec
+      eras/byron/ledger/impl
+      eras/byron/ledger/impl/test
+      eras/conway/impl
+      eras/conway/test-suite
+      eras/mary/impl
+      eras/shelley/impl
+      eras/shelley-ma/test-suite
+      eras/shelley/test-suite
+      libs/cardano-data
+      libs/cardano-ledger-api
+      libs/cardano-ledger-binary
+      libs/cardano-ledger-core
+      libs/cardano-ledger-test
+      libs/cardano-protocol-tpraos
+      libs/constrained-generators
+      libs/non-integral
+      libs/set-algebra
+      libs/small-steps
+      libs/vector-map
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/ouroboros-network
+  tag: 588130b5f0494a42c19da3bd44211ff7607b5831
+  --sha256: sha256-5/kbjSYdWpTrOZD/eCPrMQVu6Lo03KdeuAy3bhtTH0c=
+  subdir:
+    cardano-client
+    cardano-ping
+    monoidal-synchronisation
+    network-mux
+    ntp-client
+    ouroboros-network
+    ouroboros-network-api
+    ouroboros-network-framework
+    ouroboros-network-mock
+    ouroboros-network-protocols
+    ouroboros-network-testing
+    quickcheck-monoids
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/ouroboros-consensus
+  tag: 1e2c0fed8e81c15575bf3cd3aaa9b6efde328d8d
+  --sha256: sha256-osyNYXxJqg4MS6ISXtEneuYRb0xBIr5ztGmxvMyGTL4=
+  subdir:
+    ouroboros-consensus
+    ouroboros-consensus-cardano
+    ouroboros-consensus-protocol
+    ouroboros-consensus-diffusion
+    sop-extras
+    strict-sop-core
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-api
+  tag: de211cac855cf7e9e1bcd668a86bc121057efcc1
+  --sha256: sha256-PX/NITXB65xIIS1enOeHbVZCq0CAksVM1kq24Uco1pg=
+  subdir:
+    cardano-api
+    cardano-api-gen
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-cli
+  tag: 9006b84a459c62e5b278e1fe23228ba2601da714
+  --sha256: sha256-4uHXUTCH/cvqAkCcCBqA5RzCZNItsE4FOqGBTVVvLVQ=
+  subdir:
+    cardano-cli
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/ekg-forward.git
+  -- tag: bd3755833f57084daa11016b1f3b4dc2bd6863c9
+  tag: e372f6d8b6bc493ec64c1fbee8a1d2fcfa41b056
+  --sha256: sha256-BMIPujr/MH3V+DUlgZ0Bev4H4eDtK1wmX5tZSfmdeko=
+  subdir:
+    .
+
+allow-newer: none
+
+constraints:
+  io-classes ==1.5.0.0, ekg-forward >=0.9, cardano-slotting ==0.2.0.0

cardano-node-chairman/cardano-node-chairman.cabal

@@ -70,7 +70,7 @@ test-suite chairman-tests
 
   build-depends:      , cardano-api
                       , cardano-testnet
-                      , cardano-crypto-class ^>= 2.1.2
+                      , cardano-crypto-class ^>= 2.2
                       , data-default-class
                       , filepath
                       , hedgehog

cardano-node/cardano-node.cabal

@@ -146,7 +146,7 @@ library
                       , async
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 10.8
+                      , cardano-api ^>= 10.10
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-git-rev ^>=0.2.2
@@ -175,8 +175,9 @@ library
                       , formatting
                       , generic-data
                       , hostname
-                      , io-classes >= 1.4
+                      , io-classes >= 1.5
                       , iohk-monitoring ^>= 0.2
+                      , microlens
                       , iproute
                       , lobemo-backend-aggregation
                       , lobemo-backend-ekg ^>= 0.2
@@ -191,10 +192,10 @@ library
                       , ouroboros-consensus-cardano ^>= 0.21
                       , ouroboros-consensus-diffusion ^>= 0.20
                       , ouroboros-consensus-protocol
-                      , ouroboros-network-api ^>= 0.12
-                      , ouroboros-network ^>= 0.19.0.3
+                      , ouroboros-network-api ^>= 0.13
+                      , ouroboros-network ^>= 0.20
                       , ouroboros-network-framework
-                      , ouroboros-network-protocols ^>= 0.13
+                      , ouroboros-network-protocols ^>= 0.14
                       , prettyprinter
                       , prettyprinter-ansi-terminal
                       , psqueues
@@ -252,7 +253,7 @@ test-suite cardano-node-test
                       , bytestring
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
-                      , cardano-api:{cardano-api, internal}
+                      , cardano-api
                       , cardano-ledger-core
                       , cardano-node
                       , cardano-slotting

cardano-node/src/Cardano/Node/Configuration/Logging.hs

@@ -93,6 +93,7 @@ import           System.Metrics.Label (Label)
 import qualified System.Remote.Monitoring.Wai as EKG
 
 import           Paths_cardano_node (version)
+import Ouroboros.Consensus.Byron.ByronHFC (byronLedgerConfig)
 
 --------------------------------
 -- Layer

cardano-node/src/Cardano/Node/Configuration/POM.hs

@@ -26,6 +26,7 @@ where
 
 import           Cardano.Crypto (RequiresNetworkMagic (..))
 import           Cardano.Logging.Types
+import           Cardano.Network.Types (NumberOfBigLedgerPeers (..))
 import           Cardano.Node.Configuration.NodeAddress (SocketPath)
 import           Cardano.Node.Configuration.Socket (SocketConfig (..))
 import           Cardano.Node.Handlers.Shutdown
@@ -35,13 +36,16 @@ import           Cardano.Tracing.Config
 import           Cardano.Tracing.OrphanInstances.Network ()
 import           Ouroboros.Consensus.Ledger.SupportsMempool
 import           Ouroboros.Consensus.Mempool (MempoolCapacityBytesOverride (..))
-import           Ouroboros.Consensus.Node (NodeDatabasePaths (..), pattern DoDiskSnapshotChecksum)
-import qualified Ouroboros.Consensus.Node as Consensus (NetworkP2PMode (..))
-import           Ouroboros.Consensus.Node.Genesis (GenesisConfig, GenesisConfigFlags (..),
-                   defaultGenesisConfigFlags, mkGenesisConfig)
-import           Ouroboros.Consensus.Storage.LedgerDB.DiskPolicy (Flag, NumOfDiskSnapshots (..),
-                   SnapshotInterval (..))
-import           Ouroboros.Network.Diffusion.Configuration as Configuration
+import qualified Ouroboros.Consensus.Node as Consensus (NetworkP2PMode (..), pattern DoDiskSnapshotChecksum)
+import           Ouroboros.Consensus.Node (NodeDatabasePaths (..))
+import           Ouroboros.Consensus.Node.Genesis (GenesisConfig, GenesisConfigFlags, defaultGenesisConfigFlags, mkGenesisConfig)
+import           Ouroboros.Consensus.Storage.LedgerDB.DiskPolicy (NumOfDiskSnapshots (..),
+                   SnapshotInterval (..), Flag (..))
+import qualified Ouroboros.Cardano.Network.Diffusion.Configuration as Cardano
+import           Ouroboros.Network.Diffusion.Configuration
+                   (AcceptedConnectionsLimit (..), ConsensusMode (..), DiffusionMode (..),
+                   PeerSelectionTargets (..), PeerSharing (..))
+import qualified Ouroboros.Network.Diffusion.Configuration as Ouroboros
 import qualified Ouroboros.Network.PeerSelection.Governor as PeerSelection
 
 import           Control.Monad (when, unless)
@@ -173,7 +177,7 @@ data NodeConfiguration
 
          -- Minimum number of active big ledger peers we must be connected to
          -- in Genesis mode
-       , ncMinBigLedgerPeersForTrustedState :: MinBigLedgerPeersForTrustedState
+       , ncMinBigLedgerPeersForTrustedState :: NumberOfBigLedgerPeers
 
          -- Enable experimental P2P mode
        , ncEnableP2P :: SomeNetworkP2PMode
@@ -247,7 +251,7 @@ data PartialNodeConfiguration
        , pncSyncTargetOfActiveBigLedgerPeers      :: !(Last Int)
          -- Minimum number of active big ledger peers we must be connected to
          -- in Genesis mode
-       , pncMinBigLedgerPeersForTrustedState :: !(Last MinBigLedgerPeersForTrustedState)
+       , pncMinBigLedgerPeersForTrustedState :: !(Last NumberOfBigLedgerPeers)
 
          -- Consensus mode for diffusion layer
        , pncConsensusMode :: !(Last ConsensusMode)
@@ -565,7 +569,7 @@ defaultPartialNodeConfiguration =
     , pncDiffusionMode = Last $ Just InitiatorAndResponderDiffusionMode
     , pncNumOfDiskSnapshots = Last $ Just DefaultNumOfDiskSnapshots
     , pncSnapshotInterval = Last $ Just DefaultSnapshotInterval
-    , pncDoDiskSnapshotChecksum = Last $ Just DoDiskSnapshotChecksum
+    , pncDoDiskSnapshotChecksum = Last $ Just Consensus.DoDiskSnapshotChecksum
     , pncExperimentalProtocolsEnabled = Last $ Just False
     , pncTopologyFile = Last . Just $ TopologyFile "configuration/cardano/mainnet-topology.json"
     , pncProtocolFiles = mempty
@@ -601,26 +605,26 @@ defaultPartialNodeConfiguration =
     , pncSyncTargetOfKnownBigLedgerPeers       = Last (Just syncBigKnown)
     , pncSyncTargetOfEstablishedBigLedgerPeers = Last (Just syncBigEst)
     , pncSyncTargetOfActiveBigLedgerPeers      = Last (Just syncBigAct)
-    , pncMinBigLedgerPeersForTrustedState = Last (Just defaultMinBigLedgerPeersForTrustedState)
-    , pncConsensusMode = Last (Just defaultConsensusMode)
+    , pncMinBigLedgerPeersForTrustedState = Last (Just Cardano.defaultNumberOfBigLedgerPeers)
+    , pncConsensusMode = Last (Just Ouroboros.defaultConsensusMode)
     , pncEnableP2P     = Last (Just EnabledP2PMode)
-    , pncPeerSharing   = Last (Just defaultPeerSharing)
+    , pncPeerSharing   = Last (Just Ouroboros.defaultPeerSharing)
     , pncGenesisConfigFlags = Last (Just defaultGenesisConfigFlags)
     }
   where
-    Configuration.PeerSelectionTargets {
+    PeerSelectionTargets {
       targetNumberOfRootPeers = deadlineRoots,
       targetNumberOfKnownPeers = deadlineKnown,
       targetNumberOfEstablishedPeers = deadlineEstablished,
       targetNumberOfActivePeers = deadlineActive,
       targetNumberOfKnownBigLedgerPeers = deadlineBigKnown,
       targetNumberOfEstablishedBigLedgerPeers = deadlineBigEst,
-      targetNumberOfActiveBigLedgerPeers = deadlineBigAct } = defaultDeadlineTargets
-    Configuration.PeerSelectionTargets {
+      targetNumberOfActiveBigLedgerPeers = deadlineBigAct } = Ouroboros.defaultDeadlineTargets
+    PeerSelectionTargets {
       targetNumberOfActivePeers = syncActive,
       targetNumberOfKnownBigLedgerPeers = syncBigKnown,
       targetNumberOfEstablishedBigLedgerPeers = syncBigEst,
-      targetNumberOfActiveBigLedgerPeers = syncBigAct } = defaultSyncTargets
+      targetNumberOfActiveBigLedgerPeers = syncBigAct } = Cardano.defaultSyncTargets
 
 lastOption :: Parser a -> Parser (Last a)
 lastOption = fmap Last . optional

cardano-node/src/Cardano/Node/Configuration/TopologyP2P.hs

@@ -24,18 +24,18 @@ module Cardano.Node.Configuration.TopologyP2P
   )
 where
 
+import           Cardano.Network.ConsensusMode (ConsensusMode(..))
+import           Cardano.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..))
+import           Cardano.Network.PeerSelection.PeerTrustable (PeerTrustable (..))
 import           Cardano.Node.Configuration.NodeAddress
 import           Cardano.Node.Configuration.POM (NodeConfiguration (..))
 import           Cardano.Node.Configuration.Topology (TopologyError (..))
 import           Cardano.Node.Startup (StartupTrace (..))
 import           Cardano.Node.Types
 import           Cardano.Tracing.OrphanInstances.Network ()
-import           Ouroboros.Network.ConsensusMode
 import           Ouroboros.Network.NodeToNode (DiffusionMode (..), PeerAdvertise (..))
-import           Ouroboros.Network.PeerSelection.Bootstrap (UseBootstrapPeers (..))
 import           Ouroboros.Network.PeerSelection.LedgerPeers.Type (LedgerPeerSnapshot (..),
                    UseLedgerPeers (..))
-import           Ouroboros.Network.PeerSelection.PeerTrustable (PeerTrustable (..))
 import           Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint (..))
 import           Ouroboros.Network.PeerSelection.State.LocalRootPeers (HotValency (..),
                    WarmValency (..))
@@ -263,7 +263,7 @@ readTopologyFile nc tr = do
       , "in bootstrap mode. Make sure you provide at least one bootstrap peer "
       , "source. "
       ]
-    isGenesisCompatible GenesisMode (UseBootstrapPeers{}) = False
+    isGenesisCompatible GenesisMode UseBootstrapPeers{} = False
     isGenesisCompatible _ _ = True
 
 readTopologyFileOrError :: NodeConfiguration -> CT.Tracer IO (StartupTrace blk) -> IO NetworkTopology

cardano-node/src/Cardano/Node/Handlers/TopLevel.hs

@@ -46,7 +46,7 @@ module Cardano.Node.Handlers.TopLevel
 -- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 -- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import qualified Ouroboros.Network.Diffusion as Network
+import qualified Ouroboros.Network.Diffusion.Common as Network
 
 import           Prelude
 

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

@@ -11,7 +11,7 @@ module Cardano.Node.Protocol.Checkpoints
 import           Cardano.Api
 
 import qualified Cardano.Crypto.Hash.Class as Crypto
-import           Cardano.Ledger.Crypto (StandardCrypto)
+import           Cardano.Protocol.Crypto (StandardCrypto)
 import           Cardano.Node.Types
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Cardano

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

@@ -26,7 +26,6 @@ import           Cardano.Node.Protocol.Shelley (GenesisReadError, readGenesisAny
 import           Cardano.Node.Types
 import           Cardano.Tracing.OrphanInstances.HardFork ()
 import           Cardano.Tracing.OrphanInstances.Shelley ()
-import           Ouroboros.Consensus.Shelley.Eras (StandardCrypto)
 
 import qualified Data.ByteString.Lazy as LB
 import qualified Data.Default.Class as DefaultClass
@@ -47,7 +46,7 @@ import           Data.Word
 readGenesisMaybe :: Maybe GenesisFile
                  -> Maybe GenesisHash
                  -> ExceptT GenesisReadError IO
-                            (Conway.ConwayGenesis StandardCrypto, GenesisHash)
+                            (Conway.ConwayGenesis, GenesisHash)
 readGenesisMaybe (Just genFp) mHash = readGenesis genFp mHash
 readGenesisMaybe Nothing _ = do
   case L.mkCostModelsLenient plutusV3CostModel >>= Map.lookup L.PlutusV3 . L.costModelsValid of
@@ -80,7 +79,7 @@ plutusV3ExampleValues =
   , 85902, 36, 33012864, 36, 388443360, 1, 401885761, 72, 2331379, 72, 1927926, 82523
   , 4, 117366, 10475, 4, 1292075, 24469, 74, 0, 1, 936157, 49601, 237, 0, 1
   ]
-emptyConwayGenesis :: L.CostModel -> ConwayGenesis StandardCrypto
+emptyConwayGenesis :: L.CostModel -> ConwayGenesis
 emptyConwayGenesis cm =
   let upgradePParamsDef :: (UpgradeConwayPParams Identity) -- TODO: need to define values
   -- the default instance is for StrictMaybe
@@ -107,10 +106,10 @@ emptyConwayGenesis cm =
 readGenesis :: GenesisFile
             -> Maybe GenesisHash
             -> ExceptT GenesisReadError IO
-                       (Conway.ConwayGenesis StandardCrypto, GenesisHash)
+                       (Conway.ConwayGenesis, GenesisHash)
 readGenesis = readGenesisAny
 
-validateGenesis :: Conway.ConwayGenesis StandardCrypto
+validateGenesis :: Conway.ConwayGenesis
                 -> ExceptT ConwayProtocolInstantiationError IO ()
 validateGenesis _ = return () --TODO conway: do the validation