Node 10.7 Integration

CHANGELOG.md

@@ -2,12 +2,10 @@
 
 Changelogs for components can be found as follows:
 
-- [trace-resources](https://github.com/IntersectMBO/cardano-node/blob/master/trace-resources/CHANGELOG.md)  
-- [trace-dispatcher](https://github.com/IntersectMBO/cardano-node/blob/master/trace-dispatcher/CHANGELOG.md) 
-- [cardano-testnet](https://github.com/IntersectMBO/cardano-node/blob/master/cardano-testnet/CHANGELOG.md) 
-- [cardano-submit-api](https://github.com/IntersectMBO/cardano-node/blob/master/cardano-submit-api/CHANGELOG.md) 
-- [trace-forward](https://github.com/IntersectMBO/cardano-node/blob/master/trace-forward/CHANGELOG.md) 
-- [cardano-tracer](https://github.com/IntersectMBO/cardano-node/blob/master/cardano-tracer/CHANGELOG.md)  
-- [cardano-node-capi](https://github.com/IntersectMBO/cardano-node/blob/master/cardano-node-capi/CHANGELOG.md) 
-- [bench/tx-generator](https://github.com/IntersectMBO/cardano-node/blob/master/bench/tx-generator/CHANGELOG.md) 
-
+- [trace-resources](https://github.com/IntersectMBO/cardano-node/blob/master/trace-resources/CHANGELOG.md)
+- [cardano-testnet](https://github.com/IntersectMBO/cardano-node/blob/master/cardano-testnet/CHANGELOG.md)
+- [cardano-submit-api](https://github.com/IntersectMBO/cardano-node/blob/master/cardano-submit-api/CHANGELOG.md)
+- [trace-forward](https://github.com/IntersectMBO/cardano-node/blob/master/trace-forward/CHANGELOG.md)
+- [cardano-tracer](https://github.com/IntersectMBO/cardano-node/blob/master/cardano-tracer/CHANGELOG.md)
+- [cardano-node-capi](https://github.com/IntersectMBO/cardano-node/blob/master/cardano-node-capi/CHANGELOG.md)
+- [bench/tx-generator](https://github.com/IntersectMBO/cardano-node/blob/master/bench/tx-generator/CHANGELOG.md)

CODEOWNERS

@@ -8,7 +8,6 @@
 # Perf/Tracing
 bench/                                                        @intersectmbo/performance-and-tracing
 nix/workbench/                                                @intersectmbo/performance-and-tracing
-trace-dispatcher/                                             @intersectmbo/performance-and-tracing
 trace-forward/                                                @intersectmbo/performance-and-tracing
 trace-resources/                                              @intersectmbo/performance-and-tracing
 Makefile                                                      @intersectmbo/performance-and-tracing
@@ -22,4 +21,3 @@ flake.lock                                                    @intersectmbo/core
 ci/                                                           @intersectmbo/core-tech-devx @intersectmbo/core-tech-release-1
 configuration/                                                @intersectmbo/core-tech-devx @intersectmbo/core-tech-release-1
 docker-compose.yml                                            @intersectmbo/core-tech-devx @intersectmbo/core-tech-release-1
-

README.md

@@ -16,7 +16,6 @@ The `cardano-node` repository is the point of integration of the
 [ledger](https://github.com/IntersectMBO/cardano-ledger),
 [consensus](https://github.com/IntersectMBO/ouroboros-consensus),
 [networking](https://github.com/IntersectMBO/ouroboros-network)
-and [logging](https://github.com/IntersectMBO/cardano-node/tree/master/trace-dispatcher)
 layers. It provides the `cardano-node` executable which is used to participate in the Cardano network.
 
 This is an approximate diagram of the dependencies among the different components:

bench/cardano-recon-framework/cardano-recon-framework.cabal

@@ -89,7 +89,7 @@ library
                     , containers
                     , text
                     , directory
-                    , trace-dispatcher ^>= 2.11
+                    , trace-dispatcher ^>= 2.12
                     , serialise
                     , bytestring
                     , time
@@ -127,7 +127,7 @@ executable cardano-recon
       , text
       , containers
       , cardano-recon-framework
-      , trace-dispatcher ^>= 2.11
+      , trace-dispatcher ^>= 2.12
       , aeson
       , streaming
       , async

bench/cardano-recon-framework/src/Cardano/ReCon/Trace/Feed.hs

@@ -21,9 +21,6 @@ import           Streaming
 utcToMicroseconds :: UTCTime -> Word64
 utcToMicroseconds utcTime = round $ utcTimeToPOSIXSeconds utcTime * 1000000
 
-deriving instance Eq TraceMessage
-deriving instance Ord TraceMessage
-
 -- | Temporal event represents multiple trace messages spanning some duration of time together with an index of the event.
 data TemporalEvent = TemporalEvent {
   -- | Microseconds since epoch when the event begins.

bench/locli/locli.cabal

@@ -126,8 +126,8 @@ library
                       , fingertree == 0.1.5.0
                       , hashable
                       , optparse-applicative
-                      , ouroboros-consensus
-                      , ouroboros-network-api ^>= 0.16
+                      , ouroboros-consensus:ouroboros-consensus
+                      , ouroboros-network:api ^>= 1.1
                       , sop-core
                       , split
                       , sqlite-easy >= 1.1.0.1

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

@@ -82,10 +82,10 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api             ^>=10.24.1
-    , plutus-ledger-api       ^>=1.58
-    , plutus-tx               ^>=1.58
-    , plutus-tx-plugin        ^>=1.58
+    , cardano-api             ^>=10.25
+    , plutus-ledger-api       ^>=1.59
+    , plutus-tx               ^>=1.59
+    , plutus-tx-plugin        ^>=1.59
 
   ------------------------
   -- Non-IOG dependencies

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

@@ -35,7 +35,7 @@ import           Data.Foldable (for_)
 import           Data.Maybe (catMaybes)
 import qualified Data.Text.IO as Text
 import           Options.Applicative as Opt
-import           Ouroboros.Network.NodeToClient (IOManager, withIOManager)
+import           Cardano.Network.NodeToClient (IOManager, withIOManager)
 
 import           System.Exit
 

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

@@ -48,9 +48,9 @@ import           Ouroboros.Network.KeepAlive
 import           Ouroboros.Network.Magic
 import           Ouroboros.Network.Mux (MiniProtocolCb (..),
                    OuroborosApplication (..), OuroborosBundle, RunMiniProtocol (..))
-import           Ouroboros.Network.NodeToClient (chainSyncPeerNull)
-import           Ouroboros.Network.NodeToNode (NetworkConnectTracers (..))
-import qualified Ouroboros.Network.NodeToNode as NtN
+import           Cardano.Network.NodeToClient (chainSyncPeerNull)
+import           Cardano.Network.NodeToNode (NetworkConnectTracers (..))
+import qualified Cardano.Network.NodeToNode as NtN
 import           Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..))
 import           Ouroboros.Network.PeerSelection.PeerSharing.Codec (decodeRemoteAddress,
                    encodeRemoteAddress)

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

@@ -39,7 +39,7 @@ import           Cardano.TxGenerator.Types (TPSRate)
 import           Ouroboros.Consensus.Ledger.SupportsMempool (GenTxId)
 import           Ouroboros.Network.Driver (TraceSendRecv (..))
 import           Ouroboros.Network.IOManager (IOManager)
-import           Ouroboros.Network.NodeToNode (NodeToNodeVersion, RemoteConnectionId)
+import           Cardano.Network.NodeToNode (NodeToNodeVersion, RemoteConnectionId)
 import           Ouroboros.Network.Protocol.Handshake.Type (Handshake)
 import           Ouroboros.Network.Protocol.TxSubmission2.Type (TxSubmission2)
 

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

@@ -23,7 +23,7 @@ module Cardano.Benchmarking.OuroborosImports
 
 import           Cardano.Api (BlockType (..), ConsensusModeParams (..), EpochSlots (..),
                    LocalNodeConnectInfo (..), NetworkId (..), PaymentKey, SigningKey, SocketPath,
-                   TxInMode, TxValidationErrorInCardanoMode, protocolInfo, submitTxToNodeLocal)
+                   TxInMode, TxSubmitResult (..), protocolInfo, submitTxToNodeLocal)
 
 import           Cardano.CLI.Type.Common (SigningKeyFile)
 import           Cardano.Ledger.Shelley.Genesis (ShelleyGenesis)
@@ -35,7 +35,6 @@ import           Ouroboros.Consensus.Config (TopLevelConfig, configBlock, config
 import           Ouroboros.Consensus.Config.SupportsNode (ConfigSupportsNode (..), getNetworkMagic)
 import           Ouroboros.Consensus.Node (ProtocolInfo (..))
 import           Ouroboros.Consensus.Shelley.Eras (StandardCrypto)
-import           Ouroboros.Network.Protocol.LocalTxSubmission.Type (SubmitResult (..))
 
 import           Prelude
 
@@ -61,4 +60,4 @@ makeLocalConnectInfo :: NetworkId -> SocketPath -> LocalNodeConnectInfo
 makeLocalConnectInfo networkId socketPath
   = LocalNodeConnectInfo (CardanoModeParams (EpochSlots 21600)) networkId socketPath
 
-type LocalSubmitTx = (TxInMode -> IO (SubmitResult TxValidationErrorInCardanoMode))
+type LocalSubmitTx = (TxInMode -> IO TxSubmitResult)

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

@@ -207,16 +207,20 @@ waitForEra era = do
       liftIO $ threadDelay 1_000_000
       waitForEra era
 
-localSubmitTx :: TxInMode -> ActionM (SubmitResult TxValidationErrorInCardanoMode)
+localSubmitTx :: TxInMode -> ActionM TxSubmitResult
 localSubmitTx tx = do
   submit <- getLocalSubmitTx
   ret <- liftIO $ submit tx
   case ret of
-    SubmitSuccess -> return ret
-    SubmitFail e -> do
+    TxSubmitSuccess -> return ret
+    TxSubmitFail e -> do
       let msg = concat [ "local submit failed: " , show e , " (" , show tx , ")" ]
       traceDebug msg
       return ret
+    TxSubmitError e -> do
+      let msg = concat [ "local submit error: " , show e , " (" , show tx , ")" ]
+      traceDebug msg
+      return ret
 --      throwE $ ApiError msg
 
 -- TODO:

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

@@ -76,7 +76,7 @@ import           Cardano.Node.Protocol.Types (SomeConsensusProtocol)
 import           Cardano.TxGenerator.PlutusContext (PlutusBudgetSummary)
 import           Cardano.TxGenerator.Setup.NixService as Nix (NixServiceOptions)
 import           Cardano.TxGenerator.Types (TxGenError (..))
-import           Ouroboros.Network.NodeToClient (IOManager)
+import           Cardano.Network.NodeToClient (IOManager)
 
 import           Prelude
 

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

@@ -37,6 +37,8 @@ import qualified Cardano.Logging.Types as Net
 import           Cardano.Node.Startup
 import           Cardano.Node.Tracing.NodeInfo ()
 import           Ouroboros.Network.IOManager (IOManager)
+import qualified Ouroboros.Network.Protocol.TxSubmission2.Type as TxSubmission
+import           Ouroboros.Network.Tracing ()
 
 import           Control.Exception (SomeException (..))
 import           Control.Monad (forM, guard)
@@ -49,6 +51,8 @@ import           Data.Maybe (fromMaybe)
 import qualified Data.Text as Text
 import           Data.Time.Clock
 import           GHC.Generics
+import           Network.Mux.Tracing ()
+import qualified Network.TypedProtocol.Codec as TypedProtocol
 
 import           Trace.Forward.Forwarding (InitForwardingConfig (..), initForwardingDelayed)
 import           Trace.Forward.Utils.TraceObject
@@ -395,30 +399,16 @@ instance MetaTrace NodeToNodeSubmissionTrace where
         , Namespace [] ["TxList"]
         ]
 
-instance LogFormatting SendRecvConnect where
+instance (Show txid, Show tx) => LogFormatting (TypedProtocol.AnyMessage (TxSubmission.TxSubmission2 txid tx)) where
   forHuman = Text.pack . show
-  forMachine _ _ = KeyMap.fromList [ "kind" .= A.String "SendRecvConnect" ]
+  forMachine _ _ = KeyMap.fromList [ "kind" .= A.String "TxSubmission2" ]
 
-instance MetaTrace SendRecvConnect where
-    namespaceFor _ = Namespace [] ["ReqIdsBlocking"]
+instance MetaTrace (TypedProtocol.AnyMessage (TxSubmission.TxSubmission2 tx a)) where
+    namespaceFor _ = Namespace [] ["TxSubmission2"]
     severityFor _ _ = Just Info
 
     documentFor _ = Just ""
 
     allNamespaces = [
-          Namespace [] ["SendRecvConnect"]
-        ]
-
-instance LogFormatting SendRecvTxSubmission2 where
-  forHuman = Text.pack . show
-  forMachine _ _ = KeyMap.fromList [ "kind" .= A.String "SendRecvTxSubmission2" ]
-
-instance MetaTrace SendRecvTxSubmission2 where
-    namespaceFor _ = Namespace [] ["SendRecvTxSubmission2"]
-    severityFor _ _ = Just Info
-
-    documentFor _ = Just ""
-
-    allNamespaces = [
-          Namespace [] ["SendRecvTxSubmission2"]
+          Namespace [] ["TxSubmission2"]
         ]

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

@@ -48,6 +48,7 @@ import qualified Cardano.Ledger.Babbage.Core as Ledger
 import qualified Cardano.Ledger.BaseTypes as Ledger
 import qualified Cardano.Ledger.Coin as L
 import qualified Cardano.Ledger.Plutus.Language as Plutus
+import qualified Cardano.Ledger.Compactible as L
 
 import           Data.Aeson ((.!=), (.:), (.:?), (.=))
 import qualified Data.Aeson as Aeson
@@ -379,8 +380,8 @@ toShelleyCommonPParams
     protVer <- mkProtVer protocolParamProtocolVersion
     let ppCommon =
           emptyPParams
-            & ppMinFeeAL .~ protocolParamTxFeePerByte
-            & ppMinFeeBL .~ protocolParamTxFeeFixed
+            & ppTxFeePerByteL .~ (CoinPerByte . L.compactCoinOrError $ protocolParamTxFeePerByte)
+            & ppTxFeeFixedL .~ protocolParamTxFeeFixed
             & ppMaxBBSizeL .~ fromIntegral protocolParamMaxBlockBodySize
             & ppMaxTxSizeL .~ fromIntegral protocolParamMaxTxSize
             & ppMaxBHSizeL .~ fromIntegral protocolParamMaxBlockHeaderSize
@@ -457,9 +458,9 @@ toAlonzoCommonPParams
             & ppPricesL .~ prices
             & ppMaxTxExUnitsL .~ toAlonzoExUnits maxTxExUnits
             & ppMaxBlockExUnitsL .~ toAlonzoExUnits maxBlockExUnits
-            & ppMaxValSizeL .~ maxValueSize
-            & ppCollateralPercentageL .~ collateralPercent
-            & ppMaxCollateralInputsL .~ maxCollateralInputs
+            & ppMaxValSizeL .~ fromIntegral maxValueSize
+            & ppCollateralPercentageL .~ fromIntegral collateralPercent
+            & ppMaxCollateralInputsL .~ fromIntegral maxCollateralInputs
     pure ppAlonzoCommon
 
 -- Was removed in "cardano-api" module "Cardano.Api.Internal.ProtocolParameters"
@@ -495,7 +496,7 @@ toBabbagePParams
       requireParam "protocolParamUTxOCostPerByte" Right protocolParamUTxOCostPerByte
     let ppBabbage =
           ppAlonzoCommon
-            & ppCoinsPerUTxOByteL .~ CoinPerByte utxoCostPerByte
+            & ppCoinsPerUTxOByteL .~ CoinPerByte (L.compactCoinOrError utxoCostPerByte)
     pure ppBabbage
 
 -- Was removed in "cardano-api" module "Cardano.Api.Internal.ProtocolParameters"
@@ -531,8 +532,8 @@ fromShelleyCommonPParams pp =
     , protocolParamMaxBlockHeaderSize = fromIntegral $ pp ^. ppMaxBHSizeL
     , protocolParamMaxBlockBodySize = fromIntegral $ pp ^. ppMaxBBSizeL
     , protocolParamMaxTxSize = fromIntegral $ pp ^. ppMaxTxSizeL
-    , protocolParamTxFeeFixed = pp ^. ppMinFeeBL
-    , protocolParamTxFeePerByte = pp ^. ppMinFeeAL
+    , protocolParamTxFeeFixed = pp ^. ppTxFeeFixedL
+    , protocolParamTxFeePerByte = L.fromCompact . L.unCoinPerByte $ pp ^. ppTxFeePerByteL
     , protocolParamStakeAddressDeposit = pp ^. ppKeyDepositL
     , protocolParamStakePoolDeposit = pp ^. ppPoolDepositL
     , protocolParamMinPoolCost = pp ^. ppMinPoolCostL
@@ -579,9 +580,9 @@ fromAlonzoPParams pp =
     , protocolParamPrices = Just . fromAlonzoPrices $ pp ^. ppPricesL
     , protocolParamMaxTxExUnits = Just . fromAlonzoExUnits $ pp ^. ppMaxTxExUnitsL
     , protocolParamMaxBlockExUnits = Just . fromAlonzoExUnits $ pp ^. ppMaxBlockExUnitsL
-    , protocolParamMaxValueSize = Just $ pp ^. ppMaxValSizeL
-    , protocolParamCollateralPercent = Just $ pp ^. ppCollateralPercentageL
-    , protocolParamMaxCollateralInputs = Just $ pp ^. ppMaxCollateralInputsL
+    , protocolParamMaxValueSize = Just $ fromIntegral (pp ^. ppMaxValSizeL)
+    , protocolParamCollateralPercent = Just $ fromIntegral (pp ^. ppCollateralPercentageL)
+    , protocolParamMaxCollateralInputs = Just $ fromIntegral (pp ^. ppMaxCollateralInputsL)
     }
 
 fromExactlyAlonzoPParams
@@ -599,7 +600,7 @@ fromBabbagePParams
   -> ProtocolParameters
 fromBabbagePParams pp =
   (fromAlonzoPParams pp)
-    { protocolParamUTxOCostPerByte = Just . unCoinPerByte $ pp ^. ppCoinsPerUTxOByteL
+    { protocolParamUTxOCostPerByte = Just . L.fromCompact . unCoinPerByte $ pp ^. ppCoinsPerUTxOByteL
     , protocolParamDecentralization = Nothing
     }
 

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

@@ -17,7 +17,7 @@ import           Cardano.Node.Protocol.Cardano
 import           Cardano.Node.Protocol.Types (SomeConsensusProtocol (..))
 import           Cardano.Node.Types (ConfigYamlFilePath (..), GenesisFile,
                    NodeProtocolConfiguration (..), NodeShelleyProtocolConfiguration (..),
-                   ProtocolFilepaths (..))
+                   ProtocolFilepaths (..), KESSource(..))
 import           Cardano.TxGenerator.Types
 import qualified Ouroboros.Consensus.Cardano.Node as Consensus
 
@@ -70,7 +70,7 @@ mkNodeConfig configFp_
                  ProtocolFilepaths
                  { byronCertFile = Just ""
                  , byronKeyFile = Just ""
-                 , shelleyKESFile = Just ""
+                 , shelleyKESSource = Just (KESKeyFilePath "")
                  , shelleyVRFFile = Just ""
                  , shelleyCertFile = Just ""
                  , shelleyBulkCredsFile = Just ""

bench/tx-generator/tx-generator.cabal

@@ -108,19 +108,21 @@ library
                       , attoparsec-aeson
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 10.24.1
+                      , cardano-api ^>= 10.25
                       , cardano-binary
                       , cardano-cli ^>= 10.15.0.1
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data
+                      , cardano-diffusion ^>= 1.0
                       , cardano-git-rev ^>= 0.2.2
                       , cardano-ledger-alonzo
                       , cardano-ledger-api
                       , cardano-ledger-byron
                       , cardano-ledger-core
                       , cardano-node
                       , cardano-prelude
+                      , cardano-strict-containers >=0.1
                       , contra-tracer
                       , cborg >= 0.2.2 && < 0.3
                       , containers
@@ -137,16 +139,12 @@ library
                       , network
                       , network-mux
                       , optparse-applicative
-                      , ouroboros-consensus >= 0.6
-                      , ouroboros-consensus-cardano >= 0.5
-                      , ouroboros-consensus-diffusion >= 0.7.0
-                      , ouroboros-network
-                      , ouroboros-network-api
-                      , ouroboros-network-framework
-                      , ouroboros-network-protocols
+                      , ouroboros-consensus:{ouroboros-consensus, cardano, diffusion} >= 1.0
+                      , ouroboros-network:{api, framework, framework-tracing, ouroboros-network, protocols} >= 1.1
                       , plutus-ledger-api
                       , plutus-tx
                       , random
+                      , typed-protocols ^>= 1.2
                       , serialise
                       , streaming
                       , cardano-ledger-shelley