Core: + coPBftSigThd; optionalise coStaticKeySigningKeyFile & coStaticKey (#234)

* Core:  + coPBftSigThd; optionalise coStaticKeySigningKeyFile & coStaticKeyDlgCertFile

* Fix formatting and use existing functions for the CLI.

Author: deepfire

src/Cardano/Shell/Configuration/Lib.hs

@@ -98,6 +98,8 @@ finaliseCardanoConfiguration PartialCardanoConfiguration{..} = do
         coRequiresNetworkMagic      <- lastToEither "Unspecified coRequiresNetworkMagic"    pcoRequiresNetworkMagic
         coDBSerializeVersion        <- lastToEither "Unspecified coDBSerializeVersion"      pcoDBSerializeVersion
 
+        coPBftSigThd                <- lastToEither "Unspecified coPBftSigThd"              pcoPBftSigThd
+
         pure Core{..}
 
 
@@ -241,7 +243,6 @@ finaliseCardanoConfiguration PartialCardanoConfiguration{..} = do
 
         pure Wallet {..}
 
-
 -- | Generate 'TopologyConfig' with given 'Cluster'
 mkTopology :: Cluster -> IO TopologyConfig
 mkTopology cluster = input auto topologyPath

src/Cardano/Shell/Constants/CLI.hs

@@ -116,18 +116,26 @@ configCoreCLIParser = PartialCore
           <> metavar "GENESIS-HASH"
           <> help "The genesis hash value."
            )
-    <*> lastStrOption
+    <*> (Just <<$>> lastStrOption
            ( long "signing-key"
           <> metavar "FILEPATH"
           <> help "Path to the signing key."
            )
-    <*> lastStrOption
+        )
+    <*> (Just <<$>> lastStrOption
            ( long "delegation-certificate"
           <> metavar "FILEPATH"
           <> help "Path to the delegation certificate."
            )
+        )
     <*> lastOption configNetworkMagicCLIParser
     <*> lastOption configDBVersionCLIParser
+    <*> (Just <<$>> lastDoubleOption
+           ( long "pbft-signature-threshold"
+          <> metavar "DOUBLE"
+          <> help "The PBFT signature threshold."
+           )
+        )
   where
     -- | Parser for the network magic options.
     configNetworkMagicCLIParser :: Parser RequireNetworkMagic

src/Cardano/Shell/Constants/PartialTypes.hs

@@ -49,17 +49,12 @@ data PartialCardanoConfiguration = PartialCardanoConfiguration
 -- | Partial @Core@ configuration.
 data PartialCore = PartialCore
     { pcoGenesisFile                :: !(Last FilePath)
-    -- ^ Genesis source file JSON.
     , pcoGenesisHash                :: !(Last Text)
-    -- ^ Genesis previous block hash.
-    , pcoStaticKeySigningKeyFile    :: !(Last FilePath)
-    -- ^ Static key signing file.
-    , pcoStaticKeyDlgCertFile       :: !(Last FilePath)
-    -- ^ Static key delegation certificate.
+    , pcoStaticKeySigningKeyFile    :: !(Last (Maybe FilePath))
+    , pcoStaticKeyDlgCertFile       :: !(Last (Maybe FilePath))
     , pcoRequiresNetworkMagic       :: !(Last RequireNetworkMagic)
-    -- ^ Do we require the network byte indicator for mainnet, testnet or staging?
     , pcoDBSerializeVersion         :: !(Last Integer)
-    -- ^ Versioning for values in node's DB.
+    , pcoPBftSigThd                 :: !(Last (Maybe Double))
     } deriving (Eq, Show, Generic)
     deriving Semigroup via GenericSemigroup PartialCore
     deriving Monoid    via GenericMonoid PartialCore

src/Cardano/Shell/Constants/Types.hs

@@ -82,14 +82,16 @@ data Core = Core
     -- ^ Genesis source file JSON.
     , coGenesisHash                 :: !Text
     -- ^ Genesis previous block hash.
-    , coStaticKeySigningKeyFile     :: !FilePath
+    , coStaticKeySigningKeyFile     :: !(Maybe FilePath)
     -- ^ Static key signing file.
-    , coStaticKeyDlgCertFile        :: !FilePath
+    , coStaticKeyDlgCertFile        :: !(Maybe FilePath)
     -- ^ Static key delegation certificate.
     , coRequiresNetworkMagic        :: !RequireNetworkMagic
     -- ^ Do we require the network byte indicator for mainnet, testnet or staging?
     , coDBSerializeVersion          :: !Integer
     -- ^ Versioning for values in node's DB.
+    , coPBftSigThd                  :: !(Maybe Double)
+    -- ^ PBFT signature threshold system parameters
     } deriving (Eq, Show, Generic)
 
 data Spec = Spec

src/Cardano/Shell/Presets.hs

@@ -34,10 +34,11 @@ mainnetConfiguration =
         PartialCore
           { pcoGenesisFile              = pure "mainnet-genesis.json"
           , pcoGenesisHash              = pure "89d9b5a5b8ddc8d7e5a6795e9774d97faf1efea59b2caf7eaf9f8c5b32059df4"
-          , pcoStaticKeySigningKeyFile  = pure "TEST"
-          , pcoStaticKeyDlgCertFile     = pure "TEST"
+          , pcoStaticKeySigningKeyFile  = pure Nothing
+          , pcoStaticKeyDlgCertFile     = pure Nothing
           , pcoRequiresNetworkMagic     = pure RequireNetworkMagic
           , pcoDBSerializeVersion       = pure 0
+          , pcoPBftSigThd               = pure Nothing
           }
     , pccNTP =
         PartialNTP
@@ -151,10 +152,11 @@ devConfiguration =
         PartialCore
           { pcoGenesisFile              = pure "testnet-genesis.json"
           , pcoGenesisHash              = pure "7f141ea26e189c9cb09e2473f6499561011d5d3c90dd642fde859ce02282a3ae"
-          , pcoStaticKeySigningKeyFile  = mempty
-          , pcoStaticKeyDlgCertFile     = mempty
+          , pcoStaticKeySigningKeyFile  = pure Nothing
+          , pcoStaticKeyDlgCertFile     = pure Nothing
           , pcoRequiresNetworkMagic     = pure RequireNetworkMagic
           , pcoDBSerializeVersion       = pure 0
+          , pcoPBftSigThd               = pure Nothing
           }
     , pccNTP =
         PartialNTP