Skip to content
Open
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
156d119
Add `DijkstraEra era` to `CardanoEra era`
Jimbo4350 Jul 30, 2025
2872eda
Add `ShelleyBasedEraDijkstra` to `ShelleyBasedEra era`
Jimbo4350 Jul 30, 2025
dda8797
Add Dijkstra era to eons
Jimbo4350 Jul 30, 2025
704d11d
Add `DijkstraEra` to `Era era`
Jimbo4350 Jul 30, 2025
7a86381
COMBINE ME: cabal file updates
Jimbo4350 Jul 30, 2025
5be60e0
Update `QueryInShelleyBasedEra era result`
Jimbo4350 Jul 30, 2025
3a8826d
Update `makeShelleyTransactionBody` with Dijkstra era
Jimbo4350 Jul 30, 2025
e63bb2c
Update ledger types `PParamUpdatePurpose`, `CommitteePurpose` and
Jimbo4350 Jul 30, 2025
63ad603
Propagate `ChainAccountState`
Jimbo4350 Jul 30, 2025
b483de7
Consensus related Dijkstra changes
Jimbo4350 Jul 30, 2025
0d8ee49
Temporary Cardano.Api.LedgerState Dijkstra update
Jimbo4350 Jul 30, 2025
730ff11
Update TxOut rendering to handle Dijkstra era
Jimbo4350 Jul 30, 2025
ca28c36
Update `eraSpecificLedgerTxBody` with Dijkstra era
Jimbo4350 Jul 30, 2025
d91aedc
Update `decodeBigLedgerPeerSnapshot` to support snapshot SRV names
Jimbo4350 Jul 30, 2025
338a657
Update generators with PlutusScriptV4
Jimbo4350 Jul 30, 2025
acdff31
Introduce PlutusScriptV4
Jimbo4350 Jul 30, 2025
3437b94
Propagate Dijkstra era
Jimbo4350 Jul 30, 2025
0a737a6
Merge with PlutusV4 intro
Jimbo4350 Jul 30, 2025
5229ec3
Merge with propagate Dikstra
Jimbo4350 Jul 30, 2025
6e832cb
REMOVE ME: Add ledger and consensus SRPs
Jimbo4350 Jul 30, 2025
8330132
Update nix flake
Jimbo4350 Jul 30, 2025
f3ca538
Update cardano-rpc with PlutusV4
Jimbo4350 Jul 31, 2025
6d81484
Implement `executeLocalStateQueryExprWithVersion`
Jimbo4350 Jul 31, 2025
4904a0d
Fix parseHardForkTriggers
Jimbo4350 Jul 31, 2025
2da81eb
Fix cardano-rpc-test for protocol parameters roundtrip
carbolymer Aug 1, 2025
673e4a8
Update flake lock and ouroboros-network and plutus patches
palas Aug 1, 2025
65013af
Update wasm cache
palas Aug 1, 2025
1efbb74
Merge with: Consensus related Dijkstra change
Aug 7, 2025
faab1c2
Use exampleDijkstraGenesis value
Aug 7, 2025
7b8fa12
Fix cabal-gild CI failure
Aug 7, 2025
0eeff17
Run formolu
Aug 7, 2025
a93eab2
Fix HLS CI job
carbolymer Aug 11, 2025
79b9c02
Address lints
palas Aug 12, 2025
64e62e7
Update `ouroboros-consensus` stanza
palas Aug 12, 2025
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
Next Next commit
Add DijkstraEra era to CardanoEra era
  • Loading branch information
Jimbo4350 authored and Jordan Millar committed Aug 8, 2025
commit 156d1190a1826b762befbf969ee38d3eae1ebef2
16 changes: 16 additions & 0 deletions cardano-api/src/Cardano/Api/Era/Internal/Core.hs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module Cardano.Api.Era.Internal.Core
, AlonzoEra
, BabbageEra
, ConwayEra
, DijkstraEra

-- * CardanoEra
, CardanoEra (..)
Expand Down Expand Up @@ -87,6 +88,9 @@ data BabbageEra
-- | A type used as a tag to distinguish the Conway era.
data ConwayEra

-- | A type used as a tag to distinguish the DijkstraEra era.
data DijkstraEra

instance HasTypeProxy ByronEra where
data AsType ByronEra = AsByronEra
proxyToAsType _ = AsByronEra
Expand Down Expand Up @@ -115,6 +119,10 @@ instance HasTypeProxy ConwayEra where
data AsType ConwayEra = AsConwayEra
proxyToAsType _ = AsConwayEra

instance HasTypeProxy DijkstraEra where
data AsType DijkstraEra = AsDijkstraEra
proxyToAsType _ = AsDijkstraEra

-- ----------------------------------------------------------------------------
-- Eon

Expand Down Expand Up @@ -263,6 +271,7 @@ data CardanoEra era where
AlonzoEra :: CardanoEra AlonzoEra
BabbageEra :: CardanoEra BabbageEra
ConwayEra :: CardanoEra ConwayEra
DijkstraEra :: CardanoEra DijkstraEra

-- when you add era here, change `instance Bounded AnyCardanoEra`

Expand Down Expand Up @@ -321,6 +330,9 @@ instance IsCardanoEra BabbageEra where
instance IsCardanoEra ConwayEra where
cardanoEra = ConwayEra

instance IsCardanoEra DijkstraEra where
cardanoEra = DijkstraEra

type CardanoEraConstraints era =
( Typeable era
, IsCardanoEra era
Expand All @@ -339,6 +351,7 @@ cardanoEraConstraints = \case
AlonzoEra -> id
BabbageEra -> id
ConwayEra -> id
DijkstraEra -> id

data AnyCardanoEra where
AnyCardanoEra
Expand Down Expand Up @@ -372,6 +385,7 @@ instance Enum AnyCardanoEra where
AnyCardanoEra AlonzoEra -> 4
AnyCardanoEra BabbageEra -> 5
AnyCardanoEra ConwayEra -> 6
AnyCardanoEra DijkstraEra -> 7

toEnum = \case
0 -> AnyCardanoEra ByronEra
Expand Down Expand Up @@ -409,6 +423,7 @@ cardanoEraToStringLike = \case
AlonzoEra -> "Alonzo"
BabbageEra -> "Babbage"
ConwayEra -> "Conway"
DijkstraEra -> "Dijkstra"

anyCardanoEraFromStringLike :: (IsString a, Eq a) => a -> Either a AnyCardanoEra
{-# INLINE anyCardanoEraFromStringLike #-}
Expand All @@ -433,6 +448,7 @@ anyCardanoEra = \case
AlonzoEra -> AnyCardanoEra AlonzoEra
BabbageEra -> AnyCardanoEra BabbageEra
ConwayEra -> AnyCardanoEra ConwayEra
DijkstraEra -> AnyCardanoEra DijkstraEra

-- | This pairs up some era-dependent type with a 'CardanoEra' value that tells
-- us what era it is, but hides the era type. This is useful when the era is
Expand Down