Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ index-state:
-- Bump this if you need newer packages from Hackage
, hackage.haskell.org 2024-06-23T23:01:13Z
-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2024-06-26T21:39:58Z
, cardano-haskell-packages 2024-07-02T04:22:05Z

packages:
ouroboros-consensus
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.

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
### Non-Breaking

- Update ledger packages:
- `cardano-ledger-alonzo`: `^>=1.10`
- `cardano-ledger-babbage`: `^>=1.8.2`
- `cardano-ledger-conway`: `^>=1.16.0`
- `cardano-ledger-core`: `^>=1.13.2`

### Breaking

- Update N2C part of `latestReleasedNodeVersion` to `NodeToClientV_16`.
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@ library
cardano-crypto-class,
cardano-crypto-wrapper,
cardano-ledger-allegra ^>=1.5,
cardano-ledger-alonzo ^>=1.9,
cardano-ledger-alonzo ^>=1.10,
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.1,
cardano-ledger-core ^>=1.13,
cardano-ledger-conway ^>=1.16.0,
cardano-ledger-core ^>=1.13.2,
cardano-ledger-mary ^>=1.6.1,
cardano-ledger-shelley ^>=1.12,
cardano-prelude,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ instance CardanoHardForkConstraints c
, (NodeToClientV_16, CardanoNodeToClientVersion12)
]

latestReleasedNodeVersion _prx = (Just NodeToNodeV_13, Just NodeToClientV_15)
latestReleasedNodeVersion _prx = (Just NodeToNodeV_13, Just NodeToClientV_16)

{-------------------------------------------------------------------------------
ProtocolInfo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import qualified Cardano.Ledger.Api as L
import Cardano.Ledger.Binary (Annotator (..), DecCBOR (..),
EncCBOR (..), FromCBOR (..), FullByteString (..),
ToCBOR (..), toPlainDecoder)
import qualified Cardano.Ledger.Conway.Rules as SL
import qualified Cardano.Ledger.Conway.UTxO as SL
import qualified Cardano.Ledger.Core as SL (txIdTxBody)
import Cardano.Ledger.Crypto (Crypto)
Expand Down Expand Up @@ -387,10 +388,9 @@ instance ( ShelleyCompatible p (ConwayEra c)
txsBlockCapacity st =
ConwayMeasure {
alonzoMeasure = txsBlockCapacityAlonzo st
, refScriptsSize =
-- TODO use maxRefScriptSizePerBlock from
-- https://github.com/IntersectMBO/cardano-ledger/pull/4450
Mempool.ByteSize $ 2560 * 1024 -- 2.5 MB
, refScriptsSize = Mempool.ByteSize $ fromIntegral $
-- For post-Conway eras, this will become a protocol parameter.
SL.maxRefScriptSizePerBlock
}

{-------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ mkConsensusProtocolCardano NodeByronProtocolConfiguration {
npcConwayGenesisFileHash
}
NodeHardForkProtocolConfiguration {
npcTestEnableDevelopmentHardForkEras,
-- During testing of the Alonzo era, we conditionally declared that we
-- knew about the Alonzo era. We do so only when a config option for
-- testing development/unstable eras is used. This lets us include
npcTestEnableDevelopmentHardForkEras = _,
-- During testing of the latest unreleased era, we conditionally
-- declared that we knew about it. We do so only when a config option
-- for testing development/unstable eras is used. This lets us include
-- not-yet-ready eras in released node versions without mainnet nodes
-- prematurely advertising that they could hard fork into the new era.
npcTestShelleyHardForkAtEpoch,
Expand Down Expand Up @@ -224,26 +224,23 @@ mkConsensusProtocolCardano NodeByronProtocolConfiguration {
-- version that this node will declare that it understands, when it
-- is in the Alonzo era. That is, it is the version of protocol
-- /after/ Alonzo, i.e. Babbage.
alonzoProtVer = ProtVer (natVersion @6) 0,
alonzoProtVer = ProtVer (natVersion @7) 0,
alonzoMaxTxCapacityOverrides =
Mempool.mkOverrides Mempool.noOverridesMeasure
}
Consensus.ProtocolParamsBabbage {
-- This is /not/ the Babbage protocol version. It is the protocol
-- version that this node will declare that it understands, when it
-- is in the Babbage era.
Consensus.babbageProtVer = ProtVer (natVersion @7) 0,
Consensus.babbageProtVer = ProtVer (natVersion @9) 0,
Consensus.babbageMaxTxCapacityOverrides =
Mempool.mkOverrides Mempool.noOverridesMeasure
}
Consensus.ProtocolParamsConway {
-- This is /not/ the Conway protocol version. It is the protocol
-- version that this node will declare that it understands, when it
-- is in the Conway era.
Consensus.conwayProtVer =
if npcTestEnableDevelopmentHardForkEras
then ProtVer (natVersion @9) 0 -- Advertise we can support Conway
else ProtVer (natVersion @8) 0, -- Otherwise we only advertise we know about Babbage
Consensus.conwayProtVer = ProtVer (natVersion @9) 0,
Consensus.conwayMaxTxCapacityOverrides =
Mempool.mkOverrides Mempool.noOverridesMeasure
}
Expand Down