Merge with propagate Dikstra

cardano-api/cardano-api.cabal

@@ -296,6 +296,7 @@ library gen
     Test.Gen.Cardano.Api.Era
     Test.Gen.Cardano.Api.Hardcoded
     Test.Gen.Cardano.Api.Metadata
+    Test.Gen.Cardano.Api.Orphans
     Test.Gen.Cardano.Api.ProtocolParameters
     Test.Gen.Cardano.Api.Typed
     Test.Gen.Cardano.Crypto.Seed
@@ -316,9 +317,11 @@ library gen
     cardano-ledger-byron-test >=1.5,
     cardano-ledger-conway:testlib,
     cardano-ledger-core:{cardano-ledger-core, testlib} >=1.14,
+    cardano-ledger-dijkstra >=0.1,
     cardano-ledger-shelley >=1.13,
     containers,
     filepath,
+    generic-random,
     hedgehog >=1.1,
     hedgehog-extras,
     hedgehog-quickcheck,

cardano-api/src/Cardano/Api/Experimental/Tx/Internal/Certificate.hs

@@ -15,8 +15,8 @@ where
 
 import Cardano.Api.Address qualified as Api
 import Cardano.Api.Certificate.Internal qualified as Api
+import Cardano.Api.Era.Internal.Core (DijkstraEra)
 import Cardano.Api.Era.Internal.Eon.Convert
-import Cardano.Api.Era.Internal.Eon.ConwayEraOnwards
 import Cardano.Api.Era.Internal.Eon.ShelleyToBabbageEra qualified as Api
 import Cardano.Api.Experimental.Era
 import Cardano.Api.Experimental.Plutus.Internal.Script qualified as Exp
@@ -45,13 +45,18 @@ deriving instance Eq (Certificate era)
 deriving instance Ord (Certificate era)
 
 convertToOldApiCertificate :: Era era -> Certificate (LedgerEra era) -> Api.Certificate era
-convertToOldApiCertificate ConwayEra (Certificate cert) =
-  Api.ConwayCertificate ConwayEraOnwardsConway cert
+convertToOldApiCertificate e (Certificate cert) =
+  obtainCommonConstraints e $ Api.ConwayCertificate (convert e) cert
 
 convertToNewCertificate :: Era era -> Api.Certificate era -> Certificate (LedgerEra era)
-convertToNewCertificate ConwayEra (Api.ConwayCertificate _ cert) = Certificate cert
-convertToNewCertificate ConwayEra (Api.ShelleyRelatedCertificate sToBab _) =
-  case sToBab :: Api.ShelleyToBabbageEra ConwayEra of {}
+convertToNewCertificate era (Api.ConwayCertificate _ cert) =
+  case era of
+    ConwayEra -> Certificate cert
+    DijkstraEra -> Certificate cert
+convertToNewCertificate era (Api.ShelleyRelatedCertificate sToBab _) =
+  case era of
+    ConwayEra -> case sToBab :: Api.ShelleyToBabbageEra ConwayEra of {}
+    DijkstraEra -> case sToBab :: Api.ShelleyToBabbageEra DijkstraEra of {}
 
 mkTxCertificates
   :: forall era
@@ -61,29 +66,29 @@ mkTxCertificates
 mkTxCertificates [] = TxCertificatesNone
 mkTxCertificates certs =
   TxCertificates (convert useEra) $ fromList $ map (getStakeCred useEra) certs
- where
-  getStakeCred
-    :: Era era
-    -> (Certificate (LedgerEra era), AnyWitness (LedgerEra era))
-    -> ( Api.Certificate era
-       , Api.BuildTxWith
-           Api.BuildTx
-           (Maybe (Api.StakeCredential, Api.Witness Api.WitCtxStake era))
-       )
-  getStakeCred era (Certificate cert, witness) =
-    case era of
-      ConwayEra -> do
-        let oldApiCert = Api.ConwayCertificate (convert era) cert
-            mStakeCred = Api.selectStakeCredentialWitness oldApiCert
-            wit =
-              case witness of
-                AnyKeyWitnessPlaceholder -> Api.KeyWitness Api.KeyWitnessForStakeAddr
-                AnySimpleScriptWitness ss ->
-                  Api.ScriptWitness Api.ScriptWitnessForStakeAddr $ newToOldSimpleScriptWitness era ss
-                AnyPlutusScriptWitness psw ->
-                  Api.ScriptWitness Api.ScriptWitnessForStakeAddr $
-                    newToOldPlutusCertificateScriptWitness ConwayEra psw
-        (oldApiCert, pure $ (,wit) <$> mStakeCred)
+
+getStakeCred
+  :: Era era
+  -> (Certificate (LedgerEra era), AnyWitness (LedgerEra era))
+  -> ( Api.Certificate era
+     , Api.BuildTxWith
+         Api.BuildTx
+         (Maybe (Api.StakeCredential, Api.Witness Api.WitCtxStake era))
+     )
+getStakeCred e (Certificate cert, witness) = do
+  let oldApiCert = obtainCommonConstraints e $ Api.ConwayCertificate (convert e) cert
+      mStakeCred = Api.selectStakeCredentialWitness oldApiCert
+      wit =
+        case witness of
+          AnyKeyWitnessPlaceholder -> Api.KeyWitness Api.KeyWitnessForStakeAddr
+          AnySimpleScriptWitness ss ->
+            Api.ScriptWitness Api.ScriptWitnessForStakeAddr $
+              obtainCommonConstraints e $
+                newToOldSimpleScriptWitness e ss
+          AnyPlutusScriptWitness psw ->
+            Api.ScriptWitness Api.ScriptWitnessForStakeAddr $
+              newToOldPlutusCertificateScriptWitness e psw
+  (oldApiCert, pure $ (,wit) <$> mStakeCred)
 
 newToOldSimpleScriptWitness
   :: L.AllegraEraScript (LedgerEra era)
@@ -127,12 +132,40 @@ newToOldPlutusCertificateScriptWitness ConwayEra (Exp.PlutusScriptWitness Plutus
     Api.NoScriptDatumForStake
     redeemer
     execUnits
+newToOldPlutusCertificateScriptWitness ConwayEra (Exp.PlutusScriptWitness Plutus.SPlutusV4 _scriptOrRef _ _redeemer _execUnits) =
+  error "dijkstra"
+newToOldPlutusCertificateScriptWitness DijkstraEra (Exp.PlutusScriptWitness Plutus.SPlutusV1 scriptOrRef _ redeemer execUnits) =
+  Api.PlutusScriptWitness
+    Api.PlutusScriptV1InDijkstra
+    Api.PlutusScriptV1
+    (newToOldPlutusScriptOrReferenceInput DijkstraEra scriptOrRef)
+    Api.NoScriptDatumForStake
+    redeemer
+    execUnits
+newToOldPlutusCertificateScriptWitness DijkstraEra (Exp.PlutusScriptWitness Plutus.SPlutusV2 scriptOrRef _ redeemer execUnits) =
+  Api.PlutusScriptWitness
+    Api.PlutusScriptV2InDijkstra
+    Api.PlutusScriptV2
+    (newToOldPlutusScriptOrReferenceInput DijkstraEra scriptOrRef)
+    Api.NoScriptDatumForStake
+    redeemer
+    execUnits
+newToOldPlutusCertificateScriptWitness DijkstraEra (Exp.PlutusScriptWitness Plutus.SPlutusV3 scriptOrRef _ redeemer execUnits) =
+  Api.PlutusScriptWitness
+    Api.PlutusScriptV3InDijkstra
+    Api.PlutusScriptV3
+    (newToOldPlutusScriptOrReferenceInput DijkstraEra scriptOrRef)
+    Api.NoScriptDatumForStake
+    redeemer
+    execUnits
+newToOldPlutusCertificateScriptWitness DijkstraEra (Exp.PlutusScriptWitness Plutus.SPlutusV4 _scriptOrRef _ _redeemer _execUnits) =
+  error "dijkstra"
 
 newToOldPlutusScriptOrReferenceInput
   :: Era era
   -> Exp.PlutusScriptOrReferenceInput lang (LedgerEra era)
   -> Api.PlutusScriptOrReferenceInput oldlang
-newToOldPlutusScriptOrReferenceInput ConwayEra (Exp.PReferenceScript txin) = Api.PReferenceScript txin
-newToOldPlutusScriptOrReferenceInput ConwayEra (Exp.PScript (Exp.PlutusScriptInEra plutusRunnable)) =
+newToOldPlutusScriptOrReferenceInput _ (Exp.PReferenceScript txin) = Api.PReferenceScript txin
+newToOldPlutusScriptOrReferenceInput _ (Exp.PScript (Exp.PlutusScriptInEra plutusRunnable)) =
   let oldScript = L.unPlutusBinary . L.plutusBinary $ L.plutusFromRunnable plutusRunnable
    in Api.PScript $ Api.PlutusScriptSerialised oldScript

cardano-api/src/Cardano/Api/LedgerState/Internal/LedgerEvent.hs

@@ -20,6 +20,7 @@ import Cardano.Api.Key.Internal (Hash (..), StakePoolKey)
 
 import Cardano.Ledger.Coin qualified as L
 import Cardano.Ledger.Coin qualified as Ledger
+import Cardano.Ledger.Compactible qualified as Ledger
 import Cardano.Ledger.Conway.Governance qualified as Ledger
 import Cardano.Ledger.Core qualified as Ledger.Core
 import Cardano.Ledger.Credential qualified as Ledger
@@ -110,8 +111,9 @@ data PoolReapDetails = PoolReapDetails
 convertRetiredPoolsMap
   :: Map
        Ledger.StakeCredential
-       (Map (Ledger.KeyHash Ledger.StakePool) Ledger.Coin)
+       (Map (Ledger.KeyHash Ledger.StakePool) (Ledger.CompactForm Ledger.Coin))
   -> Map StakeCredential (Map (Hash StakePoolKey) L.Coin)
 convertRetiredPoolsMap =
   Map.mapKeys fromShelleyStakeCredential
     . fmap (Map.mapKeys StakePoolKeyHash)
+    . (fmap . fmap) Ledger.fromCompact

cardano-api/src/Cardano/Api/Network/IPC/Internal.hs

@@ -132,6 +132,7 @@ import Data.ByteString.Lazy qualified as LBS
 import Data.Void (Void)
 import GHC.Exts (IsList (..))
 import Network.Mux qualified as Net
+import Network.Mux.Trace (nullTracers)
 
 -- ----------------------------------------------------------------------------
 -- The types for the client side of the node-to-client IPC protocols
@@ -211,7 +212,7 @@ connectToLocalNodeWithVersion
         Net.connectTo
           (Net.localSnocket iomgr)
           Net.NetworkConnectTracers
-            { Net.nctMuxTracer = nullTracer
+            { Net.nctMuxTracers = nullTracers
             , Net.nctHandshakeTracer = nullTracer
             }
           versionedProtocls

cardano-api/test/cardano-api-test/Test/Cardano/Api/CBOR.hs

@@ -77,6 +77,7 @@ prop_txbody_backwards_compatibility = H.property $ do
         ShelleyBasedEraAlonzo -> "Tx AlonzoEra"
         ShelleyBasedEraBabbage -> "Tx BabbageEra"
         ShelleyBasedEraConway -> "Tx ConwayEra"
+        ShelleyBasedEraDijkstra -> "Tx DijkstraEra"
 
 prop_text_envelope_roundtrip_txbody_CBOR :: Property
 prop_text_envelope_roundtrip_txbody_CBOR = H.property $ do