wip

Author: carbolymer

cardano-api/src/Cardano/Api/Internal/Address.hs

@@ -384,10 +384,10 @@ instance IsShelleyBasedEra era => FromJSON (AddressInEra era) where
           addressAny <- runParsecParser parseAddressAny txt
           pure $ anyAddressInShelleyBasedEra sbe addressAny
 
-parseAddressAny :: Parsec.Parser AddressAny
+parseAddressAny :: SerialiseAddress addr => Parsec.Parser addr
 parseAddressAny = do
   str <- lexPlausibleAddressString
-  case deserialiseAddress AsAddressAny str of
+  case deserialiseAddress (proxyToAsType Proxy) str of
     Nothing -> fail $ "invalid address: " <> Text.unpack str
     Just addr -> pure addr
 

cardano-api/src/Cardano/Api/Internal/Eras/Case.hs

@@ -150,6 +150,7 @@ caseShelleyToBabbageOrConwayEraOnwards l r = \case
   ShelleyBasedEraBabbage -> l ShelleyToBabbageEraBabbage
   ShelleyBasedEraConway -> r ConwayEraOnwardsConway
 
+{-# DEPRECATED shelleyToAlonzoEraToShelleyToBabbageEra "Use convert instead" #-}
 shelleyToAlonzoEraToShelleyToBabbageEra
   :: ()
   => ShelleyToAlonzoEra era
@@ -160,6 +161,7 @@ shelleyToAlonzoEraToShelleyToBabbageEra = \case
   ShelleyToAlonzoEraMary -> ShelleyToBabbageEraMary
   ShelleyToAlonzoEraAlonzo -> ShelleyToBabbageEraAlonzo
 
+{-# DEPRECATED alonzoEraOnwardsToMaryEraOnwards "Use convert instead" #-}
 alonzoEraOnwardsToMaryEraOnwards
   :: ()
   => AlonzoEraOnwards era
@@ -169,6 +171,7 @@ alonzoEraOnwardsToMaryEraOnwards = \case
   AlonzoEraOnwardsBabbage -> MaryEraOnwardsBabbage
   AlonzoEraOnwardsConway -> MaryEraOnwardsConway
 
+{-# DEPRECATED babbageEraOnwardsToMaryEraOnwards "Use convert instead" #-}
 babbageEraOnwardsToMaryEraOnwards
   :: ()
   => BabbageEraOnwards era
@@ -177,6 +180,7 @@ babbageEraOnwardsToMaryEraOnwards = \case
   BabbageEraOnwardsBabbage -> MaryEraOnwardsBabbage
   BabbageEraOnwardsConway -> MaryEraOnwardsConway
 
+{-# DEPRECATED babbageEraOnwardsToAlonzoEraOnwards "Use convert instead" #-}
 babbageEraOnwardsToAlonzoEraOnwards
   :: ()
   => BabbageEraOnwards era

cardano-api/src/Cardano/Api/Internal/Fees.hs

@@ -1514,6 +1514,8 @@ makeTransactionBodyAutoBalance
 -- we make no attempt to recalculate the tx fee without a change address.
 accountForNoChange :: TxOut CtxTx era -> [TxOut CtxTx era] -> [TxOut CtxTx era]
 accountForNoChange change@(TxOut _ balance _ _) rest =
+  -- TODO: shouldn't that include non-ada assets check as well?
+  -- TODO: write test for that
   case txOutValueToLovelace balance of
     L.Coin 0 -> rest
     -- We append change at the end so a client can predict the indexes

cardano-api/src/Cardano/Api/Internal/Orphans.hs

@@ -70,6 +70,7 @@ import Ouroboros.Consensus.Shelley.Eras qualified as Consensus
 import Ouroboros.Consensus.Shelley.Ledger.Block (ShelleyHash (..))
 import Ouroboros.Consensus.Shelley.Ledger.Query qualified as Consensus
 import Ouroboros.Network.Block (HeaderHash, Tip (..))
+import Ouroboros.Network.Protocol.LocalTxSubmission.Type qualified as Net.Tx
 import PlutusLedgerApi.Common qualified as P
 import PlutusLedgerApi.V2 qualified as V2
 
@@ -352,6 +353,8 @@ instance ToJSON PraosState where
       , "lastEpochBlockNonce" .= Consensus.praosStateLastEpochBlockNonce s
       ]
 
+deriving instance Show a => Show (Net.Tx.SubmitResult a)
+
 -- We wrap the individual records with Last and use Last's Semigroup instance.
 -- In this instance we take the last 'Just' value or the only 'Just' value
 instance Semigroup (Ledger.ShelleyPParams StrictMaybe era) where

cardano-api/src/Cardano/Api/Internal/Tx/Body.hs

@@ -2635,9 +2635,9 @@ fromBabbageTxOut w txdatums txout =
   resolveDatumInTx dh
     | Just d <- Map.lookup dh txdatums =
         TxOutSupplementalDatum
-          (babbageEraOnwardsToAlonzoEraOnwards w)
+          (convert w)
           (fromAlonzoData d)
-    | otherwise = TxOutDatumHash (babbageEraOnwardsToAlonzoEraOnwards w) (ScriptDataHash dh)
+    | otherwise = TxOutDatumHash (convert w) (ScriptDataHash dh)
 
 fromLedgerTxTotalCollateral
   :: ShelleyBasedEra era
@@ -3004,7 +3004,7 @@ convScriptData sbe txOuts scriptWitnesses =
                        ) <-
                        scriptWitnesses
                    ]
-         in TxBodyScriptData w datums redeemers
+         in TxBodyScriptData w datums redeemers -- TODO
     )
     sbe
 
@@ -3261,7 +3261,7 @@ makeShelleyTransactionBody
         sbe
         txbody
         scripts
-        (TxBodyScriptData AlonzoEraOnwardsAlonzo datums redeemers)
+        (TxBodyScriptData AlonzoEraOnwardsAlonzo datums redeemers) -- TODO
         txAuxData
         txScriptValidity
    where
@@ -3378,7 +3378,7 @@ makeShelleyTransactionBody
         sbe
         txbody
         scripts
-        ( TxBodyScriptData
+        ( TxBodyScriptData -- TODO
             AlonzoEraOnwardsBabbage
             datums
             redeemers
@@ -3518,7 +3518,7 @@ makeShelleyTransactionBody
         sbe
         txbody
         scripts
-        ( TxBodyScriptData
+        ( TxBodyScriptData -- TODO
             AlonzoEraOnwardsConway
             datums
             redeemers
@@ -3904,7 +3904,7 @@ collectTxBodyScriptWitnessRequirements
     } =
     obtainAlonzoScriptPurposeConstraints aEon $ do
       let sbe = shelleyBasedEra @era
-          supplementaldatums = TxScriptWitnessRequirements mempty mempty (getSupplementalDatums aEon txOuts) mempty
+          supplementaldatums = TxScriptWitnessRequirements mempty mempty (getSupplementalDatums aEon txOuts) mempty -- TODO
       txInWits <-
         first TxBodyPlutusScriptDecodeError $
           legacyWitnessToScriptRequirements aEon $