Skip to content

Commit

Permalink
Bump CHaP
Browse files Browse the repository at this point in the history
  • Loading branch information
Jimbo4350 committed Aug 8, 2024
1 parent cd4bc80 commit 8828936
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 28 deletions.
61 changes: 50 additions & 11 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: c12c0a5cb645ca61e34ef562faa0d8cb4ffde66f
--sha256: sha256-iqv7A+NdmVPMbiDUd3NiDqbBnKn4rvjzIRQWwSZCLRU=
subdir: ouroboros-consensus
ouroboros-consensus-cardano
ouroboros-consensus-protocol
ouroboros-consensus-diffusion
sop-extras
strict-sop-core
12 changes: 6 additions & 6 deletions cardano-api/cardano-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 0 additions & 8 deletions cardano-api/internal/Cardano/Api/LedgerState.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8828936

Please sign in to comment.