Merge pull request #571 from IntersectMBO/cl/integrate-9.0

integrate ouroboros-consensus and ledger for 9.0
IntersectMBO · Jul 2, 2024 · 46097e3 · 46097e3
2 parents 02f2d99 + e5fb4e7
commit 46097e3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/cabal.project b/cabal.project
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2024-06-13T08:49:27Z
-  , cardano-haskell-packages 2024-06-19T09:05:06Z
+  , hackage.haskell.org 2024-06-23T23:01:13Z
+  , cardano-haskell-packages 2024-07-02T13:27:37Z
 
 packages:
     cardano-api

diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal
@@ -163,14 +163,14 @@ library internal
                       , cardano-crypto-class ^>= 2.1.2
                       , cardano-crypto-wrapper ^>= 1.5
                       , cardano-data >= 1.0
-                      , cardano-ledger-alonzo >= 1.8.1
+                      , cardano-ledger-alonzo >= 1.10
                       , cardano-ledger-allegra >= 1.5
                       , cardano-ledger-api ^>= 1.9.2
-                      , cardano-ledger-babbage >= 1.8.1
+                      , cardano-ledger-babbage >= 1.8.2
                       , cardano-ledger-binary ^>= 1.3.3
                       , cardano-ledger-byron >= 1.0.1
-                      , cardano-ledger-conway >= 1.15
-                      , cardano-ledger-core:{cardano-ledger-core, testlib} >= 1.8
+                      , cardano-ledger-conway >= 1.16
+                      , cardano-ledger-core:{cardano-ledger-core, testlib} >= 1.13.2
                       , cardano-ledger-mary >= 1.6.1
                       , cardano-ledger-shelley >= 1.12
                       , cardano-protocol-tpraos >= 1.2
@@ -194,8 +194,8 @@ library internal
                       , mtl
                       , network
                       , optparse-applicative-fork
-                      , ouroboros-consensus ^>= 0.19
-                      , ouroboros-consensus-cardano ^>= 0.17
+                      , ouroboros-consensus ^>= 0.20
+                      , ouroboros-consensus-cardano ^>= 0.18
                       , ouroboros-consensus-diffusion ^>= 0.17
                       , ouroboros-consensus-protocol ^>= 0.9.0.1
                       , ouroboros-network

diff --git a/...o-api-golden/files/golden/errors/Cardano.Api.Tx.Body.TxBodyError/TxBodyOutputNegative.txt b/...o-api-golden/files/golden/errors/Cardano.Api.Tx.Body.TxBodyError/TxBodyOutputNegative.txt
@@ -1 +1 @@
-Negative quantity (1) in transaction output: TxOutInAnyEra AllegraEra (TxOut (AddressInEra (ShelleyAddressInEra ShelleyBasedEraAllegra) (ShelleyAddress Mainnet (KeyHashObj (KeyHash "250ca83514191f9ceaccee2eb3276d5ad964e17cc31a067691e04ca8")) StakeRefNull)) (TxOutValueShelleyBased ShelleyBasedEraAllegra (Coin 1)) TxOutDatumNone ReferenceScriptNone)
+Negative quantity (1) in transaction output: TxOutInAnyEra AllegraEra (TxOut (AddressInEra (ShelleyAddressInEra ShelleyBasedEraAllegra) (ShelleyAddress Mainnet (KeyHashObj (KeyHash {unKeyHash = "250ca83514191f9ceaccee2eb3276d5ad964e17cc31a067691e04ca8"})) StakeRefNull)) (TxOutValueShelleyBased ShelleyBasedEraAllegra (Coin 1)) TxOutDatumNone ReferenceScriptNone)
diff --git a/...o-api-golden/files/golden/errors/Cardano.Api.Tx.Body.TxBodyError/TxBodyOutputOverflow.txt b/...o-api-golden/files/golden/errors/Cardano.Api.Tx.Body.TxBodyError/TxBodyOutputOverflow.txt
@@ -1 +1 @@
-Quantity too large (1 >= 2^64) in transaction output: TxOutInAnyEra AllegraEra (TxOut (AddressInEra (ShelleyAddressInEra ShelleyBasedEraAllegra) (ShelleyAddress Mainnet (KeyHashObj (KeyHash "250ca83514191f9ceaccee2eb3276d5ad964e17cc31a067691e04ca8")) StakeRefNull)) (TxOutValueShelleyBased ShelleyBasedEraAllegra (Coin 1)) TxOutDatumNone ReferenceScriptNone)
+Quantity too large (1 >= 2^64) in transaction output: TxOutInAnyEra AllegraEra (TxOut (AddressInEra (ShelleyAddressInEra ShelleyBasedEraAllegra) (ShelleyAddress Mainnet (KeyHashObj (KeyHash {unKeyHash = "250ca83514191f9ceaccee2eb3276d5ad964e17cc31a067691e04ca8"})) StakeRefNull)) (TxOutValueShelleyBased ShelleyBasedEraAllegra (Coin 1)) TxOutDatumNone ReferenceScriptNone)
diff --git a/flake.lock b/flake.lock
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Negative quantity (1) in transaction output: TxOutInAnyEra AllegraEra (TxOut (AddressInEra (ShelleyAddressInEra ShelleyBasedEraAllegra) (ShelleyAddress Mainnet (KeyHashObj (KeyHash "250ca83514191f9ceaccee2eb3276d5ad964e17cc31a067691e04ca8")) StakeRefNull)) (TxOutValueShelleyBased ShelleyBasedEraAllegra (Coin 1)) TxOutDatumNone ReferenceScriptNone)
		Negative quantity (1) in transaction output: TxOutInAnyEra AllegraEra (TxOut (AddressInEra (ShelleyAddressInEra ShelleyBasedEraAllegra) (ShelleyAddress Mainnet (KeyHashObj (KeyHash {unKeyHash = "250ca83514191f9ceaccee2eb3276d5ad964e17cc31a067691e04ca8"})) StakeRefNull)) (TxOutValueShelleyBased ShelleyBasedEraAllegra (Coin 1)) TxOutDatumNone ReferenceScriptNone)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Quantity too large (1 >= 2^64) in transaction output: TxOutInAnyEra AllegraEra (TxOut (AddressInEra (ShelleyAddressInEra ShelleyBasedEraAllegra) (ShelleyAddress Mainnet (KeyHashObj (KeyHash "250ca83514191f9ceaccee2eb3276d5ad964e17cc31a067691e04ca8")) StakeRefNull)) (TxOutValueShelleyBased ShelleyBasedEraAllegra (Coin 1)) TxOutDatumNone ReferenceScriptNone)
		Quantity too large (1 >= 2^64) in transaction output: TxOutInAnyEra AllegraEra (TxOut (AddressInEra (ShelleyAddressInEra ShelleyBasedEraAllegra) (ShelleyAddress Mainnet (KeyHashObj (KeyHash {unKeyHash = "250ca83514191f9ceaccee2eb3276d5ad964e17cc31a067691e04ca8"})) StakeRefNull)) (TxOutValueShelleyBased ShelleyBasedEraAllegra (Coin 1)) TxOutDatumNone ReferenceScriptNone)