Merge pull request #24 from input-output-hk/jc/update-chaps-index

update chaps index
IntersectMBO · May 25, 2023 · 89fd117 · 89fd117
2 parents bc3f95f + 7c28153
commit 89fd117
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 20 deletions.
diff --git a/cabal.project b/cabal.project
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2023-05-10T10:34:57Z
-  , cardano-haskell-packages 2023-05-13T07:08:44Z
+  , cardano-haskell-packages 2023-05-24T10:41:02Z
 
 packages:
     cardano-api

diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.4
 
 name:                   cardano-api
-version:                8.1.1.1
+version:                8.2.0.0
 synopsis:               The cardano api
 description:            The cardano api.
 category:               Cardano,
@@ -128,7 +128,7 @@ library internal
                       , cardano-ledger-binary >= 1.1
                       , cardano-ledger-byron >= 1.0
                       , cardano-ledger-conway >= 1.1
-                      , cardano-ledger-core >= 1.1
+                      , cardano-ledger-core >= 1.2
                       , cardano-ledger-mary >= 1.1
                       , cardano-ledger-shelley >= 1.1.1
                       , cardano-protocol-tpraos >= 1.0.2
@@ -148,16 +148,16 @@ library internal
                       , mtl
                       , network
                       , optparse-applicative-fork
-                      , ouroboros-consensus >= 0.6
-                      , ouroboros-consensus-cardano >= 0.5
-                      , ouroboros-consensus-diffusion >= 0.5.1
+                      , ouroboros-consensus >= 0.7
+                      , ouroboros-consensus-cardano >= 0.6
+                      , ouroboros-consensus-diffusion >= 0.6
                       , ouroboros-consensus-protocol >= 0.5
                       , ouroboros-network
                       , ouroboros-network-api
                       , ouroboros-network-framework
                       , ouroboros-network-protocols
                       , parsec
-                      , plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>=1.1
+                      , plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>=1.5
                       , prettyprinter
                       , prettyprinter-configurable ^>= 1.1
                       , random
@@ -219,13 +219,14 @@ library gen
                       , base16-bytestring
                       , bytestring
                       , cardano-api
+                      , cardano-api:internal
                       , cardano-binary >= 1.6 && < 1.8
                       , cardano-crypto-class ^>= 2.1
                       , cardano-crypto-test ^>= 1.5
                       , cardano-ledger-alonzo >= 1.1
                       , cardano-ledger-alonzo-test
                       , cardano-ledger-byron-test >= 1.5
-                      , cardano-ledger-core >= 1.1
+                      , cardano-ledger-core >= 1.2
                       , cardano-ledger-shelley >= 1.1
                       , containers
                       , hedgehog
@@ -248,7 +249,7 @@ test-suite cardano-api-test
                       , cardano-crypto-tests ^>= 2.1
                       , cardano-data >= 1.0
                       , cardano-ledger-api >= 1.1
-                      , cardano-ledger-core:{cardano-ledger-core, testlib} >= 1.1
+                      , cardano-ledger-core:{cardano-ledger-core, testlib} >= 1.2
                       , cardano-ledger-shelley
                       , cardano-ledger-shelley-test >= 1.1
                       , cardano-slotting ^>= 0.1
@@ -304,8 +305,8 @@ test-suite cardano-api-golden
                       , hedgehog-extras >= 0.4.3.0
                       , hspec
                       , hw-hspec-hedgehog
-                      , plutus-core ^>= 1.1
-                      , plutus-ledger-api ^>= 1.1
+                      , plutus-core ^>= 1.5
+                      , plutus-ledger-api ^>= 1.5
                       , text
 
   ghc-options:          -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T

diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs b/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs
@@ -119,6 +119,7 @@ import           Cardano.Api hiding (txIns)
 import qualified Cardano.Api as Api
 import           Cardano.Api.Byron (KeyWitness (ByronKeyWitness),
                    WitnessNetworkIdOrByronAddress (..))
+import           Cardano.Api.Script (scriptInEraToRefScript)
 import           Cardano.Api.Shelley (GovernancePoll (..), GovernancePollAnswer (..), Hash (..),
                    KESPeriod (KESPeriod),
                    OperationalCertificateIssueCounter (OperationalCertificateIssueCounter),
@@ -512,7 +513,7 @@ genReferenceScript :: CardanoEra era -> Gen (ReferenceScript era)
 genReferenceScript era =
   case refInsScriptsAndInlineDatsSupportedInEra era of
     Nothing -> return ReferenceScriptNone
-    Just supp -> ReferenceScript supp <$> genScriptInAnyLang
+    Just _ -> scriptInEraToRefScript <$> genScriptInEra era
 
 genUTxO :: CardanoEra era -> Gen (UTxO era)
 genUTxO era =

diff --git a/cardano-api/internal/Cardano/Api/Fees.hs b/cardano-api/internal/Cardano/Api/Fees.hs
@@ -590,6 +590,8 @@ evaluateTransactionExecutionUnits systemstart epochInfo bpp utxo txbody =
           ScriptErrorEvaluationFailed err logs
         L.ValidationFailure (L.ValidationFailedV2 err logs _) ->
           ScriptErrorEvaluationFailed err logs
+        L.ValidationFailure (L.ValidationFailedV3 err logs _) ->
+          ScriptErrorEvaluationFailed err logs
         L.IncompatibleBudget _ -> ScriptErrorExecutionUnitsOverflow
 
         -- This is only possible for spending scripts and occurs when

diff --git a/cardano-api/internal/Cardano/Api/IPC.hs b/cardano-api/internal/Cardano/Api/IPC.hs
@@ -265,7 +265,8 @@ mkVersionedProtocols networkid ptcl unversionedClients =
           Net.versionedNodeToClientProtocols
             ptclVersion
             NodeToClientVersionData {
-              networkMagic = toNetworkMagic networkid
+              networkMagic = toNetworkMagic networkid,
+              query = False
             }
             (\_connid _ctl -> protocols (unversionedClients ptclVersion) ptclBlockVersion ptclVersion))
       (Map.toList (Consensus.supportedNodeToClientVersions proxy))

diff --git a/cardano-api/internal/Cardano/Api/ProtocolParameters.hs b/cardano-api/internal/Cardano/Api/ProtocolParameters.hs
@@ -809,10 +809,12 @@ fromAlonzoCostModels (Alonzo.CostModels m _ _) =
 toAlonzoScriptLanguage :: AnyPlutusScriptVersion -> Alonzo.Language
 toAlonzoScriptLanguage (AnyPlutusScriptVersion PlutusScriptV1) = Alonzo.PlutusV1
 toAlonzoScriptLanguage (AnyPlutusScriptVersion PlutusScriptV2) = Alonzo.PlutusV2
+toAlonzoScriptLanguage (AnyPlutusScriptVersion PlutusScriptV3) = Alonzo.PlutusV3
 
 fromAlonzoScriptLanguage :: Alonzo.Language -> AnyPlutusScriptVersion
 fromAlonzoScriptLanguage Alonzo.PlutusV1 = AnyPlutusScriptVersion PlutusScriptV1
 fromAlonzoScriptLanguage Alonzo.PlutusV2 = AnyPlutusScriptVersion PlutusScriptV2
+fromAlonzoScriptLanguage Alonzo.PlutusV3 = AnyPlutusScriptVersion PlutusScriptV3
 
 toAlonzoCostModel :: CostModel -> Alonzo.Language -> Either ProtocolParametersConversionError Alonzo.CostModel
 toAlonzoCostModel (CostModel m) l = first (PpceInvalidCostModel (CostModel m)) $ Alonzo.mkCostModel l m

diff --git a/cardano-api/internal/Cardano/Api/Query.hs b/cardano-api/internal/Cardano/Api/Query.hs
@@ -455,14 +455,14 @@ decodeCurrentEpochState sbe (SerialisedCurrentEpochState (Serialised ls)) =
 
 
 newtype SerialisedPoolState era
-  = SerialisedPoolState (Serialised (Shelley.PState (Core.EraCrypto (ShelleyLedgerEra era))))
+  = SerialisedPoolState (Serialised (Shelley.PState (ShelleyLedgerEra era)))
 
-newtype PoolState era = PoolState (Shelley.PState (Core.EraCrypto (ShelleyLedgerEra era)))
+newtype PoolState era = PoolState (Shelley.PState (ShelleyLedgerEra era))
 
 decodePoolState
   :: forall era. ()
   => Core.Era (ShelleyLedgerEra era)
-  => DecCBOR (Shelley.PState (Core.EraCrypto (ShelleyLedgerEra era)))
+  => DecCBOR (Shelley.PState (ShelleyLedgerEra era))
   => SerialisedPoolState era
   -> Either DecoderError (PoolState era)
 decodePoolState (SerialisedPoolState (Serialised ls)) =