Restore --cddl-format as a hidden switch to avoid breaking 3rd party …

…tooling. The restore switch has no effect
IntersectMBO · Nov 4, 2022 · bb00609 · bb00609
1 parent 6ede1be
commit bb00609
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/cardano-cli/ChangeLog.md b/cardano-cli/ChangeLog.md
@@ -7,7 +7,8 @@
 - Allow reading and writing text envelope files from pipes([PR4384](https://github.com/input-output-hk/cardano-node/pull/4384))
 - Update cardano transaction view command to render inline datums and reference inputs ([PR4089](https://github.com/input-output-hk/cardano-node/pull/4089))
 - Switch default era in cardano-cli from Alonzo to Babbage ([PR4485](https://github.com/input-output-hk/cardano-node/pull/4485))
-- Default to the ledger's CDDL format for transaction body creation by removing flags `--cddl-format` and `--cli-format` from `build` and `build-raw` ([PR 4303](https://github.com/input-output-hk/cardano-node/pull/4303))
+- For the `build` and `build-raw` commands, always use ledger's CDDL format for transaction body creation.
+  Remove the `cli-format` flag and make `--cddl-format` deprecated and hidden ([PR 4303](https://github.com/input-output-hk/cardano-node/pull/4303))
 - Allow reading signing keys from a pipe ([PR 4342](https://github.com/input-output-hk/cardano-node/pull/4342))
 
 ## 1.35.3 -- August 2022

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs b/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
@@ -718,6 +718,7 @@ pTransaction =
             <*> many pMetadataFile
             <*> optional pProtocolParamsSourceSpec
             <*> optional pUpdateProposalFile
+            <*  pOutputSerialisation -- TODO delete in the next release after 1.35.4
             <*> (OutputTxBodyOnly <$> pTxBodyFile Output <|> pCalculatePlutusScriptCost)
 
   pChangeAddress :: Parser TxOutChangeAddress
@@ -754,6 +755,7 @@ pTransaction =
                <*> many pMetadataFile
                <*> optional pProtocolParamsSourceSpec
                <*> optional pUpdateProposalFile
+               <*  pOutputSerialisation -- TODO delete in the next release after 1.35.4
                <*> pTxBodyFile Output
 
   pTransactionSign  :: Parser TransactionCmd
@@ -1754,6 +1756,14 @@ pOutputFormat =
     <> Opt.value OutputFormatBech32
     )
 
+pOutputSerialisation :: Parser ()
+pOutputSerialisation = void $
+  Opt.flag' ()
+    (  Opt.long "cddl-format"
+    <> Opt.help "Serialise in the ledger CDDL specified CBOR format."
+    <> Opt.hidden
+    )
+
 pMaybeOutputFile :: Parser (Maybe OutputFile)
 pMaybeOutputFile =
   optional $