Merge branch 'master' into ksaric/GH-208

Author: ksaric

.gitignore

@@ -4,6 +4,7 @@
 dist/*
 dist-newstyle/*
 .ghc.environment.*
+stack.yaml.lock
 
 # From daedalus-bridge
 node_modules/*

Makefile

@@ -7,20 +7,20 @@ stylish-haskell: ## Apply stylish-haskell on all *.hs files
 	@find . -type f -name "*.hs" -not -path '.git' -not -path '*.stack-work*' -print0 | xargs -0 stylish-haskell -i
 
 ghci: ## Run repl
-	@stack ghci $(PROJECT_NAME):lib --haddock-deps --ghci-options=-fobject-code
+	@stack ghci $(PROJECT_NAME):lib --haddock-deps --ghci-options=-fobject-code --nix
 
 ghcid:  ## Run ghcid
 	@ghcid --command "stack ghci $(PROJECT_NAME):lib --nix -j12 --ghci-options=-fobject-code"
 
 run-test: ## Build & run test
-	@stack build --fast && \
-	stack test --fast
+	@stack build --fast --nix && \
+	stack test --fast --nix
 
 test-ghci: ## Run repl on test suites
-	@stack ghci $(PROJECT_NAME):lib $(PROJECT_NAME):test:$(PROJECT_NAME)-test --ghci-options=-fobject-code
+	@stack ghci $(PROJECT_NAME):lib $(PROJECT_NAME):test:$(PROJECT_NAME)-test --ghci-options=-fobject-code --nix
 
 test-ghcid: ## Run ghcid on test suites
-	@ghcid --command "stack ghci $(PROJECT_NAME):lib $(PROJECT_NAME):test:$(PROJECT_NAME)-test --ghci-options=-fobject-code"
+	@ghcid --command "stack ghci --nix $(PROJECT_NAME):lib $(PROJECT_NAME):test:$(PROJECT_NAME)-test --ghci-options=-fobject-code"
 
 test-ghcid-nix: ## Run ghcid on test suites with Nix
 	#NUM_PROC = $(nproc --all) # Either try to fetch the real num of cores or default to 4

app/Cardano/Shell/Features/Logging.hs

@@ -24,6 +24,8 @@ import           Control.Exception.Safe (MonadCatch)
 import qualified Control.Monad.STM as STM
 import           Options.Applicative
 
+import           Cardano.BM.Data.Backend (Backend)
+import qualified Cardano.BM.Backend.Switchboard as Switchboard
 import           Cardano.BM.Configuration (Configuration)
 import qualified Cardano.BM.Configuration as Config
 import           Cardano.BM.Data.LogItem (LOContent (..), LOMeta (..),
@@ -71,12 +73,14 @@ data LoggingLayer = LoggingLayer
     , llLogNotice       :: forall m a.      (MonadIO m, Show a)  => Trace m a  -> a -> m ()
     , llLogWarning      :: forall m a.      (MonadIO m, Show a)  => Trace m a  -> a -> m ()
     , llLogError        :: forall m a.      (MonadIO m, Show a)  => Trace m a  -> a -> m ()
-    , llAppendName      :: forall m a.      (MonadIO m, Show a)  => LoggerName -> Trace m a -> m (Trace m a)
+    , llAppendName      :: forall m a.      (Show a)             => LoggerName -> Trace m a -> Trace m a
     , llBracketMonadIO  :: forall a t.      (Show a)             => Trace IO a -> Severity -> Text -> IO t -> IO t
     , llBracketMonadM   :: forall m a t.    (MonadCatch m, MonadIO m, Show a) => Trace m a -> Severity -> Text -> m t -> m t
     , llBracketMonadX   :: forall m a t.    (MonadIO m, Show a) => Trace m a -> Severity -> Text -> m t -> m t
     , llBracketStmIO    :: forall a t.      (Show a) => Trace IO a -> Severity -> Text -> STM.STM t -> IO t
     , llBracketStmLogIO :: forall a t.      (Show a) => Trace IO a -> Severity -> Text -> STM.STM (t,[(LOMeta, LOContent a)]) -> IO t
+    , llConfiguration   :: Configuration
+    , llAddBackend      :: Backend Text -> Text -> IO ()
     }
 
 --------------------------------
@@ -96,7 +100,6 @@ loggingParser = LoggingCLIArguments
     <$> strOption
         ( long "log-config"
        <> metavar "LOGCONFIG"
-       <> value ""
        <> help "Configuration file for logging"
         )
 
@@ -152,6 +155,8 @@ loggingCardanoFeatureInit loggingConfiguration = do
                     , llBracketMonadX   = Monadic.bracketObserveX logConfig
                     , llBracketStmIO    = Stm.bracketObserveIO logConfig
                     , llBracketStmLogIO = Stm.bracketObserveLogIO logConfig
+                    , llConfiguration   = logConfig
+                    , llAddBackend      = Switchboard.addExternalBackend switchBoard
                     }
 
     -- Cleanup function which shuts down the switchboard.

app/Cardano/Shell/Features/Networking.hs

@@ -12,7 +12,8 @@ import           Cardano.Shell.Features.Logging (LoggingLayer (..))
 import           Cardano.Shell.Types (CardanoEnvironment, CardanoFeature (..),
                                       CardanoFeatureInit (..))
 
-import           Cardano.Shell.Constants.Types (CardanoConfiguration)
+import           Cardano.Shell.Constants.Types (CardanoConfiguration (..),
+                                                Core (..), Wallet (..))
 --------------------------------------------------------------------------------
 -- Networking feature
 --------------------------------------------------------------------------------
@@ -75,6 +76,9 @@ createNetworkingFeature loggingLayer cardanoEnvironment cardanoConfiguration = d
     -- the filesystem, so we give him the most flexible/powerful context, @IO@.
     networkingConfiguration <-  pure "THIS IS AN EXAMPLE OF A CONFIGURATION!"
 
+    putTextLn $ "The DB version - " <> (show $ coDBSerializeVersion $ ccCore cardanoConfiguration)
+    putTextLn $ "The Wallet Throttle - " <> (show $ thRate $ ccWallet cardanoConfiguration)
+
     -- we construct the layer
     networkingLayer         <- (featureInit networkingCardanoFeatureInit) cardanoEnvironment loggingLayer cardanoConfiguration networkingConfiguration
 
@@ -97,21 +101,18 @@ networkingCardanoFeatureInit = CardanoFeatureInit
       where
         actualNetworkFeature :: CardanoEnvironment -> LoggingLayer -> CardanoConfiguration -> Text -> IO NetworkLayer
         actualNetworkFeature _ loggingLayer _ _ = do
-            --putTextLn "Starting up networking!"
             pure $ testNetworkLayer loggingLayer
 
     featureCleanup' :: NetworkLayer -> IO ()
-    featureCleanup' _ = pure () --putTextLn "Shutting down networking feature!" -- close all connections, for example
+    featureCleanup' _ = pure () -- close all connections, for example
 
 
 networkingCardanoFeature :: NetworkingCardanoFeature -> NetworkLayer -> CardanoFeature
 networkingCardanoFeature networkingCardanoFeature' networkingLayer = CardanoFeature
     { featureName       = featureType networkingCardanoFeature'
     , featureStart      = liftIO $ do
-        --putTextLn "Starting up networkingCardanoFeature!"
         void $ pure networkingLayer -- or whatever it means for YOU (a specific team)
     , featureShutdown   = liftIO $ do
-        --putTextLn "Shutting down networkingCardanoFeature!"
         (featureCleanup networkingCardanoFeature') networkingLayer
     }
 

app/Launcher/Main.hs

@@ -18,6 +18,7 @@ import           Formatting.Buildable (Buildable (..))
 
 import           Control.Exception.Safe (throwM)
 
+-- import           Cardano.Shell.Update.Lib (runUpdater, updaterData)
 import           Cardano.Shell.Configuration.Types (LauncherConfig (..),
                                                     WalletArguments (..),
                                                     WalletPath (..))
@@ -37,7 +38,7 @@ import           Data.X509.Extra (failIfReasons, genRSA256KeyPair,
 
 main :: IO ()
 main = do
-
+        
     let launcherConfig :: LauncherConfig
         launcherConfig = LauncherConfig
             { lcfgFilePath    = "./configuration/cert-configuration.yaml"

app/Main.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE RecordWildCards #-}
+
 module Main (main) where
 
 import           Cardano.Prelude
@@ -8,13 +10,20 @@ import           Cardano.Shell.Features.Logging (LoggingCLIArguments,
                                                  loggingParser)
 import           Cardano.Shell.Features.Networking (createNetworkingFeature)
 
-import           Cardano.Shell.Constants.Types (CardanoConfiguration (..))
+import           Cardano.Shell.Configuration.Lib (finaliseCardanoConfiguration)
+import           Cardano.Shell.Constants.CLI (configCardanoConfigurationCLIParser)
+import           Cardano.Shell.Constants.PartialTypes (PartialCardanoConfiguration (..))
 import           Cardano.Shell.Lib
 import           Cardano.Shell.Presets (mainnetConfiguration)
 import           Cardano.Shell.Types
 
 import           Options.Applicative
 
+
+-- | The product type of all command line arguments.
+-- All here being - from all the features.
+data CLIArguments = CLIArguments !LoggingCLIArguments !PartialCardanoConfiguration
+
 main :: IO ()
 main = do
 
@@ -34,7 +43,7 @@ main = do
             let appendName = llAppendName loggingLayer
 
             logNotice logTrace "Hello from logging layer ..."
-            logTrace' <- appendName "cardano-shell" logTrace
+            let logTrace' = appendName "cardano-shell" logTrace
             logNotice logTrace' "Hello #2 from logging layer ..."
 
             _ <- replicateM 5 (threadDelay 1000000 >> putTextLn "Running node/wallet/whatever!")
@@ -73,16 +82,32 @@ main = do
 -- anytime.
 -- Another interesting thing is that we stack the effects ONLY when we use a function from
 -- another layer, and we don't get all the effects, just the ones the function contains.
-initializeAllFeatures :: CardanoConfiguration -> CardanoEnvironment -> IO ([CardanoFeature], LoggingLayer)
-initializeAllFeatures cardanoConfiguration cardanoEnvironment = do
+initializeAllFeatures :: PartialCardanoConfiguration -> CardanoEnvironment -> IO ([CardanoFeature], LoggingLayer)
+initializeAllFeatures partialConfig cardanoEnvironment = do
 
     -- Here we parse the __CLI__ arguments for the actual application.
-    loggingCLIArguments             <- execParser parserWithInfo
+    CLIArguments loggingCLIArguments cardanoConfigurationCLI  <- execParser parserWithInfo
+
+    let cardanoConfiguration'   = partialConfig <> cardanoConfigurationCLI
+
+    putTextLn "************************************************"
+    putTextLn "Cardano configurationn"
+    putTextLn "************************************************"
+    putTextLn $ show partialConfig
+    putTextLn "------------------------------------------------"
+    putTextLn $ show cardanoConfigurationCLI
+    putTextLn "------------------------------------------------"
+    putTextLn $ show cardanoConfiguration'
+    putTextLn "------------------------------------------------"
+
+    -- Finalize the configuration and if something is missing, just throw error.
+    finalConfig <- either (throwIO . ConfigurationError) pure $
+          finaliseCardanoConfiguration cardanoConfiguration'
 
     -- Here we initialize all the features
-    (loggingLayer, loggingFeature)  <- createLoggingFeature cardanoEnvironment cardanoConfiguration loggingCLIArguments
+    (loggingLayer, loggingFeature)  <- createLoggingFeature cardanoEnvironment finalConfig loggingCLIArguments
 
-    (_           , networkFeature)  <- createNetworkingFeature loggingLayer cardanoEnvironment cardanoConfiguration
+    (_           , networkFeature)  <- createNetworkingFeature loggingLayer cardanoEnvironment finalConfig
 
     -- Here we return all the features.
     let allCardanoFeatures :: [CardanoFeature]
@@ -94,9 +119,16 @@ initializeAllFeatures cardanoConfiguration cardanoEnvironment = do
     pure (allCardanoFeatures, loggingLayer)
   where
     -- | Top level parser with info.
-    parserWithInfo :: ParserInfo LoggingCLIArguments
-    parserWithInfo = info (loggingParser <**> helper)
+    parserWithInfo :: ParserInfo CLIArguments
+    parserWithInfo = info (commandLineParser <**> helper)
         (  fullDesc
         <> progDesc "Logging Feature"
         <> header "cardano-shell: logging feature"
         )
+
+    -- | The product parser for all the CLI arguments.
+    commandLineParser :: Parser CLIArguments
+    commandLineParser = CLIArguments
+        <$> loggingParser
+        <*> configCardanoConfigurationCLIParser
+

cabal.project

@@ -4,13 +4,13 @@ packages:
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: e2dc8b2160bb2ccd1ef9817a6498cda06ad36580
+  tag: b2022cf7f5925e486f9e0a31f6f6d02145d5ebda
   subdir: contra-tracer
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: e2dc8b2160bb2ccd1ef9817a6498cda06ad36580
+  tag: b2022cf7f5925e486f9e0a31f6f6d02145d5ebda
   subdir: iohk-monitoring
 
 source-repository-package
@@ -21,7 +21,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
-  tag: fda38e60007a019c0c8569e8a0fc08f2102c92cc
+  tag: d673b92f2a2d9354d102514d0a0fa74f8248b14a
 
 source-repository-package
   type: git

cardano-shell.cabal

@@ -33,16 +33,18 @@ library
     -- Update system
     , CardanoShellSpec
     , Cardano.Shell.Update.Types
+    , Cardano.Shell.Update.Lib
     -- Constants
+    , Cardano.Shell.Constants.PartialTypes
     , Cardano.Shell.Constants.Types
+    , Cardano.Shell.Constants.CLI
     , Cardano.Shell.Presets
     -- Features
     , Cardano.Shell.Features.Logging
   other-modules:
       Cardano.Shell.NodeIPC.Lib
     , Cardano.Shell.NodeIPC.Message
     , Cardano.Shell.NodeIPC.ServerExample
-
   hs-source-dirs:
       app
     , src
@@ -69,6 +71,9 @@ library
     , async
     , text
     , transformers
+    , generic-monoid
+  if os(windows)
+    build-depends:     Win32
 
   default-language:    Haskell2010
   default-extensions:  NoImplicitPrelude
@@ -203,6 +208,7 @@ test-suite cardano-shell-test
   other-modules:
       Paths_cardano_shell
       DhallConfigSpec
+      UpdaterSpec
   if !os(windows)
     other-modules:
       NodeIPCSpec

configuration/log-configuration.yaml

@@ -41,3 +41,17 @@ options:
   # mapBackends:
   #   demo-playground.simple-node.CoreId 0.validation:
   #     - AggregationBK
+  mapSubtrace:
+    '#messagecounters.aggregation':
+      subtrace: NoTrace
+    '#messagecounters.ekgview':
+      subtrace: NoTrace
+    '#messagecounters.switchboard':
+      subtrace: NoTrace
+    '#messagecounters.katip':
+      subtrace: NoTrace
+    '#messagecounters.monitoring':
+      subtrace: NoTrace
+    '#messagecounters.graylog':
+      subtrace: NoTrace
+

default.nix

@@ -60,7 +60,15 @@ in defaultNix // {
     # env will provide the dependencies of cardano-shell
     packages = ps: with ps; [ cardano-shell ];
     # This adds git to the shell, which is used by stack.
-    buildInputs = with pkgs; [ git stack commonLib.stack-hpc-coveralls pkgconfig systemd ];
+    buildInputs = with pkgs; [
+      defaultNix.nix-tools._raw.cabal-install.components.exes.cabal
+      defaultNix.nix-tools._raw.ghcid.components.exes.ghcid
+      git
+      pkgconfig
+      stack
+      commonLib.stack-hpc-coveralls
+      systemd
+    ];
   };
 
   runCoveralls = pkgs.stdenv.mkDerivation {