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
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.

4 changes: 2 additions & 2 deletions server/cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ repository cardano-haskell-packages

index-state:
, hackage.haskell.org 2026-10-23T00:00:00Z
, cardano-haskell-packages 2026-10-27T09:47:50Z
, cardano-haskell-packages 2026-10-30T18:36:41Z

constraints:
, any.cardano-ledger-conway >= 1.24

, any.ouroboros-consensus ^>= 5.2
, any.ouroboros-consensus ^>= 5.3
, any.ouroboros-network ^>= 2.0
, any.small-steps >= 1.2
, any.cardano-ledger-core >= 1.22
Expand Down
24 changes: 12 additions & 12 deletions server/src/Ogmios/Data/Json/Ledger/PredicateFailure.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1200,39 +1200,39 @@ encodeScriptPurposeItemInAnyEra
:: ScriptPurposeItemInAnyEra
-> StrictMaybe Json
encodeScriptPurposeItemInAnyEra = \case
ScriptPurposeItemInAnyEra (AlonzoBasedEraAlonzo, purpose) ->
ScriptPurposeItemInAnyEra (ShelleyBasedEraAlonzo, purpose) ->
Alonzo.encodeScriptPurposeItem purpose
ScriptPurposeItemInAnyEra (AlonzoBasedEraBabbage, purpose) ->
ScriptPurposeItemInAnyEra (ShelleyBasedEraBabbage, purpose) ->
Alonzo.encodeScriptPurposeItem purpose
ScriptPurposeItemInAnyEra (AlonzoBasedEraConway, purpose) ->
ScriptPurposeItemInAnyEra (ShelleyBasedEraConway, purpose) ->
SJust (Conway.encodeScriptPurposeItem purpose)
ScriptPurposeItemInAnyEra (AlonzoBasedEraDijkstra, purpose) ->
ScriptPurposeItemInAnyEra (ShelleyBasedEraDijkstra, purpose) ->
SJust (Dijkstra.encodeScriptPurposeItem purpose)

encodeScriptPurposeIndexInAnyEra
:: ScriptPurposeIndexInAnyEra
-> Json
encodeScriptPurposeIndexInAnyEra = \case
ScriptPurposeIndexInAnyEra (AlonzoBasedEraAlonzo, purpose) ->
ScriptPurposeIndexInAnyEra (ShelleyBasedEraAlonzo, purpose) ->
Alonzo.encodeScriptPurposeIndex purpose
ScriptPurposeIndexInAnyEra (AlonzoBasedEraBabbage, purpose) ->
ScriptPurposeIndexInAnyEra (ShelleyBasedEraBabbage, purpose) ->
Alonzo.encodeScriptPurposeIndex purpose
ScriptPurposeIndexInAnyEra (AlonzoBasedEraConway, purpose) ->
ScriptPurposeIndexInAnyEra (ShelleyBasedEraConway, purpose) ->
Conway.encodeScriptPurposeIndex purpose
ScriptPurposeIndexInAnyEra (AlonzoBasedEraDijkstra, purpose) ->
ScriptPurposeIndexInAnyEra (ShelleyBasedEraDijkstra, purpose) ->
Dijkstra.encodeScriptPurposeIndex purpose

encodeContextErrorInAnyEra
:: ContextErrorInAnyEra
-> Json
encodeContextErrorInAnyEra = \case
ContextErrorInAnyEra (AlonzoBasedEraAlonzo, err) ->
ContextErrorInAnyEra (ShelleyBasedEraAlonzo, err) ->
Alonzo.encodeContextError err
ContextErrorInAnyEra (AlonzoBasedEraBabbage, err) ->
ContextErrorInAnyEra (ShelleyBasedEraBabbage, err) ->
Babbage.encodeContextError err
ContextErrorInAnyEra (AlonzoBasedEraConway, err) ->
ContextErrorInAnyEra (ShelleyBasedEraConway, err) ->
Conway.encodeContextError err
ContextErrorInAnyEra (AlonzoBasedEraDijkstra, err) ->
ContextErrorInAnyEra (ShelleyBasedEraDijkstra, err) ->
Dijkstra.encodeContextError err

encodeDiscriminatedEntities
Expand Down
46 changes: 20 additions & 26 deletions server/src/Ogmios/Data/Ledger.hs
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@ data TxOutInAnyEra

data ScriptPurposeItemInAnyEra
= forall era.
(Era era) =>
(PlutusEraConstraints era) =>
ScriptPurposeItemInAnyEra
( AlonzoBasedEra era
( ShelleyBasedEra era
, PlutusPurpose AsItem era
)

data ScriptPurposeIndexInAnyEra
= forall era.
(Era era) =>
(PlutusEraConstraints era) =>
ScriptPurposeIndexInAnyEra
( AlonzoBasedEra era
( ShelleyBasedEra era
, PlutusPurpose AsIx era
)

Expand All @@ -96,34 +96,28 @@ scriptPurposeInMostRecentEra ::
ScriptPurposeIndexInAnyEra ->
PlutusPurpose AsIx (MostRecentEra (CardanoBlock crypto))
scriptPurposeInMostRecentEra = \case
ScriptPurposeIndexInAnyEra (AlonzoBasedEraAlonzo, ix) ->
upgradePlutusPurposeAsIx
( upgradePlutusPurposeAsIx
(upgradePlutusPurposeAsIx ix)
)
ScriptPurposeIndexInAnyEra (AlonzoBasedEraBabbage, ix) ->
upgradePlutusPurposeAsIx
(upgradePlutusPurposeAsIx ix)
ScriptPurposeIndexInAnyEra (AlonzoBasedEraConway, ix) ->
upgradePlutusPurposeAsIx ix
ScriptPurposeIndexInAnyEra (AlonzoBasedEraDijkstra, ix) ->
ScriptPurposeIndexInAnyEra (ShelleyBasedEraAlonzo, ix) ->
upgradePlutusPurposeAsIx @DijkstraEra
. upgradePlutusPurposeAsIx @ConwayEra
. upgradePlutusPurposeAsIx @BabbageEra
$ ix
ScriptPurposeIndexInAnyEra (ShelleyBasedEraBabbage, ix) ->
upgradePlutusPurposeAsIx @DijkstraEra
. upgradePlutusPurposeAsIx @ConwayEra
$ ix
ScriptPurposeIndexInAnyEra (ShelleyBasedEraConway, ix) ->
upgradePlutusPurposeAsIx @DijkstraEra ix
ScriptPurposeIndexInAnyEra (ShelleyBasedEraDijkstra, ix) ->
ix

data ContextErrorInAnyEra
= forall era.
(Era era) =>
(PlutusEraConstraints era) =>
ContextErrorInAnyEra
( AlonzoBasedEra era
( ShelleyBasedEra era
, ContextError era
)

instance Show ContextErrorInAnyEra where
show = \case
ContextErrorInAnyEra (AlonzoBasedEraAlonzo, e) ->
show e
ContextErrorInAnyEra (AlonzoBasedEraBabbage, e) ->
show e
ContextErrorInAnyEra (AlonzoBasedEraConway, e) ->
show e
ContextErrorInAnyEra (AlonzoBasedEraDijkstra, e) ->
show e
show (ContextErrorInAnyEra (_, e)) =
show e
30 changes: 15 additions & 15 deletions server/src/Ogmios/Data/Ledger/PredicateFailure/Alonzo.hs
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ encodeLedgerFailure
encodeLedgerFailure = \case
Sh.UtxowFailure e ->
encodeUtxowFailure
AlonzoBasedEraAlonzo
(let era = AlonzoBasedEraAlonzo in encodeUtxoFailure era (encodeUtxosFailure era))
ShelleyBasedEraAlonzo
(let era = ShelleyBasedEraAlonzo in encodeUtxoFailure era (encodeUtxosFailure era))
e
Sh.DelegsFailure e ->
encodeDelegsFailure e
Expand All @@ -74,9 +74,9 @@ encodeLedgerFailure = \case

encodeUtxowFailure
:: forall era.
( Era era
( PlutusEraConstraints era
)
=> AlonzoBasedEra era
=> ShelleyBasedEra era
-> (PredicateFailure (EraRule "UTXO" era) -> MultiEraPredicateFailure)
-> Al.AlonzoUtxowPredFailure era
-> MultiEraPredicateFailure
Expand Down Expand Up @@ -104,7 +104,7 @@ encodeUtxoFailure
:: forall era.
( Era era
)
=> AlonzoBasedEra era
=> ShelleyBasedEra era
-> (PredicateFailure (EraRule "UTXOS" era) -> MultiEraPredicateFailure)
-> Al.AlonzoUtxoPredFailure era
-> MultiEraPredicateFailure
Expand All @@ -114,7 +114,7 @@ encodeUtxoFailure era encodeUtxosFailure' = \case
Al.OutsideValidityIntervalUTxO validityInterval currentSlot ->
TransactionOutsideValidityInterval { validityInterval, currentSlot }
Al.OutputTooBigUTxO outs ->
let culpritOutputs = (\(_, _, out) -> TxOutInAnyEra (toShelleyBasedEra era, out)) <$> toList outs in
let culpritOutputs = (\(_, _, out) -> TxOutInAnyEra (era, out)) <$> toList outs in
ValueSizeAboveLimit culpritOutputs
Al.MaxTxSizeUTxO (Mismatch measuredSize maximumSize) ->
TransactionTooLarge
Expand All @@ -126,8 +126,8 @@ encodeUtxoFailure era encodeUtxosFailure' = \case
Al.FeeTooSmallUTxO (Mismatch suppliedFee minimumRequiredFee) ->
TransactionFeeTooSmall { minimumRequiredFee, suppliedFee }
Al.ValueNotConservedUTxO (Mismatch consumed produced) ->
let valueConsumed = ValueInAnyEra (toShelleyBasedEra era, consumed) in
let valueProduced = ValueInAnyEra (toShelleyBasedEra era, produced) in
let valueConsumed = ValueInAnyEra (era, consumed) in
let valueProduced = ValueInAnyEra (era, produced) in
ValueNotConserved { valueConsumed, valueProduced }
Al.WrongNetwork expectedNetwork invalidAddrs ->
let invalidEntities = DiscriminatedAddresses (NESet.toSet invalidAddrs) in
Expand All @@ -137,10 +137,10 @@ encodeUtxoFailure era encodeUtxosFailure' = \case
NetworkMismatch { expectedNetwork, invalidEntities }
Al.OutputTooSmallUTxO outs ->
let insufficientlyFundedOutputs =
(\out -> (TxOutInAnyEra (toShelleyBasedEra era, out), Nothing)) <$> toList outs
(\out -> (TxOutInAnyEra (era, out), Nothing)) <$> toList outs
in InsufficientAdaInOutput { insufficientlyFundedOutputs }
Al.OutputBootAddrAttrsTooBig outs ->
let culpritOutputs = (\out -> TxOutInAnyEra (toShelleyBasedEra era, out)) <$> toList outs in
let culpritOutputs = (\out -> TxOutInAnyEra (era, out)) <$> toList outs in
BootstrapAddressAttributesTooLarge { culpritOutputs }
Al.InsufficientCollateral providedCollateral minimumRequiredCollateral ->
InsufficientCollateral { providedCollateral, minimumRequiredCollateral }
Expand All @@ -152,7 +152,7 @@ encodeUtxoFailure era encodeUtxosFailure' = \case
Al.OutsideForecast slot ->
SlotOutsideForeseeableFuture { slot }
Al.CollateralContainsNonADA value ->
let valueInAnyEra = ValueInAnyEra (toShelleyBasedEra era, value) in
let valueInAnyEra = ValueInAnyEra (era, value) in
NonAdaValueAsCollateral valueInAnyEra
Al.NoCollateralInputs{} ->
MissingCollateralInputs
Expand All @@ -168,9 +168,9 @@ encodeUtxoFailure era encodeUtxosFailure' = \case

encodeUtxosFailure
:: forall era.
( Era era
( PlutusEraConstraints era
)
=> AlonzoBasedEra era
=> ShelleyBasedEra era
-> Al.AlonzoUtxosPredFailure era
-> MultiEraPredicateFailure
encodeUtxosFailure era = \case
Expand All @@ -183,9 +183,9 @@ encodeUtxosFailure era = \case

encodeCollectErrors
:: forall era.
( Era era
( PlutusEraConstraints era
)
=> AlonzoBasedEra era
=> ShelleyBasedEra era
-> [CollectError era]
-> NonEmpty MultiEraPredicateFailure
encodeCollectErrors era errors =
Expand Down
10 changes: 5 additions & 5 deletions server/src/Ogmios/Data/Ledger/PredicateFailure/Babbage.hs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ encodeLedgerFailure ::
MultiEraPredicateFailure
encodeLedgerFailure = \case
Sh.UtxowFailure e ->
encodeUtxowFailure AlonzoBasedEraBabbage (Alonzo.encodeUtxosFailure AlonzoBasedEraBabbage) e
encodeUtxowFailure ShelleyBasedEraBabbage (Alonzo.encodeUtxosFailure ShelleyBasedEraBabbage) e
Sh.DelegsFailure e ->
encodeDelegsFailure e
Sh.ShelleyIncompleteWithdrawals ws ->
Expand All @@ -55,10 +55,10 @@ encodeLedgerFailure = \case

encodeUtxowFailure ::
forall era.
( Era era
( PlutusEraConstraints era
, PredicateFailure (EraRule "UTXO" era) ~ Ba.BabbageUtxoPredFailure era
) =>
AlonzoBasedEra era ->
ShelleyBasedEra era ->
(PredicateFailure (EraRule "UTXOS" era) -> MultiEraPredicateFailure) ->
Ba.BabbageUtxowPredFailure era ->
MultiEraPredicateFailure
Expand All @@ -77,7 +77,7 @@ encodeUtxowFailure era encodeUtxosFailure = \case
encodeUtxoFailure ::
forall era.
(Era era) =>
AlonzoBasedEra era ->
ShelleyBasedEra era ->
(PredicateFailure (EraRule "UTXOS" era) -> MultiEraPredicateFailure) ->
Ba.BabbageUtxoPredFailure era ->
MultiEraPredicateFailure
Expand All @@ -89,7 +89,7 @@ encodeUtxoFailure era encodeUtxosFailureInEra = \case
Ba.BabbageOutputTooSmallUTxO outs ->
let insufficientlyFundedOutputs =
( \(out, minAda) ->
( TxOutInAnyEra (toShelleyBasedEra era, out)
( TxOutInAnyEra (era, out)
, Just minAda
)
)
Expand Down
8 changes: 4 additions & 4 deletions server/src/Ogmios/Data/Ledger/PredicateFailure/Conway.hs
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ encodeUtxoFailure
-> MultiEraPredicateFailure
encodeUtxoFailure = \case
Cn.UtxosFailure e ->
encodeUtxosFailure AlonzoBasedEraConway e
encodeUtxosFailure era e
Cn.BadInputsUTxO inputs ->
UnknownUtxoReference (NESet.toSet inputs)
Cn.OutsideValidityIntervalUTxO validityInterval currentSlot ->
Expand Down Expand Up @@ -339,9 +339,9 @@ encodeUtxoFailure = \case

encodeUtxosFailure
:: forall era.
( Era era
( PlutusEraConstraints era
)
=> AlonzoBasedEra era
=> ShelleyBasedEra era
-> Cn.ConwayUtxosPredFailure era
-> MultiEraPredicateFailure
encodeUtxosFailure era = \case
Expand Down Expand Up @@ -395,4 +395,4 @@ encodeUtxowFailure = \case
Cn.MalformedReferenceScripts scripts ->
MalformedScripts (NESet.toSet scripts)
where
era = AlonzoBasedEraConway
era = ShelleyBasedEraConway
6 changes: 3 additions & 3 deletions server/src/Ogmios/Data/Ledger/PredicateFailure/Dijkstra.hs
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ encodeUtxowFailure = \case
Di.MalformedGuardDatums guards ->
MalformedGuardDatums { malformedGuards = NESet.toSet guards }
where
era = AlonzoBasedEraDijkstra
era = ShelleyBasedEraDijkstra

encodeUtxoFailure
:: Di.DijkstraUtxoPredFailure DijkstraEra
-> MultiEraPredicateFailure
encodeUtxoFailure = \case
Di.UtxosFailure e ->
encodeUtxosFailure AlonzoBasedEraDijkstra e
encodeUtxosFailure era e
Di.BadInputsUTxO inputs ->
UnknownUtxoReference (NESet.toSet inputs)
Di.OutsideValidityIntervalUTxO validityInterval currentSlot ->
Expand Down Expand Up @@ -406,7 +406,7 @@ encodeSubUtxowFailure = \case
Di.SubMalformedGuardDatums guards ->
MalformedGuardDatums { malformedGuards = NESet.toSet guards }
where
era = AlonzoBasedEraDijkstra
era = ShelleyBasedEraDijkstra

encodeSubUtxoFailure
:: Di.DijkstraSubUtxoPredFailure DijkstraEra
Expand Down
11 changes: 4 additions & 7 deletions server/src/Ogmios/Data/Ledger/ScriptFailure.hs
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,15 @@ data NodeTipTooOldError = NodeTipTooOld
deriving instance Show EvaluateTransactionError

data TransactionScriptFailureInAnyEra =
forall era. (Era era)
forall era. (PlutusEraConstraints era)
=> TransactionScriptFailureInAnyEra
( AlonzoBasedEra era
( ShelleyBasedEra era
, Ledger.TransactionScriptFailure era
)

instance Show TransactionScriptFailureInAnyEra where
show = \case
TransactionScriptFailureInAnyEra (AlonzoBasedEraAlonzo, e) -> show e
TransactionScriptFailureInAnyEra (AlonzoBasedEraBabbage, e) -> show e
TransactionScriptFailureInAnyEra (AlonzoBasedEraConway, e) -> show e
TransactionScriptFailureInAnyEra (AlonzoBasedEraDijkstra, e) -> show e
show (TransactionScriptFailureInAnyEra (_, e)) =
show e

-- | Return the most relevant script failure from a list of errors.
--
Expand Down
7 changes: 3 additions & 4 deletions server/src/Ogmios/Data/Protocol/TxSubmission.hs
Original file line number Diff line number Diff line change
Expand Up @@ -419,10 +419,9 @@ type CanEvaluateScriptsInEra era =
, BabbageEraTxBody era
, EraPlutusContext era
, EraUTxO era
, IsShelleyBasedEra era
, ScriptsNeeded era ~ AlonzoScriptsNeeded era
, Script era ~ AlonzoScript era
, EraPlutusContext era
, IsAlonzoBasedEra era
)

-- | Evaluate script executions units for the given transaction.
Expand Down Expand Up @@ -457,7 +456,7 @@ evaluateExecutionUnits pparams systemStart epochInfo utxo tx =
aggregateReports ptr result (failures, successes) =
case result of
Left scriptFailure ->
let failureInAnyEra = TransactionScriptFailureInAnyEra (alonzoBasedEra @era, scriptFailure)
let failureInAnyEra = TransactionScriptFailureInAnyEra (shelleyBasedEra @era, scriptFailure)
in ( Map.unionWith (++) (Map.singleton ix [failureInAnyEra]) failures
, successes
)
Expand All @@ -466,7 +465,7 @@ evaluateExecutionUnits pparams systemStart epochInfo utxo tx =
, Map.singleton ix exUnits <> successes
)
where
ix = ScriptPurposeIndexInAnyEra (alonzoBasedEra @era, ptr)
ix = ScriptPurposeIndexInAnyEra (shelleyBasedEra @era, ptr)

reports ::
Map
Expand Down
Loading
Loading