Address review comments: fix pLovelaceCoin and align babbageDatumFields

- pLovelaceCoin: parse lovelace as Integer; reject negatives with a clear error
- babbageDatumFields TxOutDatumByValue: convert to ledger data first then hash,
  matching alonzoDatumFields pattern and avoiding a redundant toAlonzoData call

Author: Jimbo4350

cardano-cli/src/Cardano/CLI/Byron/Parser.hs

@@ -285,7 +285,11 @@ parseTxIxAtto = toEnum <$> Atto.decimal
 parseTxOut :: Parser (Address ByronAddr, L.Coin)
 parseTxOut =
   Opt.option
-    ((\(addr, lovelace) -> (parseByronAddr addr, pLovelaceCoin lovelace)) <$> auto)
+    ( do
+        (addr, lovelace) <- auto
+        coin <- pLovelaceCoin lovelace
+        pure (parseByronAddr addr, coin)
+    )
     $ long "txout"
       <> metavar "'(\"ADDR\", LOVELACE)'"
       <> help "Specify a transaction output, as a pair of an address and lovelace."
@@ -296,11 +300,10 @@ parseTxOut =
       Left err -> error $ "Bad Base58 address: " <> show err
       Right byronAddress -> ByronAddress byronAddress
 
-  pLovelaceCoin :: Word64 -> L.Coin
-  pLovelaceCoin l =
-    if l > (maxBound :: Word64)
-      then error $ show l <> " lovelace exceeds the Word64 upper bound"
-      else L.Coin $ toInteger l
+  pLovelaceCoin :: Integer -> Opt.ReadM L.Coin
+  pLovelaceCoin l
+    | l < 0 = Opt.readerError $ show l <> " lovelace is negative"
+    | otherwise = pure $ L.Coin l
 
 readerFromAttoParser :: Atto.Parser a -> Opt.ReadM a
 readerFromAttoParser p =

cardano-cli/src/Cardano/CLI/Compatible/Transaction/TxOut.hs

@@ -113,8 +113,9 @@ babbageDatumFields = \case
     pure (L.DatumHash (unScriptDataHash (hashScriptDataBytes sData)), mempty)
   TxOutDatumByValue sDataOrFile -> do
     sData <- fromExceptTCli $ readScriptDataOrFile sDataOrFile
-    let dh = unScriptDataHash (hashScriptDataBytes sData)
-    pure (L.DatumHash dh, Map.singleton dh (toAlonzoData sData))
+    let ld = toAlonzoData sData
+        dh = L.hashData ld
+    pure (L.DatumHash dh, Map.singleton dh ld)
   TxOutInlineDatumByValue sDataOrFile -> do
     sData <- fromExceptTCli $ readScriptDataOrFile sDataOrFile
     pure (scriptDataToInlineDatum sData, mempty)