Add CLI parser for new multi-asset tx output value format

IntersectMBO · Nov 30, 2020 · 1b5494b · 1b5494b
1 parent 9059a7b
commit 1b5494b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs b/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
@@ -20,6 +20,8 @@ import           Cardano.Api.Protocol (Protocol (..))
 import           Cardano.Api.Typed hiding (PoolId)
 
 import           Cardano.Chain.Slotting (EpochSlots (..))
+import           Cardano.CLI.Mary.TxOutParser (renderTxOutAnyEraParseError, stringToTxOutAnyEra)
+import           Cardano.CLI.Mary.ValueParser (renderValueParseError, stringToValue)
 import           Cardano.CLI.Shelley.Commands
 import           Cardano.CLI.Shelley.Key (InputFormat (..), VerificationKeyOrFile (..),
                      VerificationKeyOrHashOrFile (..), VerificationKeyTextOrFile (..),
@@ -1551,22 +1553,18 @@ parseTxIx = toEnum <$> Atto.decimal
 
 pTxOut :: Parser TxOutAnyEra
 pTxOut =
-  Opt.option (readerFromAttoParser parseTxOut)
-    (  Opt.long "tx-out"
-    <> Opt.metavar "TX-OUT"
-    <> Opt.help "The transaction output as Address+Lovelace where Address is \
-                \the Bech32-encoded address followed by the amount in \
-                \Lovelace."
-    )
+    Opt.option (eitherReader readTxOut)
+      (  Opt.long "tx-out"
+      <> Opt.metavar "TX-OUT"
+      -- TODO: Update the help text to describe the new syntax as well.
+      <> Opt.help "The transaction output as Address+Lovelace where Address is \
+                  \the Bech32-encoded address followed by the amount in \
+                  \Lovelace."
+      )
   where
-    parseTxOut :: Atto.Parser TxOutAnyEra
-    parseTxOut =
-      TxOutAnyEra <$> parseAddressAny
-                  <*  Atto.char '+'
-                  <*> pAdaOnlyValue
-
-pAdaOnlyValue :: Atto.Parser Value
-pAdaOnlyValue = lovelaceToValue <$> parseLovelace
+    readTxOut :: String -> Either String TxOutAnyEra
+    readTxOut =
+      first (Text.unpack . renderTxOutAnyEraParseError) . stringToTxOutAnyEra
 
 pMintMultiAsset :: Parser Value
 pMintMultiAsset =
@@ -1578,7 +1576,7 @@ pMintMultiAsset =
       )
 
 readValue :: String -> Either String Value
-readValue _maCliSyntax = Left "Need 2072 for MA cli syntax parser"
+readValue = first (Text.unpack . renderValueParseError) . stringToValue
 
 pTxLowerBound :: Parser SlotNo
 pTxLowerBound =

diff --git a/cardano-cli/src/Cardano/CLI/Types.hs b/cardano-cli/src/Cardano/CLI/Types.hs
@@ -106,4 +106,3 @@ withCardanoEra UseMaryEra    f = f MaryEra
 --
 data TxOutAnyEra = TxOutAnyEra AddressAny Value
   deriving (Eq, Show)
-