From 88c5fefc1f2e0a5e20ca14b4781910b0bb8a8806 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Tue, 6 Aug 2024 14:37:59 -0400 Subject: [PATCH] Bump CHaP --- cabal.project | 61 +++++++++++++++---- cardano-api/cardano-api.cabal | 12 ++-- .../internal/Cardano/Api/LedgerState.hs | 8 --- flake.lock | 6 +- 4 files changed, 59 insertions(+), 28 deletions(-) diff --git a/cabal.project b/cabal.project index b153a635a..15b1b9b53 100644 --- 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 2024-07-30T01:49:10Z - , cardano-haskell-packages 2024-07-30T02:20:18Z + , cardano-haskell-packages 2024-08-07T16:54:05Z packages: cardano-api @@ -45,17 +45,56 @@ test-show-details: direct -- Always write GHC env files, because they are needed for ghci. write-ghc-environment-files: always -constraints: - , plutus-ledger-api ^>= 1.31 - -allow-newer: - -- These are required due to the above. - , cardano-ledger-alonzo:plutus-ledger-api - , cardano-ledger-alonzo-test:plutus-ledger-api - , cardano-ledger-babbage:plutus-ledger-api - , cardano-ledger-binary:plutus-ledger-api - , cardano-ledger-conway:plutus-ledger-api -- 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/IntersectMBO/plutus.git + tag: 6df3318bc7b5d5ed465bc638d81b9f8a14e1cbf1 + --sha256: sha256-D8n3prn/8ACy5K6sPcipO4mmdMvpKEsEojCmdOTUs74= + subdir: plutus-ledger-api + plutus-core + prettyprinter-configurable + +source-repository-package + type: git + location:https://github.com/IntersectMBO/cardano-ledger.git + tag: 98a9c7fd491ed3174d98cc6391aa30022d60de66 + --sha256: sha256-+C8sqCKaA3iJMiIZ/KaTpeyafGgP67PtSZ98UpZthOo= + subdir: eras/allegra/impl + eras/alonzo/impl + eras/alonzo/test-suite + eras/babbage/impl + eras/babbage/test-suite + eras/conway/impl + eras/conway/test-suite + eras/mary/impl + eras/shelley/impl + eras/shelley/test-suite + eras/shelley-ma/test-suite + libs/cardano-ledger-api + libs/cardano-ledger-core + libs/cardano-ledger-binary + libs/cardano-protocol-tpraos + libs/non-integral + libs/small-steps + libs/cardano-data + libs/set-algebra + libs/vector-map + + +source-repository-package + type: git + location:https://github.com/IntersectMBO/ouroboros-consensus.git + tag: 4071356594a05ac4c3b6fba0cab066c0ed0ec276 + --sha256: sha256-Y7vbKSWF+QR9OVweo3NBLHKl7SWmthIPAZZycEoICbI= + subdir: ouroboros-consensus + ouroboros-consensus-cardano + ouroboros-consensus-protocol + ouroboros-consensus-diffusion + sop-extras + strict-sop-core \ No newline at end of file diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal index 3e46a927f..f8f19f216 100644 --- a/cardano-api/cardano-api.cabal +++ b/cardano-api/cardano-api.cabal @@ -169,10 +169,10 @@ library internal cardano-ledger-alonzo >=1.10, cardano-ledger-api ^>=1.9.2, cardano-ledger-babbage >=1.8.2, - cardano-ledger-binary ^>=1.3.3, + cardano-ledger-binary ^>=1.3, cardano-ledger-byron >=1.0.1, cardano-ledger-conway >=1.16, - cardano-ledger-core:{cardano-ledger-core, testlib} >=1.13.2, + cardano-ledger-core:{cardano-ledger-core, testlib} >=1.14.1, cardano-ledger-mary >=1.6.1, cardano-ledger-shelley >=1.12, cardano-protocol-tpraos >=1.2, @@ -205,10 +205,10 @@ library internal ouroboros-network-framework, ouroboros-network-protocols, parsec, - plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>=1.31, + plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>=1.32, prettyprinter, prettyprinter-ansi-terminal, - prettyprinter-configurable ^>=1.31, + prettyprinter-configurable ^>=1.32, random, safe-exceptions, scientific, @@ -393,8 +393,8 @@ test-suite cardano-api-golden hedgehog-extras ^>=0.6.1.0, microlens, parsec, - plutus-core ^>=1.31, - plutus-ledger-api ^>=1.31, + plutus-core ^>=1.32, + plutus-ledger-api ^>=1.32, tasty, tasty-hedgehog, text, diff --git a/cardano-api/internal/Cardano/Api/LedgerState.hs b/cardano-api/internal/Cardano/Api/LedgerState.hs index d424d11b9..e905465f1 100644 --- a/cardano-api/internal/Cardano/Api/LedgerState.hs +++ b/cardano-api/internal/Cardano/Api/LedgerState.hs @@ -165,7 +165,6 @@ import qualified Ouroboros.Consensus.HardFork.Combinator.AcrossEras as HFC import qualified Ouroboros.Consensus.HardFork.Combinator.Basics as HFC import qualified Ouroboros.Consensus.Ledger.Abstract as Ledger import qualified Ouroboros.Consensus.Ledger.Extended as Ledger -import qualified Ouroboros.Consensus.Mempool.Capacity as TxLimits import qualified Ouroboros.Consensus.Node.ProtocolInfo as Consensus import Ouroboros.Consensus.Protocol.Abstract (ChainDepState, ConsensusProtocol (..)) import qualified Ouroboros.Consensus.Protocol.Praos.Common as Consensus @@ -1293,7 +1292,6 @@ mkProtocolInfoCardano (GenesisCardano dnc byronGenesis shelleyGenesisHash transC , Consensus.byronProtocolVersion = ncByronProtocolVersion dnc , Consensus.byronSoftwareVersion = Byron.softwareVersion , Consensus.byronLeaderCredentials = Nothing - , Consensus.byronMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure } , Consensus.paramsShelleyBased = Consensus.ProtocolParamsShelleyBased @@ -1303,32 +1301,26 @@ mkProtocolInfoCardano (GenesisCardano dnc byronGenesis shelleyGenesisHash transC , Consensus.paramsShelley = Consensus.ProtocolParamsShelley { Consensus.shelleyProtVer = ProtVer (natVersion @3) 0 - , Consensus.shelleyMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure } , Consensus.paramsAllegra = Consensus.ProtocolParamsAllegra { Consensus.allegraProtVer = ProtVer (natVersion @4) 0 - , Consensus.allegraMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure } , Consensus.paramsMary = Consensus.ProtocolParamsMary { Consensus.maryProtVer = ProtVer (natVersion @5) 0 - , Consensus.maryMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure } , Consensus.paramsAlonzo = Consensus.ProtocolParamsAlonzo { Consensus.alonzoProtVer = ProtVer (natVersion @7) 0 - , Consensus.alonzoMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure } , Consensus.paramsBabbage = Consensus.ProtocolParamsBabbage { Consensus.babbageProtVer = ProtVer (natVersion @9) 0 - , Consensus.babbageMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure } , Consensus.paramsConway = Consensus.ProtocolParamsConway { Consensus.conwayProtVer = ProtVer (natVersion @10) 0 - , Consensus.conwayMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure } , Consensus.hardForkTriggers = ncHardForkTriggers dnc , Consensus.ledgerTransitionConfig = transCfg diff --git a/flake.lock b/flake.lock index b9774bb1b..9ec022bc6 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1722231085, - "narHash": "sha256-IwLw5BCQNLIp9CJgtnGU5wrQ5dr1zZ5UhOFJTZPx3w8=", + "lastModified": 1723068470, + "narHash": "sha256-I3afsEv18Uspc61hRTUgE86HM8q7NZZzkMrjfJHNQEA=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "843c3f288a53dd3f4f773413fc50201e003e0096", + "rev": "7b7fa5b21ae6e06489b26eddd1fb5e925f1595c3", "type": "github" }, "original": {