Skip to content

10.6 Node Release Final Integration #935

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

Jump to bottom
Draft
wants to merge 44 commits into
base: master
Choose a base branch
from
Draft

10.6 Node Release Final Integration #935

wants to merge 44 commits into from

Conversation

ana-pantilie
Copy link
Collaborator

@ana-pantilie ana-pantilie commented Aug 20, 2025 •
edited
Loading

Integrates #884 and #921

Changelog

- description: |
    <insert-changelog-description-here>
# uncomment types applicable to the change:
  type:
  # - feature        # introduces a new feature
  # - breaking       # the API has changed in a breaking way
  # - compatible     # the API has changed but is non-breaking
  # - optimisation   # measurable performance improvements
  # - refactoring    # QoL changes
  # - bugfix         # fixes a defect
  # - test           # fixes/modifies tests
  # - maintenance    # not directly related to the code
  # - release        # related to a new release preparation
  # - documentation  # change in code docs, haddocks...

Context

Additional context for the PR goes here. If the PR fixes a particular issue please provide a link to the issue.

How to trust this PR

Highlight important bits of the PR that will make the review faster. If there are commands the reviewer can run to observe the new behavior, describe them.

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated. See Running tests for more details
  • Self-reviewed the diff

fraser-iohk and others added 30 commits July 23, 2025 21:29
@fraser-iohk
wip: cardano-api with kes-agent support
5625233
@Jimbo4350
Add DijkstraEra era to CardanoEra era
156d119
@Jimbo4350
Add ShelleyBasedEraDijkstra to ShelleyBasedEra era
2872eda
@Jimbo4350
Add Dijkstra era to eons
dda8797
@Jimbo4350
Add DijkstraEra to Era era
704d11d
@Jimbo4350
COMBINE ME: cabal file updates
7a86381
@Jimbo4350
Update QueryInShelleyBasedEra era result
5be60e0 
- QueryAccountState returns `ChainAccountState` instead of
  `AccountState`
- Use updated consensus queries `GetStakeDistribution2` and  `GetPoolDistr2`
@Jimbo4350
Update makeShelleyTransactionBody with Dijkstra era
3a8826d
@Jimbo4350
Update ledger types PParamUpdatePurpose, CommitteePurpose and
e63bb2c 
`ConstitutionPurpose`
@Jimbo4350
Propagate ChainAccountState
63ad603
@Jimbo4350
Consensus related Dijkstra changes
b483de7
@Jimbo4350
Temporary Cardano.Api.LedgerState Dijkstra update
0d8ee49 
Dijkstra genesis file needs to be parseable
@Jimbo4350
Update TxOut rendering to handle Dijkstra era
730ff11
@Jimbo4350
Update eraSpecificLedgerTxBody with Dijkstra era
ca28c36
@Jimbo4350
Update decodeBigLedgerPeerSnapshot to support snapshot SRV names
d91aedc
@Jimbo4350
Update generators with PlutusScriptV4
338a657 
Implement orphan DijkstraPParams Arbitrary instances
@Jimbo4350
Introduce PlutusScriptV4
acdff31
@Jimbo4350
Propagate Dijkstra era
3437b94
@Jimbo4350
Merge with PlutusV4 intro
0a737a6
@Jimbo4350
Merge with propagate Dikstra
5229ec3
@Jimbo4350
REMOVE ME: Add ledger and consensus SRPs
6e832cb
@Jimbo4350
Update nix flake
8330132
@Jimbo4350
Update cardano-rpc with PlutusV4
f3ca538
@Jimbo4350
Implement executeLocalStateQueryExprWithVersion
6d81484
@Jimbo4350
Fix parseHardForkTriggers
4904a0d
@carbolymer
Fix cardano-rpc-test for protocol parameters roundtrip
2da81eb
@palas
Update flake lock and ouroboros-network and plutus patches
673e4a8
@palas
Update wasm cache
65013af
Merge with: Consensus related Dijkstra change
1efbb74
Use exampleDijkstraGenesis value
faab1c2
github-advanced-security[bot]
github-advanced-security bot found potential problems Aug 20, 2025
View reviewed changes
cardano-api/src/Cardano/Api/LedgerState.hs Outdated

decodeLedgerState :: forall s. CBOR.Decoder s LedgerState
decodeLedgerState = do
2 <- CBOR.decodeListLen
hst <-
HFC.HardForkLedgerState
<$> HFC.decodeTelescope (byron :* shelley :* allegra :* mary :* alonzo :* babbage :* conway :* Nil)
<<<<<<< HEAD

Check failure

Code scanning / HLint

Parse error: on input `<<<<<<<' Error

cardano-api/src/Cardano/Api/LedgerState.hs:1404:1-7: Error: Parse error: on input `<<<<<<<'
  
Found:
      hst <-
        HFC.HardForkLedgerState
  > <<<<<<< HEAD
          <$> HFC.decodeTelescope
            (byron : shelley : allegra : mary : alonzo : babbage : conway : dijkstra : Nil)
@ana-pantilie ana-pantilie mentioned this pull request Aug 21, 2025
Open
8 tasks
@ana-pantilie ana-pantilie force-pushed the ana/10.6-node-release-final branch from 592d605 to 764c708 Compare August 26, 2025 13:27
@Jimbo4350 Jimbo4350 force-pushed the ana/10.6-node-release-final branch from d43da78 to f3de953 Compare August 26, 2025 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jimbo4350 Jimbo4350 Awaiting requested review from Jimbo4350 Jimbo4350 will be requested when the pull request is marked ready for review Jimbo4350 is a code owner

@newhoggy newhoggy Awaiting requested review from newhoggy newhoggy will be requested when the pull request is marked ready for review newhoggy is a code owner

@carbolymer carbolymer Awaiting requested review from carbolymer carbolymer will be requested when the pull request is marked ready for review carbolymer is a code owner

@palas palas Awaiting requested review from palas palas will be requested when the pull request is marked ready for review palas is a code owner

@dcoutts dcoutts Awaiting requested review from dcoutts dcoutts will be requested when the pull request is marked ready for review dcoutts is a code owner

@erikd erikd Awaiting requested review from erikd erikd will be requested when the pull request is marked ready for review erikd is a code owner

@kevinhammond kevinhammond Awaiting requested review from kevinhammond kevinhammond will be requested when the pull request is marked ready for review kevinhammond is a code owner

@CarlosLopezDeLara CarlosLopezDeLara Awaiting requested review from CarlosLopezDeLara CarlosLopezDeLara will be requested when the pull request is marked ready for review CarlosLopezDeLara is a code owner

@disassembler disassembler Awaiting requested review from disassembler disassembler will be requested when the pull request is marked ready for review disassembler is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ana-pantilie @fraser-iohk @Jimbo4350 @carbolymer @palas