Support validatorId.

Concordium · Nov 14, 2023 · 9956ea2 · 9956ea2
1 parent d2d97e4
commit 9956ea2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/Concordium/Client/Cli.hs b/src/Concordium/Client/Cli.hs
@@ -269,7 +269,7 @@ data BakerCredentials = BakerCredentials
     }
 
 instance AE.ToJSON BakerCredentials where
-    toJSON BakerCredentials{..} = object (("bakerId" .= bcIdentity) : bakerKeysToPairs bcKeys)
+    toJSON BakerCredentials{..} = object (("bakerId" .= bcIdentity) : ("validatorId" .= bcIdentity) : bakerKeysToPairs bcKeys)
 
 instance AE.FromJSON BakerKeys where
     parseJSON = withObject "Baker keys" $ \v -> do
@@ -279,7 +279,14 @@ instance AE.FromJSON BakerKeys where
         bkElectionVerifyKey <- v .: "electionVerifyKey"
         bkSigSignKey <- v .: "signatureSignKey"
         bkSigVerifyKey <- v .: "signatureVerifyKey"
-        bkBakerId <- v .:? "bakerId"
+        mbkBakerId <- v .:? "bakerId"
+        mvalidatorId <- v .:? "validatorId"
+        bkBakerId <- case (mbkBakerId, mvalidatorId) of
+                      (Just bid, Just vid) | bid == vid -> return (Just bid)
+                                           | otherwise -> fail "Both 'bakerId' and 'validatorId' are present, and different."
+                      (Just bid, Nothing) -> return (Just bid)
+                      (Nothing, Just vid) -> return (Just vid)
+                      (Nothing, Nothing) -> return Nothing
         return BakerKeys{..}
 
 bakerKeysToPairs :: BakerKeys -> [Pair]
@@ -291,7 +298,7 @@ bakerKeysToPairs v =
       "signatureSignKey" .= bkSigSignKey v,
       "signatureVerifyKey" .= bkSigVerifyKey v
     ]
-        ++ ["bakerId" .= bid | bid <- maybeToList (bkBakerId v)]
+        ++ concat [["bakerId" .= bid, "validatorId" .= bid] | bid <- maybeToList (bkBakerId v)]
 
 instance AE.ToJSON BakerKeys where
     toJSON = object . bakerKeysToPairs
@@ -303,7 +310,7 @@ bakerPublicKeysToPairs v =
       "electionVerifyKey" .= bkElectionVerifyKey v,
       "signatureVerifyKey" .= bkSigVerifyKey v
     ]
-        ++ ["bakerId" .= bid | bid <- maybeToList (bkBakerId v)]
+        ++ concat [["bakerId" .= bid, "validatorId" .= bid] | bid <- maybeToList (bkBakerId v)]
 
 -- | Hardcoded network ID.
 defaultNetId :: Int

diff --git a/src/Concordium/Client/Runner.hs b/src/Concordium/Client/Runner.hs
@@ -2981,9 +2981,9 @@ processBakerConfigureCmd baseCfgDir verbose backend txOpts isBakerConfigure cbCa
                 in  unless encrypted $
                         case inputKeysFile of
                             Nothing ->
-                                logInfo [printf "To use it add \"bakerId\": %s to the keys file." (show bakerId)]
+                                logInfo [printf "To use it add \"validatorId\": %s to the keys file." (show bakerId)]
                             Just inf ->
-                                logInfo [printf "To use it add \"bakerId\": %s to the keys file %s." (show bakerId) inf]
+                                logInfo [printf "To use it add \"validatorId\": %s to the keys file %s." (show bakerId) inf]
 
     eventsFromTransactionResult Nothing = return []
     eventsFromTransactionResult (Just result) = do
@@ -3201,7 +3201,7 @@ processBakerAddCmd baseCfgDir verbose backend txOpts abBakingStake abRestakeEarn
             _ ->
                 let encrypted = snd bakerKeys
                 in  unless encrypted $
-                        logInfo [printf "To use it add \"bakerId\": %s to the keys file %s." (show bakerId) inputKeysFile]
+                        logInfo [printf "To use it add \"validatorId\": %s to the keys file %s." (show bakerId) inputKeysFile]
 
     eventsFromTransactionResult Nothing = return []
     eventsFromTransactionResult (Just result) = do
@@ -3361,7 +3361,7 @@ processBakerSetKeysCmd baseCfgDir verbose backend txOpts inputKeysFile outputKey
             _ ->
                 let encrypted = snd bakerKeys
                 in  unless encrypted $
-                        logInfo [printf "To use it add \"bakerId\": %s to the keys file %s." (show bakerId) inputKeysFile]
+                        logInfo [printf "To use it add \"validatorId\": %s to the keys file %s." (show bakerId) inputKeysFile]
 
     eventsFromTransactionResult Nothing = return []
     eventsFromTransactionResult (Just result) = do