Skip to content

Upgrade ledger, consensus, network, plutus for cardano-node 10.6 #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 74 commits into from
Oct 23, 2025
Merged

Upgrade ledger, consensus, network, plutus for cardano-node 10.6 #954

Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
16bc9cc
Add `DijkstraEra era` to `CardanoEra era`
Jimbo4350 Jul 30, 2025
001d246
Add `ShelleyBasedEraDijkstra` to `ShelleyBasedEra era`
Jimbo4350 Jul 30, 2025
a28a2b1
Add Dijkstra era to eons
Jimbo4350 Jul 30, 2025
780947b
Add `DijkstraEra` to `Era era`
Jimbo4350 Jul 30, 2025
87a01f4
COMBINE ME: cabal file updates
Jimbo4350 Jul 30, 2025
47f4e7a
Update `QueryInShelleyBasedEra era result`
Jimbo4350 Jul 30, 2025
176954c
Update `makeShelleyTransactionBody` with Dijkstra era
Jimbo4350 Jul 30, 2025
64ee3aa
Update ledger types `PParamUpdatePurpose`, `CommitteePurpose` and
Jimbo4350 Jul 30, 2025
120135d
Propagate `ChainAccountState`
Jimbo4350 Jul 30, 2025
02ead07
Consensus related Dijkstra changes
Jimbo4350 Jul 30, 2025
94c001f
Temporary Cardano.Api.LedgerState Dijkstra update
Jimbo4350 Jul 30, 2025
1fd5b79
Update TxOut rendering to handle Dijkstra era
Jimbo4350 Jul 30, 2025
ed3d1f1
Update `eraSpecificLedgerTxBody` with Dijkstra era
Jimbo4350 Jul 30, 2025
2856fbb
Update `decodeBigLedgerPeerSnapshot` to support snapshot SRV names
Jimbo4350 Jul 30, 2025
20e73b5
Update generators with PlutusScriptV4
Jimbo4350 Jul 30, 2025
473d9a9
Introduce PlutusScriptV4
Jimbo4350 Jul 30, 2025
199a835
Propagate Dijkstra era
Jimbo4350 Jul 30, 2025
9d5b92f
Merge with PlutusV4 intro
Jimbo4350 Jul 30, 2025
5c09074
Merge with propagate Dikstra
Jimbo4350 Jul 30, 2025
7f037d5
REMOVE ME: Add ledger and consensus SRPs
Jimbo4350 Jul 30, 2025
0b0273f
Update nix flake
Jimbo4350 Jul 30, 2025
fcc5093
Update cardano-rpc with PlutusV4
Jimbo4350 Jul 31, 2025
c00071c
Implement `executeLocalStateQueryExprWithVersion`
Jimbo4350 Jul 31, 2025
04218dc
Fix parseHardForkTriggers
Jimbo4350 Jul 31, 2025
3943aa9
Fix cardano-rpc-test for protocol parameters roundtrip
carbolymer Aug 1, 2025
3c1a7c7
Update flake lock and ouroboros-network and plutus patches
palas Aug 1, 2025
115af33
Update wasm cache
palas Aug 1, 2025
7715043
Merge with: Consensus related Dijkstra change
Aug 7, 2025
459b232
Use exampleDijkstraGenesis value
Aug 7, 2025
11fbf44
Run formolu
Aug 7, 2025
391aeac
Fix HLS CI job
carbolymer Aug 11, 2025
ba0f883
Address lints
palas Aug 12, 2025
8f13ef3
Update `ouroboros-consensus` stanza
palas Aug 12, 2025
17470b5
wip: cardano-api with kes-agent support
fraser-iohk Jun 25, 2025
2662df0
WIP: update ledger and index-state
ana-pantilie Aug 21, 2025
6fc4dbf
Fix most compilation errors
ana-pantilie Aug 25, 2025
8bebd3a
Upgrade plutus to 1.52
ana-pantilie Aug 25, 2025
73553c8
Add bounds to quickcheck
ana-pantilie Aug 26, 2025
5c7d1c5
Add another quickcheck bound
ana-pantilie Aug 26, 2025
a0e354b
Fill in undefineds
Jimbo4350 Aug 26, 2025
5627c2e
Bump CHaP in nix flake
Jimbo4350 Sep 9, 2025
0afeea3
Rebase changes
Jimbo4350 Sep 10, 2025
d355965
WIP
Jimbo4350 Sep 10, 2025
f484f43
bump CHaP and hackage, remove ledger srp
carbolymer Sep 11, 2025
2415873
WIP: update dependencies accordingly, remove allow-newer
ana-pantilie Sep 11, 2025
00f064a
Fix type errors
Jimbo4350 Sep 11, 2025
fa66fee
WIP: add kes-agent, cardano-base SRPs; add constraints
ana-pantilie Sep 12, 2025
14e600e
Dependencies resolve in nix shell, but there are build failures
Jimbo4350 Sep 12, 2025
5cd0497
Comment out cardano-rpc from the project temporarily.
carbolymer Sep 15, 2025
ae5f2f0
Add Dijkstra era support to experimental eras
carbolymer Sep 19, 2025
c062448
Disable Alonzo Genesis cost models validation, since it is done by le…
carbolymer Sep 19, 2025
71ad99c
Update CHaP index state
ana-pantilie Sep 22, 2025
a9a3d49
Use newer process library, otherwise mingw32 build is broken
carbolymer Sep 22, 2025
2dcbe65
Change quasiquoter used in tests to raw-strings-qq - gets rid of proc…
carbolymer Sep 23, 2025
7388805
GHA: Bump HLS cache version
carbolymer Sep 23, 2025
6a71053
Fix wasm32 build
palas Sep 23, 2025
aa2acde
Update cache for wasm32
palas Sep 24, 2025
cee9b20
Bump ouroboros-consensus versions
jasagredo Oct 2, 2025
02a2274
Add L.Era* constraints to ShelleyBasedEra
carbolymer Oct 3, 2025
bcb16bf
Add Dijkstra Genesis defaults
carbolymer Oct 7, 2025
845b761
Export AsDijkstraEra
ana-pantilie Oct 10, 2025
02a27d0
Fix script hash calculation for transactions without redeemers, datum…
carbolymer Oct 14, 2025
ef9796d
Add SRP for plutus
ana-pantilie Oct 16, 2025
7b990ba
Fix wrong CBOR deserialisation in pool distribution query
carbolymer Oct 16, 2025
9060669
Update plutus srp
ana-pantilie Oct 16, 2025
1c46afa
Fix tests compilation issues
carbolymer Oct 16, 2025
6ff6731
Fix transaction autobalancing tests
carbolymer Oct 17, 2025
79163b1
Remove Plutus SRP, update CHaP index
ana-pantilie Oct 20, 2025
a6be460
Update CHaP index
ana-pantilie Oct 21, 2025
26ff608
Merge remote-tracking branch 'origin/master' into jordan/10.6-node-re…
ana-pantilie Oct 22, 2025
84078d2
Formatting
ana-pantilie Oct 22, 2025
e28dd6f
Fix pattern match on consensus era
carbolymer Oct 22, 2025
a73f17f
Address remarks
carbolymer Oct 22, 2025
ef9d4d5
Merge remote-tracking branch 'origin/master' into jordan/10.6-node-re…
ana-pantilie Oct 23, 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
Prev Previous commit
Next Next commit
Fix script hash calculation for transactions without redeemers, datum… 
…s or scripts
  • Loading branch information
@carbolymer
carbolymer committed Oct 14, 2025
commit 02a27d0a7cbb0e8878b4c4404578d0c9a8baa992
19 changes: 12 additions & 7 deletions cardano-api/src/Cardano/Api/Tx/Internal/Body.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ import Cardano.Ledger.Allegra.Core qualified as L
import Cardano.Ledger.Alonzo.Core qualified as L
import Cardano.Ledger.Alonzo.Scripts qualified as Alonzo
import Cardano.Ledger.Alonzo.Tx qualified as L
-- import Cardano.Ledger.Alonzo.Tx qualified as Alonzo (hashScriptIntegrity)
import Cardano.Ledger.Alonzo.TxWits qualified as Alonzo
import Cardano.Ledger.Api qualified as L
import Cardano.Ledger.Babbage.UTxO qualified as L
Expand Down Expand Up @@ -1982,12 +1981,18 @@ convPParamsToScriptIntegrityHash
-> Set Plutus.Language
-> StrictMaybe L.ScriptIntegrityHash
convPParamsToScriptIntegrityHash w (BuildTxWith mTxProtocolParams) redeemers datums languages =
alonzoEraOnwardsConstraints w $
case mTxProtocolParams of
Nothing -> SNothing
Just (LedgerProtocolParameters pp) ->
let scriptIntegrity = L.ScriptIntegrity redeemers datums (Set.map (L.getLanguageView pp) languages)
in SJust $ L.hashScriptIntegrity scriptIntegrity
alonzoEraOnwardsConstraints w $ do
LedgerProtocolParameters pp <- Ledger.maybeToStrictMaybe mTxProtocolParams
-- This logic is copied from ledger, because their code is not reusable
-- c.f. https://github.com/IntersectMBO/cardano-ledger/commit/5a975d9af507c9ee835a86d3bb77f3e2670ad228#diff-8236dfec9688f22550b91fc9a87af9915523ab9c5bd817218ecceec8ca7a789bR282
let shouldCalculateHash =
Copy link
Contributor

@Jimbo4350 Jimbo4350 Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like an unnecessary check. What's the benefit of calling guard here vs letting hashScriptIntegrity return SNothing? The guard is guarding the guard.

Copy link
Contributor Author

@carbolymer carbolymer Oct 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because hashScriptIntegrity is changed now and does not return SNothing.

Copy link
Contributor

@Jimbo4350 Jimbo4350 Oct 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can use mkScriptIntegrity. Not important for this PR though.

Copy link
Contributor Author

@carbolymer carbolymer Oct 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could, but you'd have to build whole Tx era to use it, which results in a lot of boilerplate. We are using convPParamsToScriptIntegrityHash before we start building a transaction so it'd result in a code duplication. Tbh it would be easier to open a PR to ledger to undo requirement of Tx era.

not $
null (redeemers ^. L.unRedeemersL)
&& null (datums ^. L.unTxDatsL)
&& null languages
guard shouldCalculateHash
let scriptIntegrity = L.ScriptIntegrity redeemers datums (Set.map (L.getLanguageView pp) languages)
pure $ L.hashScriptIntegrity scriptIntegrity

convLanguages :: [(ScriptWitnessIndex, AnyScriptWitness era)] -> Set Plutus.Language
convLanguages witnesses =
Expand Down