Rebase fixes

Author: Jimbo4350

cabal.project

@@ -71,5 +71,5 @@ if impl (ghc >= 9.12)
 source-repository-package
    type:     git
    location: https://github.com/IntersectMBO/cardano-api.git
-   tag:      4c87da5cda224ca4e1fef84bacd47ab66736e359
+   tag:      2e87bfdcbf20f50fca57a6bc830b029f2e34f0cb
    subdir:   cardano-api

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs

@@ -702,15 +702,8 @@ runTransactionBuildRawCmd
           proposals
           currentTreasuryValueAndDonation
 
-<<<<<<< HEAD
-    let Exp.SignedTx tx = Exp.signTx eon [] [] txBody
-        -- TODO: Create equivalent write text envelope functions for
-        -- SignedTx
-        noWitTx = ShelleyTx (convert eon) tx
-=======
     let Exp.UnsignedTx lTx = txBody
         noWitTx = ShelleyTx (convert eon) lTx
->>>>>>> 84aa45342 (Resolve runTransactionBuildRawCmd)
     fromEitherIOCli $
       if isCborOutCanonical == TxCborCanonical
         then writeTxFileTextEnvelopeCanonical (convert Exp.useEra) txBodyOutFile noWitTx

cardano-cli/src/Cardano/CLI/Type/Error/TxCmdError.hs

@@ -82,6 +82,8 @@ instance Error TxCmdError where
 
 renderTxCmdError :: TxCmdError -> Doc ann
 renderTxCmdError = \case
+  TxCmdCBORDecodeError decErr ->
+    prettyError decErr
   TxCmdReadWitnessSigningDataError witSignDataErr ->
     renderReadWitnessSigningDataError witSignDataErr
   TxCmdWriteFileError fileErr ->