Integration for Node release 11.1

.github/workflows/check-mainnet-config.yml

@@ -43,7 +43,6 @@ jobs:
           'mainnet-byron-genesis.json'
           'mainnet-checkpoints.json'
           'mainnet-config.json'
-          'mainnet-config-legacy.json'
           'mainnet-peer-snapshot.json'
           'mainnet-shelley-genesis.json'
           'mainnet-topology.json'

.github/workflows/haskell.yml

@@ -106,6 +106,10 @@ jobs:
       with:
         persist-credentials: false
 
+    - name: Enable long paths on Windows
+      if: runner.os == 'Windows'
+      run: git config --system core.longpaths true
+
     - name: Cache and install Cabal dependencies
       uses: input-output-hk/cardano-dev/actions/cabal-cache@e811e25d3927d62ba87f1762ea51c36e65f0b09a # cabal-cache-0.0.1.0
       with:

bench/cardano-profile/cardano-profile.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-profile
-version:                11.0.1
+version:                11.1.0
 synopsis:               A Cardano benchmarking profile generator
 description:            A Cardano benchmarking profile generator.
 category:               Cardano,

bench/cardano-topology/cardano-topology.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-topology
-version:                11.0.0
+version:                11.1.0
 synopsis:               A cardano topology generator
 description:            A cardano topology generator.
 category:               Cardano,

bench/locli/locli.cabal

@@ -127,7 +127,7 @@ library
                       , hashable
                       , optparse-applicative
                       , ouroboros-consensus:ouroboros-consensus
-                      , ouroboros-network:api ^>= 1.1
+                      , ouroboros-network:api ^>= 1.2
                       , sop-core
                       , split
                       , sqlite-easy >= 1.1.0.1

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

@@ -1,6 +1,6 @@
 cabal-version:          3.0
 name:                   plutus-scripts-bench
-version:                1.0.4.3
+version:                1.0.5.0
 synopsis:               Plutus scripts used for benchmarking
 description:            Plutus scripts used for benchmarking.
 category:               Cardano,
@@ -82,7 +82,7 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api             ^>=11.3
+    , cardano-api             ^>=11.5
     , plutus-ledger-api       ^>=1.65
     , plutus-tx               ^>=1.65
     , plutus-tx-plugin        ^>=1.65

bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs

@@ -40,6 +40,7 @@ import           Ouroboros.Network.Mux (MiniProtocolCb (..), OuroborosApplicatio
 import           Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..))
 import           Ouroboros.Network.PeerSelection.PeerSharing.Codec (decodeRemoteAddress,
                    encodeRemoteAddress)
+import           Ouroboros.Network.PerasSupport (PerasSupport (..))
 import           Ouroboros.Network.Protocol.BlockFetch.Client (BlockFetchClient (..),
                    blockFetchClientPeer)
 import           Ouroboros.Network.Protocol.Handshake.Version (simpleSingletonVersions)
@@ -112,7 +113,7 @@ benchmarkConnectTxSubmit EnvConsts { .. } handshakeTracer submissionTracer codec
   supportedVers = supportedNodeToNodeVersions (Proxy @blk)
   myCodecs :: Codecs blk NtN.RemoteAddress DeserialiseFailure IO
                 ByteString ByteString ByteString ByteString ByteString ByteString
-                ByteString
+                ByteString ByteString ByteString
   myCodecs  = defaultCodecs codecConfig blkN2nVer encodeRemoteAddress decodeRemoteAddress n2nVer
   peerMultiplex :: NtN.Versions NodeToNodeVersion
                                 NtN.NodeToNodeVersionData
@@ -129,10 +130,11 @@ benchmarkConnectTxSubmit EnvConsts { .. } handshakeTracer submissionTracer codec
        , NtN.diffusionMode = NtN.InitiatorOnlyDiffusionMode
        , NtN.peerSharing = ownPeerSharing
        , NtN.query = False
+       , NtN.perasSupport = PerasUnsupported
        }) $
       \n2nData ->
         mkApp $
-        NtN.nodeToNodeProtocols NtN.defaultMiniProtocolParameters
+        NtN.nodeToNodeProtocols mempty NtN.defaultMiniProtocolParameters
           NtN.NodeToNodeProtocols
             { NtN.chainSyncProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
                                         runPeer
@@ -160,6 +162,11 @@ benchmarkConnectTxSubmit EnvConsts { .. } handshakeTracer submissionTracer codec
                                              (cPeerSharingCodec myCodecs)
                                              channel
                                              (peerSharingClientPeer peerSharingClientNull)
+            -- TODO Peras is not supported here
+            , NtN.perasCertDiffusionProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx _channel ->
+                                          error "tx-generator: Peras cert diffusion is unsupported"
+            , NtN.perasVoteDiffusionProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx _channel ->
+                                          error "tx-generator: Peras vote diffusion is unsupported"
             }
           n2nVer
           n2nData

bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/SubmissionClient.hs

@@ -24,7 +24,7 @@ module Cardano.Benchmarking.GeneratorTx.SubmissionClient
   , txSubmissionClient
   ) where
 
-import           Cardano.Api hiding (Active)
+import           Cardano.Api hiding (Active, CardanoBlock)
 
 import           Cardano.Benchmarking.LogTypes
 import           Cardano.Benchmarking.Types
@@ -36,7 +36,6 @@ import qualified Ouroboros.Consensus.Cardano.Block as Block
                    (TxId (GenTxIdAllegra, GenTxIdAlonzo, GenTxIdBabbage, GenTxIdConway, GenTxIdMary, GenTxIdShelley))
 import           Ouroboros.Consensus.Ledger.SupportsMempool (GenTxId)
 import qualified Ouroboros.Consensus.Ledger.SupportsMempool as Mempool
-import           Ouroboros.Consensus.Shelley.Eras (StandardCrypto)
 import qualified Ouroboros.Consensus.Shelley.Ledger.Mempool as Mempool (TxId (ShelleyTxId))
 import           Ouroboros.Network.Protocol.TxSubmission2.Client (ClientStIdle (..),
                    ClientStTxIds (..), ClientStTxs (..), TxSubmissionClient (..))

bench/tx-generator/src/Cardano/Benchmarking/LogTypes.hs

@@ -22,7 +22,7 @@ module Cardano.Benchmarking.LogTypes
   , TraceBenchTxSubmit (..)
   ) where
 
-import           Cardano.Api
+import           Cardano.Api hiding (CardanoBlock)
 
 import           Cardano.Benchmarking.OuroborosImports
 import           Cardano.Benchmarking.Types

bench/tx-generator/src/Cardano/Benchmarking/OuroborosImports.hs

@@ -1,6 +1,5 @@
 {- HLINT ignore "Eta reduce" -}
 {-# LANGUAGE GADTs #-}
-{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE TypeApplications #-}
 
 module Cardano.Benchmarking.OuroborosImports
@@ -38,21 +37,19 @@ import           Prelude
 
 type CardanoBlock = Consensus.CardanoBlock StandardCrypto
 
-toProtocolInfo :: SomeConsensusProtocol -> ProtocolInfo CardanoBlock
-toProtocolInfo (SomeConsensusProtocol CardanoBlockType info) = fst $ protocolInfo @IO info
+toProtocolInfo :: SomeConsensusProtocol -> IO (ProtocolInfo CardanoBlock)
+toProtocolInfo (SomeConsensusProtocol CardanoBlockType info) = fst <$> protocolInfo @IO info
 toProtocolInfo _ = error "toProtocolInfo unknown protocol"
 
-protocolToTopLevelConfig :: SomeConsensusProtocol -> TopLevelConfig CardanoBlock
-protocolToTopLevelConfig ptcl = pInfoConfig
- where
-   ProtocolInfo {pInfoConfig} = toProtocolInfo ptcl
+protocolToTopLevelConfig :: SomeConsensusProtocol -> IO (TopLevelConfig CardanoBlock)
+protocolToTopLevelConfig ptcl = pInfoConfig <$> toProtocolInfo ptcl
 
-protocolToCodecConfig :: SomeConsensusProtocol -> CodecConfig CardanoBlock
-protocolToCodecConfig = configCodec . protocolToTopLevelConfig
+protocolToCodecConfig :: SomeConsensusProtocol -> IO (CodecConfig CardanoBlock)
+protocolToCodecConfig = fmap configCodec . protocolToTopLevelConfig
 
-protocolToNetworkId :: SomeConsensusProtocol -> NetworkId
+protocolToNetworkId :: SomeConsensusProtocol -> IO NetworkId
 protocolToNetworkId ptcl
-  = Testnet $ getNetworkMagic $ configBlock $ protocolToTopLevelConfig ptcl
+  = Testnet . getNetworkMagic . configBlock <$> protocolToTopLevelConfig ptcl
 
 makeLocalConnectInfo :: NetworkId -> SocketPath -> LocalNodeConnectInfo
 makeLocalConnectInfo networkId socketPath

bench/tx-generator/src/Cardano/Benchmarking/Script/Action.hs

@@ -69,8 +69,8 @@ startProtocol configFile tracerSocket = do
   setEnvGenesis $ getGenesis protocol
   iomgr <- askIOManager
 
+  networkId <- liftIO $ protocolToNetworkId protocol
   let
-    networkId = protocolToNetworkId protocol
     tracerSocket' = (,,) iomgr networkId `fmap` tracerSocket
 
   setEnvNetworkId networkId

bench/tx-generator/src/Cardano/Benchmarking/Script/Core.hs

@@ -9,7 +9,6 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE NumericUnderscores #-}
-{-# LANGUAGE PackageImports #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -59,7 +58,6 @@ import           Prelude
 import           Control.Concurrent (threadDelay)
 import           Control.Monad
 import           Control.Monad.Trans.RWS.Strict (ask)
-import           "contra-tracer" Control.Tracer (Tracer (..))
 import           Data.ByteString.Lazy.Char8 as BSL (writeFile)
 import           Data.Ratio ((%))
 import qualified Data.Text as Text (unpack)
@@ -139,11 +137,12 @@ getConnectClient = do
   protocol <- getEnvProtocol
   void $ return $ btSubmission2_ tracers
   envConsts <- lift ask
+  codecConfig <- liftIO $ protocolToCodecConfig protocol
   return $ benchmarkConnectTxSubmit
                        envConsts
-                       (Tracer $ traceWith (btConnect_ tracers))
+                       (mkTracer $ traceWith (btConnect_ tracers))
                        mempty -- (btSubmission2_ tracers)
-                       (protocolToCodecConfig protocol)
+                       codecConfig
                        networkMagic
 waitBenchmark :: ActionM ()
 waitBenchmark = do

bench/tx-generator/src/Cardano/Benchmarking/Tracer.hs

@@ -96,22 +96,22 @@ initTxGenTracers mbForwarding = mdo
   confState       <- emptyConfigReflection
 
   let
-    mkTracer :: (LogFormatting a, MetaTrace a)
+    mkConfiguredTracer :: (LogFormatting a, MetaTrace a)
                   => Text
                   -> Maybe (Trace IO FormattedMessage)
                   -> Maybe (Trace IO FormattedMessage)
                   -> IO (Trace IO a)
-    mkTracer namespace mbStdoutTracer' mbForwardingTracer'
+    mkConfiguredTracer namespace mbStdoutTracer' mbForwardingTracer'
       | isPrefixSilent namespace = pure mempty
       | otherwise = do
         tracer <-  generatorTracer namespace mbStdoutTracer' mbForwardingTracer'
         configureTracers confState initialTraceConfig [tracer]
         pure tracer
 
-  benchTracer     <- mkTracer TracerNameBench     mbStdoutTracer mbForwardingTracer
-  n2nSubmitTracer <- mkTracer TracerNameSubmitN2N mbStdoutTracer mbForwardingTracer
-  connectTracer   <- mkTracer TracerNameConnect   mbStdoutTracer mbForwardingTracer
-  submitTracer    <- mkTracer TracerNameSubmit    mbStdoutTracer mbForwardingTracer
+  benchTracer     <- mkConfiguredTracer TracerNameBench     mbStdoutTracer mbForwardingTracer
+  n2nSubmitTracer <- mkConfiguredTracer TracerNameSubmitN2N mbStdoutTracer mbForwardingTracer
+  connectTracer   <- mkConfiguredTracer TracerNameConnect   mbStdoutTracer mbForwardingTracer
+  submitTracer    <- mkConfiguredTracer TracerNameSubmit    mbStdoutTracer mbForwardingTracer
 
   let
     tracers = BenchTracers

bench/tx-generator/src/Cardano/TxGenerator/Genesis.hs

@@ -21,8 +21,10 @@ where
 
 import           Cardano.Api hiding (ShelleyGenesis)
 
+import           Cardano.Ledger.BaseTypes (StrictMaybe (..))
 import qualified Cardano.Ledger.Coin as L
 import           Cardano.Ledger.Shelley.API (Addr (..))
+import           Cardano.Ledger.Shelley.Genesis (InjectionData (..), ShelleyExtraConfig (..))
 import           Cardano.TxGenerator.Fund
 import           Cardano.TxGenerator.Types
 import           Cardano.TxGenerator.Utils
@@ -45,36 +47,56 @@ genesisSecureInitialFund :: forall era. IsShelleyBasedEra era =>
   -> SigningKey PaymentKey
   -> TxGenTxParams
   -> Either TxGenError (Tx era, Fund)
-genesisSecureInitialFund networkId genesis srcKey destKey TxGenTxParams{txParamFee, txParamTTL}
-  = case genesisInitialFundForKey @era networkId genesis srcKey of
-      Nothing             -> Left $ TxGenError "genesisSecureInitialFund: no fund found for given key in genesis"
-      Just (_, lovelace)  ->
-        let
-          txOutValue :: TxOutValue era
-          txOutValue = lovelaceToTxOutValue (shelleyBasedEra @era) $ lovelace - txParamFee
-        in genesisExpenditure networkId srcKey destAddr txOutValue txParamFee txParamTTL destKey
+genesisSecureInitialFund networkId genesis srcKey destKey TxGenTxParams{txParamFee, txParamTTL} = do
+  mFund <- genesisInitialFundForKey @era networkId genesis srcKey
+  case mFund of
+    Nothing             -> Left $ TxGenError "genesisSecureInitialFund: no fund found for given key in genesis"
+    Just (_, lovelace)  ->
+      let
+        txOutValue :: TxOutValue era
+        txOutValue = lovelaceToTxOutValue (shelleyBasedEra @era) $ lovelace - txParamFee
+      in genesisExpenditure networkId srcKey destAddr txOutValue txParamFee txParamTTL destKey
   where
     destAddr = keyAddress @era networkId destKey
 
 genesisInitialFunds :: forall era. IsShelleyBasedEra era
   => NetworkId
   -> ShelleyGenesis
-  -> [(AddressInEra era, L.Coin)]
-genesisInitialFunds networkId g
- = [ ( shelleyAddressInEra (shelleyBasedEra @era) $
+  -> Either TxGenError [(AddressInEra era, L.Coin)]
+genesisInitialFunds networkId g = do
+  funds <- embeddedInitialFunds g
+  pure
+    [ ( shelleyAddressInEra (shelleyBasedEra @era) $
           makeShelleyAddress networkId (fromShelleyPaymentCredential pcr) (fromShelleyStakeReference stref)
-     , coin
-     )
-     | (Addr _ pcr stref, coin) <- ListMap.toList $ sgInitialFunds g
-   ]
+      , coin
+      )
+    | (Addr _ pcr stref, coin) <- funds
+    ]
+
+-- | 'embeddedInitialFunds' resolves the genesis initial funds, accepting both the
+-- legacy top-level @initialFunds@ and the newer @extraConfig.initialFunds@
+-- injection that @cardano-cli genesis create-testnet-data@ emits.
+embeddedInitialFunds :: ShelleyGenesis -> Either TxGenError [(Addr, L.Coin)]
+embeddedInitialFunds g =
+  case sgExtraConfig g of
+    SNothing -> Right legacy
+    SJust extraConfig -> case secInitialFunds extraConfig of
+      NoInjection          -> Right legacy
+      _ | not (null legacy) ->
+          Left $ TxGenError "genesisInitialFunds: both initialFunds and extraConfig.initialFunds are populated; please use only one source"
+      EmbeddedInjection lm -> Right (ListMap.toList lm)
+      InjectionFromFile{}  ->
+        Left $ TxGenError "genesisInitialFunds: file-based initial-funds injection is unsupported; expected embedded funds in extraConfig.initialFunds or initialFunds"
+ where
+  legacy = ListMap.toList $ sgInitialFunds g
 
 genesisInitialFundForKey :: forall era. IsShelleyBasedEra era
   => NetworkId
   -> ShelleyGenesis
   -> SigningKey PaymentKey
-  -> Maybe (AddressInEra era, L.Coin)
+  -> Either TxGenError (Maybe (AddressInEra era, L.Coin))
 genesisInitialFundForKey networkId genesis key
-  = find (isTxOutForKey . fst) (genesisInitialFunds networkId genesis)
+  = find (isTxOutForKey . fst) <$> genesisInitialFunds networkId genesis
  where
   isTxOutForKey = (keyAddress networkId key ==)
 

bench/tx-generator/src/Cardano/TxGenerator/ProtocolParameters.hs

@@ -58,7 +58,7 @@ import           Data.Int (Int64)
 import qualified Data.Map.Strict as Map
 import qualified Data.Scientific as Scientific
 import qualified Data.Text as Text
-import           Data.Word (Word16)
+import           Data.Word (Word16, Word32)
 import           GHC.Generics
 import           Lens.Micro ((&), (.~), (^.))
 import           Numeric.Natural (Natural)
@@ -83,7 +83,7 @@ convertToLedgerProtocolParameters sbe pp =
 
 data ProtocolParameters
   = ProtocolParameters
-  { protocolParamProtocolVersion :: (Natural, Natural)
+  { protocolParamProtocolVersion :: (Natural, Word32)
   -- ^ Protocol version, major and minor. Updating the major version is
   -- used to trigger hard forks.
   --                              (Major  , Minor  )
@@ -323,7 +323,7 @@ requireParam
 requireParam paramName = maybe (Left $ PpceMissingParameter paramName)
 
 -- Duplicated from "cardano-api" module "Cardano.Api.Internal.ProtocolParameters"
-mkProtVer :: (Natural, Natural) -> Either ProtocolParametersConversionError Ledger.ProtVer
+mkProtVer :: (Natural, Word32) -> Either ProtocolParametersConversionError Ledger.ProtVer
 mkProtVer (majorProtVer, minorProtVer) =
   maybeToRight (PpceVersionInvalid majorProtVer) $
     (`Ledger.ProtVer` minorProtVer) <$> Ledger.mkVersion majorProtVer

bench/tx-generator/src/Cardano/TxGenerator/Setup/NixService.hs

@@ -33,7 +33,7 @@ import           Cardano.Api (AnyCardanoEra, mapFile)
 import           Cardano.CLI.Type.Common (FileDirection (..), SigningKeyFile)
 import qualified Cardano.Ledger.Coin as L
 import           Cardano.Node.Configuration.NodeAddress (NodeAddress' (..),
-                   NodeHostIPv4Address (..), NodeIPv4Address)
+                   NodeIPv4Address)
 import           Cardano.Node.Types (AdjustFilePaths (..))
 import           Cardano.TxGenerator.Internal.Orphans ()
 import           Cardano.TxGenerator.Types
@@ -141,22 +141,20 @@ data NodeDescription =
 
 instance FromJSON NodeDescription where
   parseJSON = withObject "NodeDescription" \v -> do
-    unNodeHostIPv4Address
+    naHostAddress
             <- v .:  "addr"    <?> Key "addr"
     naPort  <- fmap toEnum $
                  v .:  "port"  <?> Key "port"
-    let naHostAddress = NodeHostIPv4Address {..}
-        ndAddr        = NodeAddress {..}
+    let ndAddr        = NodeAddress {..}
     ndName  <- v .:? "name"    <?> Key "name" .!= show ndAddr
     pure $ NodeDescription {..}
 
 instance ToJSON NodeDescription where
   toJSON NodeDescription {ndAddr, ndName} = object
        [ "name" .= ndName
-       , "addr" .= unNodeHostIPv4Address
+       , "addr" .= naHostAddress
        , "port" .= fromEnum naPort ] where
     _addr@NodeAddress {naHostAddress, naPort} = ndAddr
-    _hostAddr@NodeHostIPv4Address {unNodeHostIPv4Address} = naHostAddress
 
 
 -- Long GC pauses on target nodes can trigger spurious MVar deadlock