Merge remote-tracking branch 'remotes/origin/main' into consensus-det…

…ailed-status

ChangeLog.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Support node version 8 and protocol version 8.
 - Add command `consensus detailed-status` for getting detailed consensus status (from protocol
   version 6).
 - Add `raw GetConsensusDetailedStatus` that presents the detailed consensus status as JSON.

concordium-client.cabal

@@ -101,6 +101,7 @@ library
     , prettyprinter-ansi-terminal
     , proto-lens ==0.7.*
     , scientific
+    , singletons-base
     , split
     , string-interpolate
     , text

package.yaml

@@ -91,6 +91,7 @@ library:
     - string-interpolate
     - scientific
     - cookie
+    - singletons-base
 
 executables:
   concordium-client:

src/Concordium/Client/GRPC2.hs

@@ -537,6 +537,7 @@ instance FromProto Proto.AccountStakingInfo where
                         Nothing -> return NoChange
                         Just ch -> fmap timestampToUTCTime <$> fromProto ch
                 asiPoolInfo <- fromProtoMaybe $ baker ^. ProtoFields.maybe'poolInfo
+                let asiIsSuspended = baker ^. ProtoFields.isSuspended
                 return AccountStakingBaker{..}
 
 instance FromProto Proto.ArThreshold where
@@ -842,6 +843,7 @@ instance FromProto Proto.ProtocolVersion where
         Proto.PROTOCOL_VERSION_5 -> return P5
         Proto.PROTOCOL_VERSION_6 -> return P6
         Proto.PROTOCOL_VERSION_7 -> return P7
+        Proto.PROTOCOL_VERSION_8 -> return P8
         Proto.ProtocolVersion'Unrecognized _ ->
             fromProtoFail "Unable to convert 'ProtocolVersion'."
 
@@ -2270,6 +2272,12 @@ instance FromProto (Proto.AccountAddress, Proto.BakerEvent) where
                 let edrAccount = sender
                 edrDelegatorId <- fromProto $ delRemoved ^. ProtoFields.delegatorId
                 return DelegationRemoved{..}
+            ProtoFields.BakerEvent'BakerSuspended' bkrSuspended -> do
+                ebsBakerId <- fromProto $ bkrSuspended ^. ProtoFields.bakerId
+                return BakerSuspended{..}
+            ProtoFields.BakerEvent'BakerResumed' bkrResumed -> do
+                ebrBakerId <- fromProto $ bkrResumed ^. ProtoFields.bakerId
+                return BakerResumed{..}
 
 instance FromProto Proto.BlockItemStatus where
     type Output Proto.BlockItemStatus = TransactionStatus

src/Concordium/Client/Runner.hs

@@ -1145,20 +1145,14 @@ getNextPaydayTime = do
 -- | Returns the UTCTime date when the baker cooldown on reducing stake/removing a baker will end, using on chain parameters
 getBakerCooldown :: Queries.EChainParametersAndKeys -> ClientMonad IO UTCTime
 getBakerCooldown (Queries.EChainParametersAndKeys (ecpParams :: ChainParameters' cpv) _) =
-    case Types.chainParametersVersion @cpv of
-        Types.SChainParametersV0 -> do
+    case sCooldownParametersVersionFor $ Types.chainParametersVersion @cpv of
+        SCooldownParametersVersion0 -> do
             cs <- getResponseValueOrDie =<< getConsensusInfo
             let epochTime = toInteger (Time.durationMillis $ Queries.csEpochDuration cs) % 1000
             let cooldownTime = fromRational $ epochTime * ((cooldownEpochsV0 ecpParams + 2) % 1)
             currTime <- liftIO getCurrentTime
             return $ addUTCTime cooldownTime currTime
-        Types.SChainParametersV1 -> do
-            cooldownStart <- getNextPaydayTime
-            let cooldownDuration =
-                    fromIntegral . Types.durationSeconds $
-                        ecpParams ^. cpCooldownParameters . cpPoolOwnerCooldown
-            return $ addUTCTime cooldownDuration cooldownStart
-        Types.SChainParametersV2 -> do
+        SCooldownParametersVersion1 -> do
             cooldownStart <- getNextPaydayTime
             let cooldownDuration =
                     fromIntegral . Types.durationSeconds $
@@ -1171,14 +1165,10 @@ getBakerCooldown (Queries.EChainParametersAndKeys (ecpParams :: ChainParameters'
 -- | Returns the UTCTime date when the delegator cooldown on reducing stake/removing delegation will end, using on chain parameters
 getDelegatorCooldown :: Queries.EChainParametersAndKeys -> ClientMonad IO (Maybe UTCTime)
 getDelegatorCooldown (Queries.EChainParametersAndKeys (ecpParams :: ChainParameters' cpv) _) = do
-    case Types.chainParametersVersion @cpv of
-        Types.SChainParametersV0 -> do
+    case sCooldownParametersVersionFor $ Types.chainParametersVersion @cpv of
+        SCooldownParametersVersion0 -> do
             return Nothing
-        Types.SChainParametersV1 -> do
-            paydayTime <- getNextPaydayTime
-            let cooldownTime = fromIntegral . Types.durationSeconds $ ecpParams ^. cpCooldownParameters . cpDelegatorCooldown
-            return $ Just $ addUTCTime cooldownTime paydayTime
-        Types.SChainParametersV2 -> do
+        SCooldownParametersVersion1 -> do
             paydayTime <- getNextPaydayTime
             let cooldownTime = fromIntegral . Types.durationSeconds $ ecpParams ^. cpCooldownParameters . cpDelegatorCooldown
             return $ Just $ addUTCTime cooldownTime paydayTime
@@ -1434,10 +1424,9 @@ getBakerStakeThresholdOrDie = do
     case res of
         Left err -> logFatal ["Could not retrieve the validator stake threshold: " <> err]
         Right (Queries.EChainParametersAndKeys (ecpParams :: ChainParameters' cpv) _) ->
-            return $ case Types.chainParametersVersion @cpv of
-                Types.SChainParametersV0 -> ecpParams ^. cpPoolParameters . ppBakerStakeThreshold
-                Types.SChainParametersV1 -> ecpParams ^. cpPoolParameters . ppMinimumEquityCapital
-                Types.SChainParametersV2 -> ecpParams ^. cpPoolParameters . ppMinimumEquityCapital
+            return $ case sPoolParametersVersionFor $ Types.chainParametersVersion @cpv of
+                SPoolParametersVersion0 -> ecpParams ^. cpPoolParameters . ppBakerStakeThreshold
+                SPoolParametersVersion1 -> ecpParams ^. cpPoolParameters . ppMinimumEquityCapital
 
 getAccountUpdateCredentialsTransactionData ::
     -- | A file with new credentials.
@@ -3191,6 +3180,8 @@ processBakerConfigureCmd baseCfgDir verbose backend txOpts isBakerConfigure cbCa
             putStrLn ""
         let cbMetadataURL = fmap (Types.UrlText . Text.pack) metadataURL
         (bakerKeys, cbKeysWithProofs) <- readInputKeysFile baseCfg
+        -- TODO: support setting the suspend flag. Issue #326
+        let cbSuspend = Nothing
         let payload = Types.encodePayload Types.ConfigureBaker{..}
             nrgCost _ = case cbKeysWithProofs of
                 Nothing -> return . Just $ bakerConfigureEnergyCostWithoutKeys (Types.payloadSize payload)

test/SimpleClientTests/AccountSpec.hs

@@ -93,7 +93,8 @@ exampleBakerInfoResult pc =
                   _bakerSignatureVerifyKey = snd $ unsafePerformIO newKeyPair
                 },
           asiPendingChange = pc,
-          asiPoolInfo = Just exampleBakerPoolInfo
+          asiPoolInfo = Just exampleBakerPoolInfo,
+          asiIsSuspended = False
         }
 
 exampleDelegatorStakingInfo :: StakePendingChange' UTCTime -> AccountStakingInfo