Bump cardano-api & ouroboros-consensus (temporary)

cabal.project

@@ -43,3 +43,22 @@ write-ghc-environment-files: always
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-api.git
+  tag: e9b768ff0ae1298c84b9f7474b47377773bf9b7c
+  subdir:
+    cardano-api
+  --sha256: sha256-QieoQCTBSJVxCM71YXnqNTKxXWWMepJ6BmpoqgoiCGU=
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/ouroboros-consensus.git
+  tag: ac8a4c0b34385e05616cc53212cad85bbe7ea415
+  subdir:
+    ouroboros-consensus
+    ouroboros-consensus-cardano
+    ouroboros-consensus-diffusion
+    ouroboros-consensus-protocol
+  --sha256: sha256-e5VtDfrSmrAMfpUNdXuLiaTE3p75cRF8EVjtM7oSntY=

cardano-cli/cardano-cli.cabal

@@ -202,7 +202,7 @@ library
                       , binary
                       , bytestring
                       , canonical-json
-                      , cardano-api ^>= 8.31.0.0
+                      , cardano-api ^>= 8.30.0.0
                       , cardano-binary
                       , cardano-crypto
                       , cardano-crypto-class ^>= 2.1.2

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

@@ -293,7 +293,7 @@ parseTxOut =
   pLovelaceTxOut l =
     if l > (maxBound :: Word64)
       then error $ show l <> " lovelace exceeds the Word64 upper bound"
-      else TxOutValueByron ByronEraOnlyByron . Lovelace $ toInteger l
+      else TxOutAdaOnly ByronToAllegraEraByron . Lovelace $ toInteger l
 
 readerFromAttoParser :: Atto.Parser a -> Opt.ReadM a
 readerFromAttoParser p =

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

@@ -1050,8 +1050,8 @@ printUtxo sbe txInOutTuple =
 
   printableValue :: TxOutValue era -> Text
   printableValue = \case
-    TxOutValueByron _ (Lovelace i) -> Text.pack $ show i
-    TxOutValueShelleyBased sbe2 val -> renderValue $ Api.fromLedgerValue sbe2 val
+    TxOutAdaOnly _ (Lovelace i) -> Text.pack $ show i
+    TxOutValue _ val -> renderValue val
 
 runQueryStakePoolsCmd :: ()
   => Cmd.QueryStakePoolsCmdArgs

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

@@ -690,29 +690,18 @@ toAddressInAnyEra era addrAny = runExcept $ do
       pure (AddressInEra (ShelleyAddressInEra sbe) sAddr)
 
 
-lovelaceToCoin :: Lovelace -> Ledger.Coin
-lovelaceToCoin (Lovelace ll) = Ledger.Coin ll
-
 toTxOutValueInAnyEra
   :: CardanoEra era
   -> Value
   -> Either TxCmdError (TxOutValue era)
 toTxOutValueInAnyEra era val =
-  caseByronOrShelleyBasedEra
+  caseByronToAllegraOrMaryEraOnwards
     (\w ->
       case valueToLovelace val of
-        Just l  -> return (TxOutValueByron w l)
+        Just l  -> return (TxOutAdaOnly w l)
         Nothing -> txFeatureMismatchPure era TxFeatureMultiAssetOutputs
     )
-    (\sbe ->
-      caseShelleyToAllegraOrMaryEraOnwards
-        (\_ -> case valueToLovelace val of
-          Just l  -> return (TxOutValueShelleyBased sbe $ lovelaceToCoin l)
-          Nothing -> txFeatureMismatchPure era TxFeatureMultiAssetOutputs
-        )
-        (\w -> return (TxOutValueShelleyBased sbe (toLedgerValue w val))
-        )
-        sbe
+    (\w -> return (TxOutValue w val)
     )
     era
 

cardano-cli/src/Cardano/CLI/Json/Friendly.hs

@@ -562,21 +562,15 @@ friendlyLovelace (Shelley.Coin value) = String $ textShow value <> " Lovelace"
 friendlyMintValue :: TxMintValue ViewTx era -> Aeson.Value
 friendlyMintValue = \case
   TxMintNone -> Null
-  TxMintValue sbe v _ -> friendlyValue (maryEraOnwardsToShelleyBasedEra sbe) v
+  TxMintValue sbe v _ -> friendlyValue sbe v
 
 friendlyTxOutValue :: TxOutValue era -> Aeson.Value
 friendlyTxOutValue = \case
-  TxOutValueByron _ lovelace -> friendlyLovelace $ toShelleyLovelace lovelace
-  TxOutValueShelleyBased sbe v -> friendlyLedgerValue sbe v
-
-friendlyLedgerValue :: ()
-  => ShelleyBasedEra era
-  -> Ledger.Value (ShelleyLedgerEra era)
-  -> Aeson.Value
-friendlyLedgerValue sbe v = friendlyValue sbe $ Api.fromLedgerValue sbe v
+  TxOutAdaOnly _ lovelace -> friendlyLovelace $ toShelleyLovelace lovelace
+  TxOutValue sbe v -> friendlyValue sbe v
 
 friendlyValue :: ()
-  => ShelleyBasedEra era
+  => MaryEraOnwards era
   -> Api.Value
   -> Aeson.Value
 friendlyValue _ v =